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 2018/08/13 22:59:12 UTC
[01/39] isis-site git commit: ISIS-1810: updates docs for 2.0.0-M1
Repository: isis-site
Updated Branches:
refs/heads/asf-site 2f475bbf3 -> 274edd1d7
http://git-wip-us.apache.org/repos/asf/isis-site/blob/274edd1d/content/versions/current/release-notes/release-notes.html
----------------------------------------------------------------------
diff --git a/content/versions/current/release-notes/release-notes.html b/content/versions/current/release-notes/release-notes.html
index 0318aae..06ead74 100644
--- a/content/versions/current/release-notes/release-notes.html
+++ b/content/versions/current/release-notes/release-notes.html
@@ -309,7 +309,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_release-notes_2.0.0-M1">2.0.0-M1</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/2.0.0-M1/release-notes/release-notes.html#_release-notes_2.0.0-M1">2.0.0-M1</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">31-07-2018</p></td>
<td class="tableblock halign-left valign-top">
<div>
@@ -328,7 +328,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_release-notes_1.16.2">1.16.2</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/1.16.2/release-notes/release-notes.html#_release-notes_1.16.2">1.16.2</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">05-03-2018</p></td>
<td class="tableblock halign-left valign-top">
<div>
@@ -347,7 +347,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_release-notes_1.16.1">1.16.1</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/1.16.1/release-notes/release-notes.html#_release-notes_1.16.1">1.16.1</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">22-02-2018</p></td>
<td class="tableblock halign-left valign-top">
<div>
@@ -366,7 +366,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_release-notes_1.16.0">1.16.0</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/1.16.0/release-notes/release-notes.html#_release-notes_1.16.0">1.16.0</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">08-01-2018</p></td>
<td class="tableblock halign-left valign-top">
<div>
@@ -385,7 +385,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_release-notes_1.15.1">1.15.1</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/1.15.1/release-notes/release-notes.html#_release-notes_1.15.1">1.15.1</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">25-09-2017</p></td>
<td class="tableblock halign-left valign-top">
<div>
@@ -404,7 +404,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_release-notes_1.15.0">1.15.0</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/1.15.0/release-notes/release-notes.html#_release-notes_1.15.0">1.15.0</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">14-08-2017</p></td>
<td class="tableblock halign-left valign-top">
<div>
@@ -423,7 +423,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_release-notes_1.14.0">1.14.0</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/1.14.0/release-notes/release-notes.html#_release-notes_1.14.0">1.14.0</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">19-02-2017</p></td>
<td class="tableblock halign-left valign-top">
<div>
@@ -442,7 +442,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_release-notes_1.13.2.1">1.13.2.1</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/1.13.2.1/release-notes/release-notes.html#_release-notes_1.13.2.1">1.13.2.1</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">03-jan-2017</p></td>
<td class="tableblock halign-left valign-top">
<div>
@@ -461,7 +461,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_release-notes_1.13.2">1.13.2</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/1.13.2/release-notes/release-notes.html#_release-notes_1.13.2">1.13.2</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">14-dec-2016</p></td>
<td class="tableblock halign-left valign-top">
<div>
@@ -480,7 +480,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_release-notes_1.13.1">1.13.1</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/1.13.1/release-notes/release-notes.html#_release-notes_1.13.1">1.13.1</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">30-oct-2016</p></td>
<td class="tableblock halign-left valign-top">
<div>
@@ -499,7 +499,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_release-notes_1.13.0">1.13.0</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/1.13.0/release-notes/release-notes.html#_release-notes_1.13.0">1.13.0</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">11-jul-2016</p></td>
<td class="tableblock halign-left valign-top">
<div>
@@ -518,7 +518,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_release-notes_1.12.2">1.12.2</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/1.12.2/release-notes/release-notes.html#_release-notes_1.12.2">1.12.2</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">06-jun-2016</p></td>
<td class="tableblock halign-left valign-top">
<div>
@@ -537,7 +537,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_release-notes_1.12.1">1.12.1</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/1.12.1/release-notes/release-notes.html#_release-notes_1.12.1">1.12.1</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">12-apr-2016</p></td>
<td class="tableblock halign-left valign-top">
<div>
@@ -556,7 +556,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_release-notes_1.12.0">1.12.0</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/1.12.0/release-notes/release-notes.html#_release-notes_1.12.0">1.12.0</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">29-mar-2016</p></td>
<td class="tableblock halign-left valign-top">
<div>
@@ -575,7 +575,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_release-notes_1.11.1">1.11.1</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/1.11.1/release-notes/release-notes.html#_release-notes_1.11.1">1.11.1</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">17-jan-2016</p></td>
<td class="tableblock halign-left valign-top">
<div>
@@ -594,7 +594,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_release-notes_1.11.0">1.11.0</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/1.11.0/release-notes/release-notes.html#_release-notes_1.11.0">1.11.0</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">02-jan-2016</p></td>
<td class="tableblock halign-left valign-top">
<div>
@@ -613,7 +613,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_release-notes_1.10.0">1.10.0</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/1.10.0/release-notes/release-notes.html#_release-notes_1.10.0">1.10.0</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">10-nov-2015</p></td>
<td class="tableblock halign-left valign-top">
<div>
@@ -632,7 +632,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_release-notes_1.9.0">1.9.0</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/1.9.0/release-notes/release-notes.html#_release-notes_1.9.0">1.9.0</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">1-sep-2015</p></td>
<td class="tableblock halign-left valign-top">
<div>
@@ -651,7 +651,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_release-notes_1.8.0">1.8.0</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/1.8.0/release-notes/release-notes.html#_release-notes_1.8.0">1.8.0</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">24-feb-2015</p></td>
<td class="tableblock halign-left valign-top">
<div>
@@ -673,7 +673,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_release-notes_1.7.0">1.7.0</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/1.7.0/release-notes/release-notes.html#_release-notes_1.7.0">1.7.0</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">18-oct-2014</p></td>
<td class="tableblock halign-left valign-top">
<div>
@@ -697,7 +697,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_release-notes_1.6.0">1.6.0</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/1.6.0/release-notes/release-notes.html#_release-notes_1.6.0">1.6.0</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">28-jul-2014</p></td>
<td class="tableblock halign-left valign-top">
<div>
@@ -721,7 +721,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_release-notes_1.5.0">1.5.0</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/1.5.0/release-notes/release-notes.html#_release-notes_1.5.0">1.5.0</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">08-jun-2014</p></td>
<td class="tableblock halign-left valign-top">
<div>
@@ -748,7 +748,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_release-notes_1.4.1">1.4.1</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/1.4.1/release-notes/release-notes.html#_release-notes_1.4.1">1.4.1</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">14-mar-2014</p></td>
<td class="tableblock halign-left valign-top">
<div>
@@ -772,7 +772,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#r1.4.0">1.4.0</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/1.4.0/release-notes/release-notes.html#_release-notes_1.4.0">1.4.0</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">11-mar-2014</p></td>
<td class="tableblock halign-left valign-top">
<div></div></td>
@@ -796,7 +796,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_release-notes_1.3.1">1.3.1</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/1.3.1/release-notes/release-notes.html#_release-notes_1.3.1">1.3.1</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">7-nov-2013</p></td>
<td class="tableblock halign-left valign-top">
<div>
@@ -819,7 +819,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_release-notes_1.3.0">1.3.0</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/1.3.0/release-notes/release-notes.html#_release-notes_1.3.0">1.3.0</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">25-oct-2013</p></td>
<td class="tableblock halign-left valign-top">
<div>
@@ -847,7 +847,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_release-notes_1.2.0">1.2.0</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/1.2.0/release-notes/release-notes.html#_release-notes_1.2.0">1.2.0</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">30-may-2013</p></td>
<td class="tableblock halign-left valign-top">
<div></div></td>
@@ -870,7 +870,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_release-notes_1.1.0">1.1.0</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/1.1.0/release-notes/release-notes.html#_release-notes_1.1.0">1.1.0</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">31-jan-2013</p></td>
<td class="tableblock halign-left valign-top">
<div></div></td>
@@ -890,7 +890,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#r1.0.1">1.0.1</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/1.0.1/release-notes/release-notes.html#_release-notes_1.0.1">1.0.1</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">10-jan-2013</p></td>
<td class="tableblock halign-left valign-top">
<div>
@@ -912,7 +912,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_release-notes_1.0.0">1.0.0</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/1.0.0/release-notes/release-notes.html#_release-notes_1.0.0">1.0.0</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">24-dec-2012</p></td>
<td class="tableblock halign-left valign-top">
<div>
@@ -1579,7 +1579,7 @@ table.CodeRay td.code>pre{padding:0}
<p>The version of Apache Wicket has also been upgraded from <code>6.x</code> to <code>7.x</code>.</p>
</div>
<div class="paragraph">
- <p>Most applications written against v1.14.x should run against v1.15.0 with few if any changes. That said, we do recommend that you read and keep in mind the <a href="../migration-notes/migration-notes.html#_migration-notes_1.14.0-to-1.15.0">migration notes</a> when you upgrade your app.</p>
+ <p>Most applications written against v1.14.x should run against v1.15.0 with few if any changes. That said, we do recommend that you read and keep in mind the <a href="https://isis.apache.org/versions/1.15.0/migration-notes/migration-notes.html#_migration-notes_1.14.0-to-1.15.0">migration notes</a> when you upgrade your app.</p>
</div>
<div class="admonitionblock note">
<table>
@@ -1770,7 +1770,7 @@ table.CodeRay td.code>pre{padding:0}
<p>The release also has a number of bug fixes.</p>
</div>
<div class="paragraph">
- <p>Most applications written against v1.13.x should run against v1.14.0 with few if any changes. That said, we do recommend that you read and keep in mind the <a href="../migration-notes/migration-notes.html#_migration-notes_1.13.0-to-1.14.0">migration notes</a> when you upgrade your app.</p>
+ <p>Most applications written against v1.13.x should run against v1.14.0 with few if any changes. That said, we do recommend that you read and keep in mind the <a href="https://isis.apache.org/versions/1.14.0/migration-notes/migration-notes.html#_migration-notes_1.13.0-to-1.14.0">migration notes</a> when you upgrade your app.</p>
</div>
<div class="sect2">
<h3 id="_new_feature_7">New Feature</h3>
@@ -2091,19 +2091,19 @@ table.CodeRay td.code>pre{padding:0}
</div>
<div class="sectionbody">
<div class="paragraph">
- <p>Apache Isis 1.13.0 improves and formalizes the support for commands and auditing, and introduces the new concept of an interaction. A command now represents the <em>intention</em> to interact with the application, either to invoke an action or to edit a property. This is captured as a JAXB DTO. An interaction on the other hand captures the fact that a command has been performed. Interactions are also captured as DTOs. Interactions can include sub-interactions, representing the fact that an action can invoke another action by way of the <a href="../guides/rgsvc/rgsvc.html#_rgsvc_application-layer-api_WrapperFactory"><code>WrapperFactory</code></a>.</p>
+ <p>Apache Isis 1.13.0 improves and formalizes the support for commands and auditing, and introduces the new concept of an interaction. A command now represents the <em>intention</em> to interact with the application, either to invoke an action or to edit a property. This is captured as a JAXB DTO. An interaction on the other hand captures the fact that a command has been performed. Interactions are also captured as DTOs. Interactions can include sub-interactions, representing the fact that an action can invoke another action by way of the <a href="https://isis.apache.org/versions/1.13.0/guides/rgsvc/rgsvc.html#_rgsvc_application-layer-api_WrapperFactory"><code>WrapperFactory</code></a>.</p>
</div>
<div class="paragraph">
- <p>The existing <a href="../guides/rgsvc/rgsvc.html#_rgsvc_persistence-layer-spi_AuditingService"><code>AuditingService</code></a> and <a href="../guides/rgsvc/rgsvc.html#_rgsvc_persistence-layer-spi_PublishingService"><code>PublishingService</code></a> SPI services have both been deprecated, instead replaced by <a href="../guides/rgsvc/rgsvc.html#_rgsvc_persistence-layer-spi_AuditerService"><code>AuditerService</code></a> and <a href="../guides/rgsvc/rgsvc.html#_rgsvc_persistence-layer-spi_PublisherService"><code>PublisherService</code></a>. It is now possible to have multiple implementations of each.</p>
+ <p>The existing <a href="https://isis.apache.org/versions/1.13.0/guides/rgsvc/rgsvc.html#_rgsvc_persistence-layer-spi_AuditingService"><code>AuditingService</code></a> and <a href="https://isis.apache.org/versions/1.13.0/guides/rgsvc/rgsvc.html#_rgsvc_persistence-layer-spi_PublishingService"><code>PublishingService</code></a> SPI services have both been deprecated, instead replaced by <a href="https://isis.apache.org/versions/1.13.0/guides/rgsvc/rgsvc.html#_rgsvc_persistence-layer-spi_AuditerService"><code>AuditerService</code></a> and <a href="https://isis.apache.org/versions/1.13.0/guides/rgsvc/rgsvc.html#_rgsvc_persistence-layer-spi_PublisherService"><code>PublisherService</code></a>. It is now possible to have multiple implementations of each.</p>
</div>
<div class="paragraph">
- <p>The (non-ASF) <a href="http://platform.incode.org" target="_blank">Incode Platform</a>'s auditing module has been reworked to implement <a href="../guides/rgsvc/rgsvc.html#_rgsvc_spi_AuditService"><code>AuditService</code></a>, while the new (non-ASF) <a href="http://platform.incode.org" target="_blank">Incode Platform</a>'s publishmq module implements <a href="../guides/rgsvc/rgsvc.html#_rgsvc_persistence-layer-spi_PublisherService"><code>PublisherService</code></a> to publish interaction events to an ActiveMQ bus (and to allow such events to be replayed if necessary).</p>
+ <p>The (non-ASF) <a href="http://platform.incode.org" target="_blank">Incode Platform</a>'s auditing module has been reworked to implement <a href="https://isis.apache.org/versions/1.13.0/guides/rgsvc/rgsvc.html#_rgsvc_spi_AuditService"><code>AuditService</code></a>, while the new (non-ASF) <a href="http://platform.incode.org" target="_blank">Incode Platform</a>'s publishmq module implements <a href="https://isis.apache.org/versions/1.13.0/guides/rgsvc/rgsvc.html#_rgsvc_persistence-layer-spi_PublisherService"><code>PublisherService</code></a> to publish interaction events to an ActiveMQ bus (and to allow such events to be replayed if necessary).</p>
</div>
<div class="paragraph">
<p>The release also includes a great deal of internal refactorings and simplifications.</p>
</div>
<div class="paragraph">
- <p>Most applications written against v1.12.x should run against v1.13.0 with few if any changes. That said, this release has removed a small number of features that were dependent on internal APIs, and some configuration properties are now removed/unsupported. We therefore do recommend that you read and keep in mind the <a href="../migration-notes/migration-notes.html#_migration-notes_1.12.0-to-1.13.0">migration notes</a> when you upgrade your app.</p>
+ <p>Most applications written against v1.12.x should run against v1.13.0 with few if any changes. That said, this release has removed a small number of features that were dependent on internal APIs, and some configuration properties are now removed/unsupported. We therefore do recommend that you read and keep in mind the <a href="https://isis.apache.org/versions/1.13.0/migration-notes/migration-notes.html#_migration-notes_1.12.0-to-1.13.0">migration notes</a> when you upgrade your app.</p>
</div>
<div class="sect2">
<h3 id="_new_feature_11">New Feature</h3>
@@ -2328,21 +2328,21 @@ table.CodeRay td.code>pre{padding:0}
<p>As a result of this change, the support for editing objects has been modified; rather than an 'edit' button which toggles the entire page into edit mode, instead each property is edited individually. The current implementation of this is using a prompt dialog (very similar to the action prompt dialogs; in a future release we hope to support "in-place" edits instead.</p>
</div>
<div class="paragraph">
- <p>Another notable change in this release include various new domain services. Some of these are in support of the file-based layouts functionality, others including new access into Apache Isis' metamodel. (Some of these new services were originally part of the (non-ASF) <a href="http://www.isisaddons.org">Isis Addons</a>). In addition, the <a href="../guides/rgsvc/rgsvc.html#_rgsvc_core-domain-api_DomainObjectContainer"><code>DomainObjectContainer</code></a> service has been deprecated, replaced by a number of fine-grained services (such as <a href="../guides/rgsvc/rgsvc.html#_rgsvc_persistence-layer-api_RepositoryService"><code>RepositoryService</code></a> and <a href="../guides/rgsvc/rgsvc.html#_rgsvc_application-layer-api_MessageService"><code>MessageService</code></a>).</p>
+ <p>Another notable change in this release include various new domain services. Some of these are in support of the file-based layouts functionality, others including new access into Apache Isis' metamodel. (Some of these new services were originally part of the (non-ASF) <a href="http://www.isisaddons.org">Isis Addons</a>). In addition, the <a href="https://isis.apache.org/versions/1.12.0/guides/rgsvc/rgsvc.html#_rgsvc_core-domain-api_DomainObjectContainer"><code>DomainObjectContainer</code></a> service has been deprecated, replaced by a number of fine-grained services (such as <a href="https://isis.apache.org/versions/1.12.0/guides/rgsvc/rgsvc.html#_rgsvc_persistence-layer-api_RepositoryService"><code>RepositoryService</code></a> and <a href="https://isis.apache.org/versions/1.12.0/guides/rgsvc/rgsvc.html#_rgsvc_application-layer-api_MessageService"><code>MessageService</code></a>).</p>
</div>
<div class="paragraph">
- <p>The release also includes a number of new mixins, to automatically surface in the UI an entity’s id, version (if any), and to download the layout XML and rebuild the metamodel for a given domain entity. There is also a mixin to clear any UI hints (part of the file-based layouts functionality). In all cases these mixins can be hidden using either security or by writing a <a href="../guides/rgcms/rgcms.html#_rgcms_classes_super_AbstractSubscriber">subscriber</a> to veto the visibility of the corresponding domain event.</p>
+ <p>The release also includes a number of new mixins, to automatically surface in the UI an entity’s id, version (if any), and to download the layout XML and rebuild the metamodel for a given domain entity. There is also a mixin to clear any UI hints (part of the file-based layouts functionality). In all cases these mixins can be hidden using either security or by writing a <a href="https://isis.apache.org/versions/1.12.0/guides/rgcms/rgcms.html#_rgcms_classes_super_AbstractSubscriber">subscriber</a> to veto the visibility of the corresponding domain event.</p>
</div>
<div class="sect2">
<h3 id="_new_feature_12">New Feature</h3>
<div class="ulist">
<ul>
- <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1351">ISIS-1351</a> - Extend <a href="../guides/rgsvc/rgsvc.html#_rgsvc_core-domain-api_ConfigurationService"><code>ConfigurationService</code></a> to list all configuration properties in the UI</p> </li>
- <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1325">ISIS-1325</a> - New <a href="../guides/rgsvc/rgsvc.html#_rgsvc_application-layer-api_SessionManagementService"><code>SessionManagementService</code></a></p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1351">ISIS-1351</a> - Extend <a href="https://isis.apache.org/versions/1.12.0/guides/rgsvc/rgsvc.html#_rgsvc_core-domain-api_ConfigurationService"><code>ConfigurationService</code></a> to list all configuration properties in the UI</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1325">ISIS-1325</a> - New <a href="https://isis.apache.org/versions/1.12.0/guides/rgsvc/rgsvc.html#_rgsvc_application-layer-api_SessionManagementService"><code>SessionManagementService</code></a></p> </li>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1317">ISIS-1317</a> - Allow single domain object class to be invalidated through a mixin.</p> </li>
- <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1313">ISIS-1313</a> - Enhancement to <a href="../guides/rgmvn/rgmvn.html#_rgmvn_xsd">xsd</a> goal of the isis-maven-plugin to ignore/include the Isis common schemas.</p> </li>
- <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1292">ISIS-1292</a> - Extend <a href="../guides/rgsvc/rgsvc.html#_rgsvc_metadata-api_MetamodelService"><code>MetaModelService</code></a> to surface packages, classes etc (as used by the security module).</p> </li>
- <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-993">ISIS-993</a> - Show different object members on multiple tabs (<a href="../guides/ugvw/ugvw.html#_ugvw_layout_file-based">dynamic XML layouts</a>)</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1313">ISIS-1313</a> - Enhancement to <a href="https://isis.apache.org/versions/1.12.0/guides/rgmvn/rgmvn.html#_rgmvn_xsd">xsd</a> goal of the isis-maven-plugin to ignore/include the Isis common schemas.</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1292">ISIS-1292</a> - Extend <a href="https://isis.apache.org/versions/1.12.0/guides/rgsvc/rgsvc.html#_rgsvc_metadata-api_MetamodelService"><code>MetaModelService</code></a> to surface packages, classes etc (as used by the security module).</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-993">ISIS-993</a> - Show different object members on multiple tabs (<a href="https://isis.apache.org/versions/1.12.0/guides/ugvw/ugvw.html#_ugvw_layout_file-based">dynamic XML layouts</a>)</p> </li>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-784">ISIS-784</a> - Change Wicket viewer to get rid of edit mode, instead allow individual fields to be edited by clicking on them (similar to the way that JIRA works).</p> </li>
</ul>
</div>
@@ -2352,25 +2352,25 @@ table.CodeRay td.code>pre{padding:0}
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1333">ISIS-1333</a> - Remove self-host profile from the archetype</p> </li>
- <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1332">ISIS-1332</a> - Factor out a <a href="../guides/rgsvc/rgsvc.html#_rgsvc_presentation-layer-spi_HintStore"><code>HintStore</code></a> service, so that this is pluggable.</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1332">ISIS-1332</a> - Factor out a <a href="https://isis.apache.org/versions/1.12.0/guides/rgsvc/rgsvc.html#_rgsvc_presentation-layer-spi_HintStore"><code>HintStore</code></a> service, so that this is pluggable.</p> </li>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1330">ISIS-1330</a> - Add CSS classes for table cells and for collections to make it easier to fine tune pages using CSS.</p> </li>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1329">ISIS-1329</a> - Extend hint support for "show all"</p> </li>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1327">ISIS-1327</a> - Change the view mode of the select2 (value drop down) to be a simple text field.</p> </li>
- <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1324">ISIS-1324</a> - Allow multiple different views of same collection in a layout (<a href="../guides/ugvw/ugvw.html#_ugvw_layout_file-based">dynamic XML layouts</a>)</p> </li>
- <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1323">ISIS-1323</a> - Deprecate @CollectionLayout#renderType, since is duplicated by <a href="../guides/rgant/rgant.html#_rgant-CollectionLayout_defaultView"><code>@CollectionLayout#defaultView()</code></a></p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1324">ISIS-1324</a> - Allow multiple different views of same collection in a layout (<a href="https://isis.apache.org/versions/1.12.0/guides/ugvw/ugvw.html#_ugvw_layout_file-based">dynamic XML layouts</a>)</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1323">ISIS-1323</a> - Deprecate @CollectionLayout#renderType, since is duplicated by <a href="https://isis.apache.org/versions/1.12.0/guides/rgant/rgant.html#_rgant-CollectionLayout_defaultView"><code>@CollectionLayout#defaultView()</code></a></p> </li>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1322">ISIS-1322</a> - Mixins not exposing the mixedin object in events (for subscribers to veto).</p> </li>
- <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1321">ISIS-1321</a> - Extend <a href="../guides/rgsvc/rgsvc.html#_rgsvc_metadata-api_MetamodelService"><code>MetaModelService</code></a> to allow CSV of metamodel to be downloaded.</p> </li>
- <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1320">ISIS-1320</a> - Move <a href="../guides/rgsvc/rgsvc.html#_rgsvc_presentation-layer-spi_ContentMappingService"><code>ContentMappingService</code></a> to applib (and simplify)</p> </li>
- <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1312">ISIS-1312</a> - Improve <a href="../guides/rgsvc/rgsvc.html#_rgsvc_integration-api_JaxbService"><code>JaxbServiceDefault#xsd(…)</code></a> to correctly reference the Isis common schema imports.</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1321">ISIS-1321</a> - Extend <a href="https://isis.apache.org/versions/1.12.0/guides/rgsvc/rgsvc.html#_rgsvc_metadata-api_MetamodelService"><code>MetaModelService</code></a> to allow CSV of metamodel to be downloaded.</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1320">ISIS-1320</a> - Move <a href="https://isis.apache.org/versions/1.12.0/guides/rgsvc/rgsvc.html#_rgsvc_presentation-layer-spi_ContentMappingService"><code>ContentMappingService</code></a> to applib (and simplify)</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1312">ISIS-1312</a> - Improve <a href="https://isis.apache.org/versions/1.12.0/guides/rgsvc/rgsvc.html#_rgsvc_integration-api_JaxbService"><code>JaxbServiceDefault#xsd(…)</code></a> to correctly reference the Isis common schema imports.</p> </li>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1300">ISIS-1300</a> - Allow the enablement of the WicketSource plugin to be configurable, and disabled by default</p> </li>
- <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1299">ISIS-1299</a> - <a href="../guides/rgant/rgant.html#_rgant-ViewModel"><code>@ViewModel</code></a> and <a href="../guides/rgant/rgant.html#_rgant-XmlRootElement"><code>@XmlRootElement</code></a> view models should automatically support isCloneable.</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1299">ISIS-1299</a> - <a href="https://isis.apache.org/versions/1.12.0/guides/rgant/rgant.html#_rgant-ViewModel"><code>@ViewModel</code></a> and <a href="https://isis.apache.org/versions/1.12.0/guides/rgant/rgant.html#_rgant-XmlRootElement"><code>@XmlRootElement</code></a> view models should automatically support isCloneable.</p> </li>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1298">ISIS-1298</a> - Fix deprecated annotation use for ViewModel.Cloneable#clone</p> </li>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1295">ISIS-1295</a> - Run integration tests using thread-local, to allow "complete" tests that also exercise, eg Quartz jobs.</p> </li>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1240">ISIS-1240</a> - Derive icon from service when not provided</p> </li>
- <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1239">ISIS-1239</a> - For wicket ui, use a cookie or similar to remember the hint from last time (<a href="../guides/ugvw/ugvw.html#_ugvw_layout_file-based">dynamic XML layouts</a>)</p> </li>
- <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1228">ISIS-1228</a> - Reorganizing/splitting out <a href="../guides/rgant/rgant.html#_rgant-DomainObjectContainer"><code>@DomainObjectContainer</code></a> service.</p> </li>
- <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1048">ISIS-1048</a> - Make view model URLs more secure, eg through a private key (<a href="../guides/rgsvc/rgsvc.html#_rgsvc_presentation-layer-spi_UrlEncodingService"><code>UrlEncodingService</code></a>).</p> </li>
- <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1037">ISIS-1037</a> - Support layout.xml as well as layout.json (<a href="../guides/ugvw/ugvw.html#_ugvw_layout_file-based">dynamic XML layouts</a>)</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1239">ISIS-1239</a> - For wicket ui, use a cookie or similar to remember the hint from last time (<a href="https://isis.apache.org/versions/1.12.0/guides/ugvw/ugvw.html#_ugvw_layout_file-based">dynamic XML layouts</a>)</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1228">ISIS-1228</a> - Reorganizing/splitting out <a href="https://isis.apache.org/versions/1.12.0/guides/rgant/rgant.html#_rgant-DomainObjectContainer"><code>@DomainObjectContainer</code></a> service.</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1048">ISIS-1048</a> - Make view model URLs more secure, eg through a private key (<a href="https://isis.apache.org/versions/1.12.0/guides/rgsvc/rgsvc.html#_rgsvc_presentation-layer-spi_UrlEncodingService"><code>UrlEncodingService</code></a>).</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1037">ISIS-1037</a> - Support layout.xml as well as layout.json (<a href="https://isis.apache.org/versions/1.12.0/guides/ugvw/ugvw.html#_ugvw_layout_file-based">dynamic XML layouts</a>)</p> </li>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-806">ISIS-806</a> - In Wicket viewer, shouldn’t be possible to invoke an action if editing a form.</p> </li>
</ul>
</div>
@@ -2379,7 +2379,7 @@ table.CodeRay td.code>pre{padding:0}
<h3 id="_bug_14">Bug</h3>
<div class="ulist">
<ul>
- <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1348">ISIS-1348</a> - Bug with <a href="../guides/ugtst/ugtst.html#_ugtst_unit-test-support_soap-fake-server-junit-rule">SoapEndpointPublishingRule</a> when multiple endpoints.</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1348">ISIS-1348</a> - Bug with <a href="https://isis.apache.org/versions/1.12.0/guides/ugtst/ugtst.html#_ugtst_unit-test-support_soap-fake-server-junit-rule">SoapEndpointPublishingRule</a> when multiple endpoints.</p> </li>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1347">ISIS-1347</a> - Missing annotation in SimpleObject</p> </li>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1346">ISIS-1346</a> - ActionInvocationContext isn’t populated properly</p> </li>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1342">ISIS-1342</a> - The metamodel validation error page doesn’t reliably render itself if there are errors.</p> </li>
@@ -2387,8 +2387,8 @@ table.CodeRay td.code>pre{padding:0}
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1340">ISIS-1340</a> - Rebuild metamodel mixin action isn’t working reliably</p> </li>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1328">ISIS-1328</a> - Bookmark hints are not being honoured</p> </li>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1319">ISIS-1319</a> - Input dialog for action label for mandatory parameter not shown when the parameter is an view model</p> </li>
- <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1318">ISIS-1318</a> - contributed actions/mixins breaks publishing; also flush any pending actions to be published as the result of doing a wrapped action via the <a href="../guides/rgsvc/rgsvc.html#_rgsvc_application-layer-api_WrapperFactory"><code>WrapperFactory</code></a></p> </li>
- <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1315">ISIS-1315</a> - Can’t generate <a href="../guides/rgmvn/rgmvn.html#_rgmvn_swagger">swagger</a> specs, where actions are contributed.</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1318">ISIS-1318</a> - contributed actions/mixins breaks publishing; also flush any pending actions to be published as the result of doing a wrapped action via the <a href="https://isis.apache.org/versions/1.12.0/guides/rgsvc/rgsvc.html#_rgsvc_application-layer-api_WrapperFactory"><code>WrapperFactory</code></a></p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1315">ISIS-1315</a> - Can’t generate <a href="https://isis.apache.org/versions/1.12.0/guides/rgmvn/rgmvn.html#_rgmvn_swagger">swagger</a> specs, where actions are contributed.</p> </li>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1314">ISIS-1314</a> - Filename parameter label missing for DTO mixins</p> </li>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1311">ISIS-1311</a> - Mixins for Persistable metadata causes exception when rendering.</p> </li>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1310">ISIS-1310</a> - DomainObjectContainer#titleOf(..) does not resolve @Title annotated on private field</p> </li>
@@ -2468,7 +2468,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
<div class="ulist">
<ul>
- <li> <p>the <a href="../guides/ugvro/ugvro.html">Restful Objects viewer</a> now supports simplified representations intended to make it easier to write custom Javascript (and other) clients that consume the REST API; these are obtained using the HTTP Accept header. There is also support for <a href="http://swagger.io">Swagger</a> spec files so that the REST API can be more easily explored and tested.<br></p>
+ <li> <p>the <a href="https://isis.apache.org/versions/1.11.0/guides/ugvro/ugvro.html#">Restful Objects viewer</a> now supports simplified representations intended to make it easier to write custom Javascript (and other) clients that consume the REST API; these are obtained using the HTTP Accept header. There is also support for <a href="http://swagger.io">Swagger</a> spec files so that the REST API can be more easily explored and tested.<br></p>
<div class="paragraph">
<p>In addition, the <code>x-ro-follow-links</code> capability for RO spec representations is now supported.</p>
</div> </li>
@@ -2686,7 +2686,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
<div class="sectionbody">
<div class="paragraph">
- <p>Apache Isis 1.9.0 provides various new "under-the-cover" features, such as <code>AppManifest</code> for simplified bootstrapping, and content negotiation support within <a href="../guides/ugvro/ugvro.html">RestfulObjects viewer</a>. It also updates the DataNucleus version to DN 4.1.x.</p>
+ <p>Apache Isis 1.9.0 provides various new "under-the-cover" features, such as <code>AppManifest</code> for simplified bootstrapping, and content negotiation support within <a href="https://isis.apache.org/versions/1.9.0/guides/ugvro/ugvro.html#">RestfulObjects viewer</a>. It also updates the DataNucleus version to DN 4.1.x.</p>
</div>
<div class="paragraph">
<p>This release was also the first to include the updated Asciidoc website.</p>
[24/39] isis-site git commit: ISIS-1810: updates docs for 2.0.0-M1
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/274edd1d/content/versions/2.0.0-M1/guides/ugfun/ugfun.pdf
----------------------------------------------------------------------
diff --git a/content/versions/2.0.0-M1/guides/ugfun/ugfun.pdf b/content/versions/2.0.0-M1/guides/ugfun/ugfun.pdf
index 210ccc5..fb272be 100644
--- a/content/versions/2.0.0-M1/guides/ugfun/ugfun.pdf
+++ b/content/versions/2.0.0-M1/guides/ugfun/ugfun.pdf
@@ -4,16 +4,16 @@
<< /Title (Fundamentals)
/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:20180812182615+01'00')
-/ModDate (D:20180812182615+01'00')
+/CreationDate (D:20180814003949+02'00')
+/ModDate (D:20180814003949+02'00')
>>
endobj
2 0 obj
<< /Type /Catalog
/Pages 3 0 R
/Names 14 0 R
-/Outlines 1254 0 R
-/PageLabels 1295 0 R
+/Outlines 1248 0 R
+/PageLabels 1289 0 R
/PageMode /UseOutlines
/OpenAction [7 0 R /FitH 842.89]
/ViewerPreferences << /DisplayDocTitle true
@@ -22,8 +22,8 @@ endobj
endobj
3 0 obj
<< /Type /Pages
-/Count 163
-/Kids [7 0 R 10 0 R 12 0 R 40 0 R 48 0 R 51 0 R 54 0 R 58 0 R 68 0 R 83 0 R 87 0 R 94 0 R 105 0 R 110 0 R 119 0 R 124 0 R 129 0 R 136 0 R 153 0 R 163 0 R 177 0 R 191 0 R 200 0 R 208 0 R 215 0 R 220 0 R 229 0 R 238 0 R 244 0 R 249 0 R 259 0 R 272 0 R 285 0 R 295 0 R 309 0 R 318 0 R 325 0 R 335 0 R 348 0 R 351 0 R 359 0 R 363 0 R 365 0 R 367 0 R 369 0 R 371 0 R 377 0 R 389 0 R 398 0 R 404 0 R 408 0 R 412 0 R 416 0 R 421 0 R 426 0 R 430 0 R 434 0 R 441 0 R 445 0 R 449 0 R 453 0 R 457 0 R 461 0 R 474 0 R 484 0 R 490 0 R 494 0 R 496 0 R 498 0 R 500 0 R 504 0 R 507 0 R 514 0 R 516 0 R 518 0 R 527 0 R 538 0 R 549 0 R 559 0 R 563 0 R 567 0 R 571 0 R 575 0 R 584 0 R 589 0 R 596 0 R 600 0 R 605 0 R 607 0 R 609 0 R 612 0 R 626 0 R 629 0 R 633 0 R 650 0 R 655 0 R 666 0 R 673 0 R 686 0 R 697 0 R 706 0 R 710 0 R 718 0 R 727 0 R 732 0 R 742 0 R 746 0 R 758 0 R 763 0 R 771 0 R 774 0 R 788 0 R 797 0 R 808 0 R 810 0 R 814 0 R 821 0 R 824 0 R 833 0 R 837 0 R 843 0 R 853 0 R 857 0 R 859 0 R 866 0 R 870
0 R 872 0 R 875 0 R 889 0 R 899 0 R 902 0 R 906 0 R 913 0 R 917 0 R 924 0 R 929 0 R 937 0 R 940 0 R 944 0 R 947 0 R 951 0 R 957 0 R 962 0 R 971 0 R 981 0 R 1005 0 R 1013 0 R 1023 0 R 1030 0 R 1036 0 R 1040 0 R 1053 0 R 1060 0 R 1069 0 R 1077 0 R 1086 0 R 1098 0 R 1100 0 R 1104 0 R 1108 0 R 1125 0 R 1156 0 R 1176 0 R]
+/Count 162
+/Kids [7 0 R 10 0 R 12 0 R 40 0 R 48 0 R 51 0 R 54 0 R 58 0 R 68 0 R 83 0 R 87 0 R 94 0 R 105 0 R 110 0 R 119 0 R 124 0 R 129 0 R 136 0 R 153 0 R 163 0 R 177 0 R 191 0 R 200 0 R 208 0 R 215 0 R 220 0 R 229 0 R 238 0 R 244 0 R 249 0 R 259 0 R 272 0 R 285 0 R 295 0 R 309 0 R 318 0 R 325 0 R 335 0 R 348 0 R 351 0 R 359 0 R 363 0 R 365 0 R 367 0 R 369 0 R 371 0 R 377 0 R 389 0 R 398 0 R 404 0 R 408 0 R 412 0 R 416 0 R 421 0 R 426 0 R 430 0 R 434 0 R 441 0 R 445 0 R 449 0 R 453 0 R 457 0 R 461 0 R 474 0 R 484 0 R 490 0 R 494 0 R 496 0 R 498 0 R 500 0 R 504 0 R 507 0 R 514 0 R 516 0 R 518 0 R 527 0 R 538 0 R 549 0 R 559 0 R 563 0 R 567 0 R 571 0 R 575 0 R 584 0 R 589 0 R 596 0 R 600 0 R 605 0 R 607 0 R 609 0 R 612 0 R 626 0 R 629 0 R 633 0 R 650 0 R 655 0 R 666 0 R 673 0 R 686 0 R 697 0 R 706 0 R 710 0 R 718 0 R 727 0 R 732 0 R 742 0 R 746 0 R 758 0 R 763 0 R 771 0 R 774 0 R 788 0 R 797 0 R 808 0 R 810 0 R 814 0 R 821 0 R 824 0 R 833 0 R 837 0 R 843 0 R 853 0 R 857 0 R 859 0 R 866 0 R 870
0 R 872 0 R 875 0 R 889 0 R 899 0 R 902 0 R 906 0 R 913 0 R 917 0 R 922 0 R 928 0 R 935 0 R 938 0 R 942 0 R 945 0 R 949 0 R 955 0 R 960 0 R 969 0 R 979 0 R 1003 0 R 1011 0 R 1020 0 R 1027 0 R 1033 0 R 1041 0 R 1053 0 R 1057 0 R 1067 0 R 1074 0 R 1084 0 R 1095 0 R 1097 0 R 1101 0 R 1106 0 R 1129 0 R 1158 0 R]
>>
endobj
4 0 obj
@@ -80,11 +80,11 @@ endobj
<< /Type /Font
/BaseFont /AAAACZ+NotoSerif
/Subtype /TrueType
-/FontDescriptor 1297 0 R
+/FontDescriptor 1291 0 R
/FirstChar 32
/LastChar 255
-/Widths 1299 0 R
-/ToUnicode 1298 0 R
+/Widths 1293 0 R
+/ToUnicode 1292 0 R
>>
endobj
9 0 obj
@@ -1639,7 +1639,7 @@ endobj
/F1.0 8 0 R
>>
>>
-/Annots [1177 0 R 1178 0 R 1179 0 R 1180 0 R 1181 0 R 1182 0 R 1183 0 R 1184 0 R 1185 0 R 1186 0 R 1187 0 R 1188 0 R 1189 0 R 1190 0 R 1191 0 R 1192 0 R 1193 0 R 1194 0 R 1195 0 R 1196 0 R 1197 0 R 1198 0 R 1199 0 R 1200 0 R 1201 0 R 1202 0 R 1203 0 R 1204 0 R 1205 0 R 1206 0 R 1207 0 R 1208 0 R 1209 0 R 1210 0 R 1211 0 R 1212 0 R 1213 0 R 1214 0 R 1215 0 R 1216 0 R 1217 0 R 1218 0 R 1219 0 R 1220 0 R 1221 0 R 1222 0 R 1223 0 R 1224 0 R 1225 0 R 1226 0 R 1227 0 R 1228 0 R 1229 0 R 1230 0 R 1231 0 R 1232 0 R 1233 0 R 1234 0 R 1235 0 R 1236 0 R 1237 0 R 1238 0 R 1239 0 R 1240 0 R 1241 0 R 1242 0 R 1243 0 R 1244 0 R 1245 0 R 1246 0 R 1247 0 R 1248 0 R 1249 0 R 1250 0 R 1251 0 R 1252 0 R]
+/Annots [1171 0 R 1172 0 R 1173 0 R 1174 0 R 1175 0 R 1176 0 R 1177 0 R 1178 0 R 1179 0 R 1180 0 R 1181 0 R 1182 0 R 1183 0 R 1184 0 R 1185 0 R 1186 0 R 1187 0 R 1188 0 R 1189 0 R 1190 0 R 1191 0 R 1192 0 R 1193 0 R 1194 0 R 1195 0 R 1196 0 R 1197 0 R 1198 0 R 1199 0 R 1200 0 R 1201 0 R 1202 0 R 1203 0 R 1204 0 R 1205 0 R 1206 0 R 1207 0 R 1208 0 R 1209 0 R 1210 0 R 1211 0 R 1212 0 R 1213 0 R 1214 0 R 1215 0 R 1216 0 R 1217 0 R 1218 0 R 1219 0 R 1220 0 R 1221 0 R 1222 0 R 1223 0 R 1224 0 R 1225 0 R 1226 0 R 1227 0 R 1228 0 R 1229 0 R 1230 0 R 1231 0 R 1232 0 R 1233 0 R 1234 0 R 1235 0 R 1236 0 R 1237 0 R 1238 0 R 1239 0 R 1240 0 R 1241 0 R 1242 0 R 1243 0 R 1244 0 R 1245 0 R 1246 0 R]
>>
endobj
11 0 obj
@@ -2395,7 +2395,7 @@ endobj
/Font << /F2.0 16 0 R
/F1.0 8 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [17 0 R 18 0 R 19 0 R 20 0 R 21 0 R 22 0 R 24 0 R 25 0 R 26 0 R 27 0 R 28 0 R 29 0 R 30 0 R 31 0 R 32 0 R 33 0 R 34 0 R 35 0 R 36 0 R 37 0 R 38 0 R]
@@ -2410,18 +2410,18 @@ endobj
>>
endobj
15 0 obj
-<< /Kids [113 0 R 471 0 R 765 0 R 704 0 R 314 0 R 223 0 R 114 0 R 1043 0 R 623 0 R 922 0 R 840 0 R 297 0 R 529 0 R]
+<< /Kids [113 0 R 471 0 R 765 0 R 704 0 R 314 0 R 223 0 R 114 0 R 1038 0 R 623 0 R 920 0 R 840 0 R 297 0 R 529 0 R]
>>
endobj
16 0 obj
<< /Type /Font
/BaseFont /AAAADA+NotoSerif-Bold
/Subtype /TrueType
-/FontDescriptor 1301 0 R
+/FontDescriptor 1295 0 R
/FirstChar 32
/LastChar 255
-/Widths 1303 0 R
-/ToUnicode 1302 0 R
+/Widths 1297 0 R
+/ToUnicode 1296 0 R
>>
endobj
17 0 obj
@@ -3318,7 +3318,7 @@ endobj
/F1.0 8 0 R
/F3.0 45 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [44 0 R]
@@ -3348,11 +3348,11 @@ endobj
<< /Type /Font
/BaseFont /AAAADB+NotoSerif-BoldItalic
/Subtype /TrueType
-/FontDescriptor 1305 0 R
+/FontDescriptor 1299 0 R
/FirstChar 32
/LastChar 255
-/Widths 1307 0 R
-/ToUnicode 1306 0 R
+/Widths 1301 0 R
+/ToUnicode 1300 0 R
>>
endobj
46 0 obj
@@ -4075,7 +4075,7 @@ endobj
/F3.0 45 0 R
/F2.0 16 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
>>
@@ -4084,11 +4084,11 @@ endobj
<< /Type /Font
/BaseFont /AAAADC+NotoSerif-Italic
/Subtype /TrueType
-/FontDescriptor 1309 0 R
+/FontDescriptor 1303 0 R
/FirstChar 32
/LastChar 255
-/Widths 1311 0 R
-/ToUnicode 1310 0 R
+/Widths 1305 0 R
+/ToUnicode 1304 0 R
>>
endobj
50 0 obj
@@ -4879,7 +4879,7 @@ endobj
/F2.0 16 0 R
/F4.0 49 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
>>
@@ -5745,7 +5745,7 @@ endobj
/F4.0 49 0 R
/F1.1 56 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
>>
@@ -5757,11 +5757,11 @@ endobj
<< /Type /Font
/BaseFont /AAAADD+NotoSerif
/Subtype /TrueType
-/FontDescriptor 1313 0 R
+/FontDescriptor 1307 0 R
/FirstChar 32
/LastChar 255
-/Widths 1315 0 R
-/ToUnicode 1314 0 R
+/Widths 1309 0 R
+/ToUnicode 1308 0 R
>>
endobj
57 0 obj
@@ -6684,7 +6684,7 @@ endobj
/F4.0 49 0 R
/F5.1 63 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [59 0 R 60 0 R 61 0 R 62 0 R 64 0 R 65 0 R 66 0 R]
@@ -6738,11 +6738,11 @@ endobj
<< /Type /Font
/BaseFont /AAAADE+FontAwesome
/Subtype /TrueType
-/FontDescriptor 1317 0 R
+/FontDescriptor 1311 0 R
/FirstChar 32
/LastChar 255
-/Widths 1319 0 R
-/ToUnicode 1318 0 R
+/Widths 1313 0 R
+/ToUnicode 1312 0 R
>>
endobj
64 0 obj
@@ -7624,7 +7624,7 @@ endobj
/F5.1 63 0 R
/F3.0 45 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [71 0 R 72 0 R 73 0 R 74 0 R 75 0 R 77 0 R 79 0 R 80 0 R]
@@ -7637,11 +7637,11 @@ endobj
<< /Type /Font
/BaseFont /AAAADF+mplus1mn-regular
/Subtype /TrueType
-/FontDescriptor 1321 0 R
+/FontDescriptor 1315 0 R
/FirstChar 32
/LastChar 255
-/Widths 1323 0 R
-/ToUnicode 1322 0 R
+/Widths 1317 0 R
+/ToUnicode 1316 0 R
>>
endobj
71 0 obj
@@ -8597,7 +8597,7 @@ endobj
/Contents 82 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/XObject << /I1 81 0 R
-/Stamp1 1253 0 R
+/Stamp1 1247 0 R
>>
/Font << /F4.0 49 0 R
/F1.0 8 0 R
@@ -9436,7 +9436,7 @@ endobj
/F4.0 49 0 R
/F6.0 70 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [90 0 R 91 0 R 92 0 R]
@@ -10310,7 +10310,7 @@ endobj
/F2.0 16 0 R
/F4.0 49 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [95 0 R 96 0 R 97 0 R 98 0 R 99 0 R 100 0 R]
@@ -11029,7 +11029,7 @@ endobj
/F2.0 16 0 R
/F4.0 49 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [107 0 R]
@@ -11830,7 +11830,7 @@ endobj
/F4.0 49 0 R
/F1.1 56 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [115 0 R 116 0 R]
@@ -11849,7 +11849,7 @@ endobj
endobj
114 0 obj
<< /Limits [(_ugfun_core-concepts_principles) (_ugfun_getting-started_prerequisites.adoc)]
-/Names [(_ugfun_core-concepts_principles) 112 0 R (_ugfun_core-concepts_principles_build-not-buy) 117 0 R (_ugfun_core-concepts_principles_for-the-long-term) 125 0 R (_ugfun_crud) 1006 0 R (_ugfun_crud_deleting) 1048 0 R (_ugfun_crud_finding) 1032 0 R (_ugfun_crud_instantiating) 1017 0 R (_ugfun_crud_persisting) 1024 0 R (_ugfun_crud_updating) 1042 0 R (_ugfun_drop-downs-and-defaults) 1084 0 R (_ugfun_getting-started_helloworld-archetype) 352 0 R (_ugfun_getting-started_prerequisites.adoc) 354 0 R]
+/Names [(_ugfun_core-concepts_principles) 112 0 R (_ugfun_core-concepts_principles_build-not-buy) 117 0 R (_ugfun_core-concepts_principles_for-the-long-term) 125 0 R (_ugfun_crud) 1004 0 R (_ugfun_crud_deleting) 1045 0 R (_ugfun_crud_finding) 1029 0 R (_ugfun_crud_instantiating) 1014 0 R (_ugfun_crud_persisting) 1021 0 R (_ugfun_crud_updating) 1037 0 R (_ugfun_drop-downs-and-defaults) 1081 0 R (_ugfun_getting-started_helloworld-archetype) 352 0 R (_ugfun_getting-started_prerequisites.adoc) 354 0 R]
>>
endobj
115 0 obj
@@ -12201,7 +12201,7 @@ endobj
/F1.1 56 0 R
>>
/XObject << /I2 120 0 R
-/Stamp1 1253 0 R
+/Stamp1 1247 0 R
>>
>>
/Annots [122 0 R]
@@ -12917,7 +12917,7 @@ endobj
/F1.1 56 0 R
/F2.0 16 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
>>
@@ -13693,7 +13693,7 @@ endobj
/Contents 128 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/XObject << /I3 126 0 R
-/Stamp1 1253 0 R
+/Stamp1 1247 0 R
>>
/Font << /F4.0 49 0 R
/F1.0 8 0 R
@@ -15115,7 +15115,7 @@ endobj
/F5.1 63 0 R
/F2.0 16 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [137 0 R 138 0 R 139 0 R 140 0 R 141 0 R 142 0 R 143 0 R 144 0 R 147 0 R 148 0 R 149 0 R 150 0 R 151 0 R]
@@ -16123,7 +16123,7 @@ endobj
/F4.0 49 0 R
/F6.0 70 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [154 0 R 155 0 R 156 0 R 157 0 R 158 0 R 159 0 R 160 0 R]
@@ -17306,7 +17306,7 @@ endobj
/F2.0 16 0 R
/F4.0 49 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [164 0 R 165 0 R 166 0 R 167 0 R 168 0 R 170 0 R 171 0 R 172 0 R 173 0 R 175 0 R]
@@ -17371,11 +17371,11 @@ endobj
<< /Type /Font
/BaseFont /AAAADG+mplus-1p-regular
/Subtype /TrueType
-/FontDescriptor 1325 0 R
+/FontDescriptor 1319 0 R
/FirstChar 32
/LastChar 255
-/Widths 1327 0 R
-/ToUnicode 1326 0 R
+/Widths 1321 0 R
+/ToUnicode 1320 0 R
>>
endobj
170 0 obj
@@ -18361,7 +18361,7 @@ endobj
/F1.1 56 0 R
/F2.0 16 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [178 0 R 179 0 R 180 0 R 181 0 R 182 0 R 183 0 R 184 0 R 186 0 R 187 0 R 188 0 R]
@@ -19203,7 +19203,7 @@ endobj
/F2.0 16 0 R
/F6.0 70 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [193 0 R 194 0 R 195 0 R 196 0 R]
@@ -19820,7 +19820,7 @@ endobj
/F6.0 70 0 R
/F2.0 16 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [201 0 R 203 0 R 204 0 R 206 0 R]
@@ -20891,7 +20891,7 @@ endobj
/F7.0 169 0 R
/F5.1 63 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [211 0 R 212 0 R]
@@ -22047,7 +22047,7 @@ endobj
/F2.0 16 0 R
/F4.0 49 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [216 0 R 218 0 R]
@@ -22969,7 +22969,7 @@ endobj
/F4.0 49 0 R
/F6.0 70 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [221 0 R 224 0 R 225 0 R 226 0 R 227 0 R]
@@ -23405,7 +23405,7 @@ endobj
/F4.0 49 0 R
>>
/XObject << /I4 233 0 R
-/Stamp1 1253 0 R
+/Stamp1 1247 0 R
>>
>>
/Annots [230 0 R 232 0 R 235 0 R]
@@ -24463,7 +24463,7 @@ endobj
/F2.0 16 0 R
/F1.1 56 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [239 0 R 240 0 R 241 0 R]
@@ -25215,7 +25215,7 @@ endobj
/F2.0 16 0 R
/F4.0 49 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [245 0 R]
@@ -26154,7 +26154,7 @@ endobj
/F5.1 63 0 R
/F1.1 56 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [250 0 R 251 0 R 252 0 R 253 0 R 255 0 R 256 0 R 257 0 R]
@@ -27052,7 +27052,7 @@ endobj
/F5.1 63 0 R
/F2.0 16 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [260 0 R 261 0 R 262 0 R 263 0 R 264 0 R 265 0 R 266 0 R 268 0 R 269 0 R 270 0 R]
@@ -28117,7 +28117,7 @@ endobj
/F2.0 16 0 R
/F6.0 70 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [273 0 R 274 0 R 275 0 R 276 0 R 277 0 R 278 0 R 279 0 R 281 0 R 282 0 R 283 0 R]
@@ -28907,7 +28907,7 @@ endobj
/F5.1 63 0 R
/F2.0 16 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [286 0 R 287 0 R 288 0 R 289 0 R 290 0 R]
@@ -29888,7 +29888,7 @@ endobj
/F6.0 70 0 R
/F5.1 63 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [299 0 R 300 0 R 302 0 R 303 0 R 304 0 R 305 0 R 306 0 R 307 0 R]
@@ -31410,7 +31410,7 @@ endobj
/F1.1 56 0 R
/F4.0 49 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [310 0 R 311 0 R 312 0 R]
@@ -31454,7 +31454,7 @@ endobj
endobj
314 0 obj
<< /Limits [(_ugfun_building-blocks_identifiers_title-and-icon) (_ugfun_core-concepts_apache-isis-vs_cqrs)]
-/Names [(_ugfun_building-blocks_identifiers_title-and-icon) 292 0 R (_ugfun_building-blocks_metamodel) 210 0 R (_ugfun_building-blocks_modules) 345 0 R (_ugfun_building-blocks_object-members) 313 0 R (_ugfun_building-blocks_types-of-domain-objects) 213 0 R (_ugfun_building-blocks_types-of-domain-objects_domain-entities) 217 0 R (_ugfun_building-blocks_types-of-domain-objects_domain-services) 222 0 R (_ugfun_building-blocks_types-of-domain-objects_mixins) 280 0 R (_ugfun_building-blocks_types-of-domain-objects_view-models) 236 0 R (_ugfun_business-rules) 1056 0 R (_ugfun_core-concepts) 41 0 R (_ugfun_core-concepts_apache-isis-vs) 145 0 R (_ugfun_core-concepts_apache-isis-vs_cqrs) 161 0 R]
+/Names [(_ugfun_building-blocks_identifiers_title-and-icon) 292 0 R (_ugfun_building-blocks_metamodel) 210 0 R (_ugfun_building-blocks_modules) 345 0 R (_ugfun_building-blocks_object-members) 313 0 R (_ugfun_building-blocks_types-of-domain-objects) 213 0 R (_ugfun_building-blocks_types-of-domain-objects_domain-entities) 217 0 R (_ugfun_building-blocks_types-of-domain-objects_domain-services) 222 0 R (_ugfun_building-blocks_types-of-domain-objects_mixins) 280 0 R (_ugfun_building-blocks_types-of-domain-objects_view-models) 236 0 R (_ugfun_business-rules) 1051 0 R (_ugfun_core-concepts) 41 0 R (_ugfun_core-concepts_apache-isis-vs) 145 0 R (_ugfun_core-concepts_apache-isis-vs_cqrs) 161 0 R]
>>
endobj
315 0 obj
@@ -33496,7 +33496,7 @@ endobj
/F5.1 63 0 R
/F2.0 16 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [321 0 R 322 0 R 323 0 R]
@@ -33939,10 +33939,10 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-1.743 Tw
+0.618 Tw
BT
-48.24000000000001 505.28600000000034 Td
+66.24000000000001 505.28600000000034 Td
/F1.0 10.5 Tf
[<46> 40.0390625 <6f7220612070726f70657274792074686973206d616b> 20.01953125 <657320697420726561642d6f6e6c793b20666f7220616e20616374696f6e2074686973206d616b> 20.01953125 <65732069742022> 40.0390625 <677265796564206f7574222e2028436f6c6c656374696f6e7320617265>] TJ
ET
@@ -33955,7 +33955,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24000000000001 489.5060000000003 Td
+66.24000000000001 489.5060000000003 Td
/F1.0 10.5 Tf
<696d706c696369746c7920726561642d6f6e6c79292e> Tj
ET
@@ -34002,10 +34002,10 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-1.579 Tw
+0.454 Tw
BT
-48.24000000000001 433.9460000000003 Td
+66.24000000000001 433.9460000000003 Td
/F1.0 10.5 Tf
[<46> 40.0390625 <6f7220612070726f70657274792074686973206d65616e732076616c69646174696e67207468652070726f706f736564206e65772076616c7565206f66207468652070726f70657274793b20666f7220616e20616374696f6e2074686973>] TJ
ET
@@ -34017,10 +34017,10 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-2.593 Tw
+0.957 Tw
BT
-48.24000000000001 418.1660000000003 Td
+66.24000000000001 418.1660000000003 Td
/F1.0 10.5 Tf
[<6d65616e732076616c69646174696e672074686520616374696f6e20706172> 20.01953125 <616d6574657220617267756d656e74732e2046> 40.0390625 <6f72206578616d706c652c2061207265666572656e7469616c20696e74656772697479207265737472696374>] TJ
ET
@@ -34033,7 +34033,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24000000000001 402.3860000000003 Td
+66.24000000000001 402.3860000000003 Td
/F1.0 10.5 Tf
<636f756c6420626520696d706c656d656e74656420686572652e> Tj
ET
@@ -34100,7 +34100,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24000000000001 331.0460000000003 Td
+66.24000000000001 331.0460000000003 Td
/F1.0 10.5 Tf
[<46> 40.0390625 <6f72206578616d706c652c206120636173636164652064656c65746520636f756c6420626520696d706c656d656e74656420686572652e>] TJ
ET
@@ -34442,7 +34442,7 @@ endobj
/F1.1 56 0 R
/F6.0 70 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [327 0 R 328 0 R 329 0 R 331 0 R 332 0 R 333 0 R]
@@ -35399,7 +35399,7 @@ endobj
/F5.1 63 0 R
/F4.0 49 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [336 0 R 337 0 R 338 0 R 339 0 R 341 0 R 342 0 R 343 0 R 344 0 R 346 0 R]
@@ -35880,7 +35880,7 @@ endobj
/F6.0 70 0 R
/F4.0 49 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [349 0 R]
@@ -36593,7 +36593,7 @@ endobj
/F6.0 70 0 R
/F5.1 63 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [353 0 R 355 0 R 356 0 R]
@@ -37453,7 +37453,7 @@ endobj
/F6.1 361 0 R
/F5.1 63 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
>>
@@ -37465,11 +37465,11 @@ endobj
<< /Type /Font
/BaseFont /AAAADH+mplus1mn-regular
/Subtype /TrueType
-/FontDescriptor 1329 0 R
+/FontDescriptor 1323 0 R
/FirstChar 32
/LastChar 255
-/Widths 1331 0 R
-/ToUnicode 1330 0 R
+/Widths 1325 0 R
+/ToUnicode 1324 0 R
>>
endobj
362 0 obj
@@ -39008,7 +39008,7 @@ endobj
/Font << /F6.0 70 0 R
/F1.0 8 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
>>
@@ -40227,7 +40227,7 @@ endobj
/F6.0 70 0 R
/F5.1 63 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
>>
@@ -42315,7 +42315,7 @@ endobj
/Font << /F1.0 8 0 R
/F6.0 70 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
>>
@@ -43347,7 +43347,7 @@ endobj
/F6.0 70 0 R
/F6.1 361 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
>>
@@ -44134,7 +44134,7 @@ endobj
/F6.1 361 0 R
/F2.0 16 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [374 0 R 375 0 R]
@@ -44719,7 +44719,7 @@ endobj
/F6.0 70 0 R
>>
/XObject << /I5 384 0 R
-/Stamp1 1253 0 R
+/Stamp1 1247 0 R
>>
>>
/Annots [380 0 R 382 0 R 383 0 R 385 0 R 386 0 R]
@@ -45161,7 +45161,7 @@ endobj
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/XObject << /I6 387 0 R
/I7 394 0 R
-/Stamp1 1253 0 R
+/Stamp1 1247 0 R
>>
/Font << /F2.0 16 0 R
/F1.0 8 0 R
@@ -45595,7 +45595,7 @@ endobj
/Contents 397 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/XObject << /I8 399 0 R
-/Stamp1 1253 0 R
+/Stamp1 1247 0 R
>>
/Font << /F1.0 8 0 R
/F6.0 70 0 R
@@ -45847,7 +45847,7 @@ endobj
/Contents 403 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/XObject << /I9 402 0 R
-/Stamp1 1253 0 R
+/Stamp1 1247 0 R
>>
/Font << /F1.0 8 0 R
>>
@@ -45999,7 +45999,7 @@ endobj
/Contents 407 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/XObject << /I10 406 0 R
-/Stamp1 1253 0 R
+/Stamp1 1247 0 R
>>
/Font << /F1.0 8 0 R
>>
@@ -46154,7 +46154,7 @@ endobj
/Contents 411 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/XObject << /I11 410 0 R
-/Stamp1 1253 0 R
+/Stamp1 1247 0 R
>>
/Font << /F1.0 8 0 R
>>
@@ -47486,7 +47486,7 @@ endobj
/Contents 415 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/XObject << /I12 414 0 R
-/Stamp1 1253 0 R
+/Stamp1 1247 0 R
>>
/Font << /F1.0 8 0 R
/F6.0 70 0 R
@@ -48579,7 +48579,7 @@ endobj
/Contents 420 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/XObject << /I13 419 0 R
-/Stamp1 1253 0 R
+/Stamp1 1247 0 R
>>
/Font << /F1.0 8 0 R
/F6.0 70 0 R
@@ -48746,7 +48746,7 @@ endobj
/Contents 425 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/XObject << /I14 424 0 R
-/Stamp1 1253 0 R
+/Stamp1 1247 0 R
>>
/Font << /F1.0 8 0 R
>>
@@ -48878,7 +48878,7 @@ endobj
/Contents 429 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/XObject << /I15 428 0 R
-/Stamp1 1253 0 R
+/Stamp1 1247 0 R
>>
/Font << /F1.0 8 0 R
>>
@@ -49836,7 +49836,7 @@ endobj
/Contents 433 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/XObject << /I16 432 0 R
-/Stamp1 1253 0 R
+/Stamp1 1247 0 R
>>
/Font << /F1.0 8 0 R
/F6.0 70 0 R
@@ -50013,7 +50013,7 @@ endobj
/Contents 440 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/XObject << /I17 439 0 R
-/Stamp1 1253 0 R
+/Stamp1 1247 0 R
>>
/Font << /F1.0 8 0 R
>>
@@ -50243,7 +50243,7 @@ endobj
/Contents 444 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/XObject << /I18 443 0 R
-/Stamp1 1253 0 R
+/Stamp1 1247 0 R
>>
/Font << /F1.0 8 0 R
/F6.0 70 0 R
@@ -50407,7 +50407,7 @@ endobj
/Contents 448 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/XObject << /I19 447 0 R
-/Stamp1 1253 0 R
+/Stamp1 1247 0 R
>>
/Font << /F1.0 8 0 R
>>
@@ -50609,7 +50609,7 @@ endobj
/Contents 452 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/XObject << /I20 451 0 R
-/Stamp1 1253 0 R
+/Stamp1 1247 0 R
>>
/Font << /F1.0 8 0 R
>>
@@ -50871,7 +50871,7 @@ endobj
/Contents 456 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/XObject << /I21 455 0 R
-/Stamp1 1253 0 R
+/Stamp1 1247 0 R
>>
/Font << /F1.0 8 0 R
/F6.0 70 0 R
@@ -51452,7 +51452,7 @@ endobj
/Contents 460 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/XObject << /I22 459 0 R
-/Stamp1 1253 0 R
+/Stamp1 1247 0 R
>>
/Font << /F1.0 8 0 R
/F2.0 16 0 R
@@ -52275,7 +52275,7 @@ endobj
/F6.0 70 0 R
/F5.1 63 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [476 0 R 477 0 R 478 0 R]
@@ -52927,7 +52927,7 @@ endobj
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/XObject << /I23 481 0 R
/I24 486 0 R
-/Stamp1 1253 0 R
+/Stamp1 1247 0 R
>>
/Font << /F1.0 8 0 R
/F6.0 70 0 R
@@ -53761,7 +53761,7 @@ endobj
/F4.0 49 0 R
/F2.0 16 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
>>
@@ -54351,7 +54351,7 @@ endobj
/F6.1 361 0 R
/F1.0 8 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
>>
@@ -56457,7 +56457,7 @@ endobj
/Font << /F6.0 70 0 R
/F1.0 8 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
>>
@@ -57779,7 +57779,7 @@ endobj
/F1.0 8 0 R
/F6.1 361 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
>>
@@ -58497,7 +58497,7 @@ endobj
/F2.0 16 0 R
/F5.1 63 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [501 0 R]
@@ -60067,7 +60067,7 @@ endobj
/F6.1 361 0 R
/F1.0 8 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [505 0 R]
@@ -60962,7 +60962,7 @@ endobj
/F1.0 8 0 R
/F2.0 16 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [508 0 R 509 0 R 510 0 R 511 0 R]
@@ -62511,7 +62511,7 @@ endobj
/F1.0 8 0 R
/F6.1 361 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
>>
@@ -63702,7 +63702,7 @@ endobj
/F6.0 70 0 R
/F1.0 8 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
>>
@@ -64644,7 +64644,7 @@ endobj
/F6.0 70 0 R
/F2.0 16 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [519 0 R 520 0 R 523 0 R 524 0 R]
@@ -65509,7 +65509,7 @@ endobj
/F2.0 16 0 R
/F4.0 49 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [530 0 R 532 0 R 533 0 R 534 0 R 535 0 R]
@@ -65875,7 +65875,7 @@ endobj
>>
/XObject << /I25 541 0 R
/I26 544 0 R
-/Stamp1 1253 0 R
+/Stamp1 1247 0 R
>>
>>
/Annots [539 0 R 540 0 R 542 0 R 543 0 R 545 0 R 547 0 R]
@@ -66635,7 +66635,7 @@ endobj
/F2.0 16 0 R
>>
/XObject << /I27 550 0 R
-/Stamp1 1253 0 R
+/Stamp1 1247 0 R
>>
>>
/Annots [551 0 R 552 0 R 554 0 R 555 0 R 556 0 R]
@@ -66911,7 +66911,7 @@ endobj
/Contents 558 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/XObject << /I28 557 0 R
-/Stamp1 1253 0 R
+/Stamp1 1247 0 R
>>
/Font << /F1.0 8 0 R
>>
@@ -67104,7 +67104,7 @@ endobj
/Contents 562 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/XObject << /I29 561 0 R
-/Stamp1 1253 0 R
+/Stamp1 1247 0 R
>>
/Font << /F1.0 8 0 R
>>
@@ -67255,7 +67255,7 @@ endobj
/Contents 566 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/XObject << /I30 565 0 R
-/Stamp1 1253 0 R
+/Stamp1 1247 0 R
>>
/Font << /F1.0 8 0 R
>>
@@ -67419,7 +67419,7 @@ endobj
/Contents 570 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/XObject << /I31 569 0 R
-/Stamp1 1253 0 R
+/Stamp1 1247 0 R
>>
/Font << /F1.0 8 0 R
>>
@@ -67860,7 +67860,7 @@ endobj
/Contents 574 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/XObject << /I32 573 0 R
-/Stamp1 1253 0 R
+/Stamp1 1247 0 R
>>
/Font << /F2.0 16 0 R
/F1.0 8 0 R
@@ -68447,7 +68447,7 @@ endobj
/F2.0 16 0 R
>>
/XObject << /I33 585 0 R
-/Stamp1 1253 0 R
+/Stamp1 1247 0 R
>>
>>
/Annots [586 0 R]
@@ -68820,7 +68820,7 @@ endobj
/F2.0 16 0 R
/F1.0 8 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [591 0 R 592 0 R 593 0 R 594 0 R]
@@ -69812,7 +69812,7 @@ endobj
/F6.0 70 0 R
/F5.1 63 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [598 0 R]
@@ -70872,7 +70872,7 @@ endobj
/F2.0 16 0 R
/F7.0 169 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [601 0 R 602 0 R]
@@ -72920,7 +72920,7 @@ endobj
/F1.0 8 0 R
/F1.1 56 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
>>
@@ -75573,7 +75573,7 @@ endobj
/F6.1 361 0 R
/F1.0 8 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
>>
@@ -77763,7 +77763,7 @@ endobj
/F1.0 8 0 R
/F5.1 63 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [610 0 R]
@@ -78711,7 +78711,7 @@ endobj
/F6.0 70 0 R
/F7.0 169 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [615 0 R 616 0 R 617 0 R 618 0 R 619 0 R 620 0 R 621 0 R 624 0 R]
@@ -78805,7 +78805,7 @@ endobj
endobj
623 0 obj
<< /Limits [(_ugfun_programming-model_domain-services_registering) (_ugfun_programming-model_mixins_inferred-name)]
-/Names [(_ugfun_programming-model_domain-services_registering) 667 0 R (_ugfun_programming-model_domain-services_repository-and-factory) 622 0 R (_ugfun_programming-model_domain-services_scoped-services) 659 0 R (_ugfun_programming-model_inject-services) 803 0 R (_ugfun_programming-model_mixins) 894 0 R (_ugfun_programming-model_mixins_contributed-action) 904 0 R (_ugfun_programming-model_mixins_contributed-collection) 900 0 R (_ugfun_programming-model_mixins_contributed-property) 903 0 R (_ugfun_programming-model_mixins_contributed-services) 921 0 R (_ugfun_programming-model_mixins_inferred-name) 907 0 R]
+/Names [(_ugfun_programming-model_domain-services_registering) 667 0 R (_ugfun_programming-model_domain-services_repository-and-factory) 622 0 R (_ugfun_programming-model_domain-services_scoped-services) 659 0 R (_ugfun_programming-model_inject-services) 803 0 R (_ugfun_programming-model_mixins) 894 0 R (_ugfun_programming-model_mixins_contributed-action) 904 0 R (_ugfun_programming-model_mixins_contributed-collection) 900 0 R (_ugfun_programming-model_mixins_contributed-property) 903 0 R (_ugfun_programming-model_mixins_contributed-services) 919 0 R (_ugfun_programming-model_mixins_inferred-name) 907 0 R]
>>
endobj
624 0 obj
@@ -80887,7 +80887,7 @@ endobj
/F1.0 8 0 R
/F2.0 16 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
>>
@@ -84037,7 +84037,7 @@ endobj
/F6.1 361 0 R
/F1.0 8 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [630 0 R 631 0 R]
@@ -84970,7 +84970,7 @@ endobj
/F5.1 63 0 R
/F2.0 16 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [634 0 R 635 0 R 636 0 R 637 0 R 638 0 R 639 0 R 640 0 R 641 0 R 642 0 R 643 0 R 645 0 R 646 0 R 647 0 R 648 0 R]
@@ -86817,7 +86817,7 @@ endobj
/F2.0 16 0 R
/F5.1 63 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [651 0 R 653 0 R]
@@ -88769,7 +88769,7 @@ endobj
/F1.0 8 0 R
/F2.0 16 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [656 0 R 657 0 R 658 0 R 660 0 R 661 0 R 662 0 R 663 0 R 664 0 R]
@@ -89544,7 +89544,7 @@ endobj
/F1.0 8 0 R
/F6.0 70 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [668 0 R 669 0 R 670 0 R]
@@ -90767,7 +90767,7 @@ endobj
/F6.0 70 0 R
/F2.0 16 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [674 0 R 675 0 R 677 0 R 678 0 R 679 0 R 680 0 R 681 0 R 682 0 R 683 0 R]
@@ -92295,7 +92295,7 @@ endobj
/F2.0 16 0 R
/F7.0 169 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [687 0 R 688 0 R 689 0 R 690 0 R 691 0 R 692 0 R 693 0 R 694 0 R]
@@ -93964,7 +93964,7 @@ endobj
/F2.0 16 0 R
/F7.0 169 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [699 0 R 701 0 R 702 0 R]
@@ -94011,7 +94011,7 @@ endobj
endobj
704 0 obj
<< /Limits [(__ugfun_programming-model_properties_editable-properties) (_ugfun_building-blocks_identifiers_oid)]
-/Names [(__ugfun_programming-model_properties_editable-properties) 698 0 R (__ugfun_programming-model_properties_ignoring-properties) 700 0 R (__ugfun_programming-model_properties_optional-properties) 695 0 R (__ugfun_programming-model_properties_value-vs-reference-types) 684 0 R (_ugfun_available-domain-services) 1105 0 R (_ugfun_available-domain-services_framework-provided) 1109 0 R (_ugfun_available-domain-services_incode-platform) 1172 0 R (_ugfun_building-blocks) 209 0 R (_ugfun_building-blocks_events) 320 0 R (_ugfun_building-blocks_events_domain-events) 326 0 R (_ugfun_building-blocks_events_lifecycle-events) 340 0 R (_ugfun_building-blocks_events_ui-events) 330 0 R (_ugfun_building-blocks_identifiers) 291 0 R (_ugfun_building-blocks_identifiers_oid) 301 0 R]
+/Names [(__ugfun_programming-model_properties_editable-properties) 698 0 R (__ugfun_programming-model_properties_ignoring-properties) 700 0 R (__ugfun_programming-model_properties_optional-properties) 695 0 R (__ugfun_programming-model_properties_value-vs-reference-types) 684 0 R (_ugfun_available-domain-services) 1102 0 R (_ugfun_available-domain-services_framework-provided) 1104 0 R (_ugfun_available-domain-services_incode-platform) 1168 0 R (_ugfun_building-blocks) 209 0 R (_ugfun_building-blocks_events) 320 0 R (_ugfun_building-blocks_events_domain-events) 326 0 R (_ugfun_building-blocks_events_lifecycle-events) 340 0 R (_ugfun_building-blocks_events_ui-events) 330 0 R (_ugfun_building-blocks_identifiers) 291 0 R (_ugfun_building-blocks_identifiers_oid) 301 0 R]
>>
endobj
705 0 obj
@@ -96211,7 +96211,7 @@ endobj
/F2.0 16 0 R
/F7.0 169 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
>>
@@ -97910,7 +97910,7 @@ endobj
/F6.0 70 0 R
/F4.0 49 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [712 0 R 713 0 R 714 0 R 716 0 R]
@@ -100284,7 +100284,7 @@ endobj
/F1.0 8 0 R
/F2.0 16 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [719 0 R 720 0 R 722 0 R 723 0 R 724 0 R 725 0 R]
@@ -104072,7 +104072,7 @@ endobj
/F1.0 8 0 R
/F2.0 16 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [729 0 R]
@@ -105953,7 +105953,7 @@ endobj
/F2.0 16 0 R
/F7.0 169 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [734 0 R 735 0 R 736 0 R 737 0 R 738 0 R 739 0 R 740 0 R]
@@ -108300,7 +108300,7 @@ endobj
/F2.0 16 0 R
/F6.1 361 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [743 0 R]
@@ -109480,7 +109480,7 @@ endobj
/F6.0 70 0 R
/F2.0 16 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [747 0 R 748 0 R 749 0 R 750 0 R 752 0 R 755 0 R 756 0 R]
@@ -110983,7 +110983,7 @@ endobj
/F6.1 361 0 R
/F5.1 63 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [760 0 R 761 0 R]
@@ -112758,7 +112758,7 @@ endobj
/F7.0 169 0 R
/F6.1 361 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [766 0 R 767 0 R 768 0 R]
@@ -114188,7 +114188,7 @@ endobj
/F1.0 8 0 R
/F2.0 16 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
>>
@@ -116443,7 +116443,7 @@ endobj
/F2.0 16 0 R
/F6.1 361 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [775 0 R 776 0 R 778 0 R 779 0 R 780 0 R 781 0 R 782 0 R 784 0 R 785 0 R 786 0 R]
@@ -118354,7 +118354,7 @@ endobj
/F5.1 63 0 R
/F2.0 16 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [789 0 R 790 0 R 791 0 R 793 0 R 794 0 R 795 0 R]
@@ -119385,10 +119385,10 @@ q
52.240 566.190 m
543.040 566.190 l
545.249 566.190 547.040 564.399 547.040 562.190 c
-547.040 -37448.990 l
-547.040 -37451.199 545.249 -37452.990 543.040 -37452.990 c
-52.240 -37452.990 l
-50.031 -37452.990 48.240 -37451.199 48.240 -37448.990 c
+547.040 -37245.400 l
+547.040 -37247.609 545.249 -37249.400 543.040 -37249.400 c
+52.240 -37249.400 l
+50.031 -37249.400 48.240 -37247.609 48.240 -37245.400 c
48.240 562.190 l
48.240 564.399 50.031 566.190 52.240 566.190 c
h
@@ -119972,7 +119972,7 @@ endobj
/F6.1 361 0 R
/F1.0 8 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [798 0 R 799 0 R 800 0 R 801 0 R 802 0 R 804 0 R 805 0 R 806 0 R]
@@ -121655,7 +121655,7 @@ endobj
/F4.0 49 0 R
/F6.0 70 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
>>
@@ -123081,7 +123081,7 @@ endobj
/F4.0 49 0 R
/F2.0 16 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [812 0 R]
@@ -124076,7 +124076,7 @@ endobj
/F6.0 70 0 R
/F1.1 56 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [816 0 R 817 0 R 819 0 R]
@@ -126329,7 +126329,7 @@ endobj
/F6.0 70 0 R
/F6.1 361 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [822 0 R]
@@ -127789,7 +127789,7 @@ endobj
/F1.0 8 0 R
/F6.0 70 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [825 0 R 826 0 R 828 0 R 829 0 R 830 0 R 831 0 R]
@@ -129725,7 +129725,7 @@ endobj
/F4.0 49 0 R
/F2.0 16 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [834 0 R]
@@ -130486,7 +130486,7 @@ endobj
/F5.1 63 0 R
/F1.0 8 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [838 0 R 841 0 R]
@@ -130508,7 +130508,7 @@ endobj
endobj
840 0 obj
<< /Limits [(_ugfun_programming-model_view-models_jaxb_referencing-domain-entities) (deploy-to-production)]
-/Names [(_ugfun_programming-model_view-models_jaxb_referencing-domain-entities) 827 0 R (_ugfun_programming-model_view-models_non-jaxb) 886 0 R (_ugfun_ui-hints) 925 0 R (_ugfun_ui-hints_action-icons-and-css) 959 0 R (_ugfun_ui-hints_eager-rendering) 998 0 R (_ugfun_ui-hints_layout) 927 0 R (_ugfun_ui-hints_names-and-descriptions) 978 0 R (_ugfun_ui-hints_object-titles-and-icons) 932 0 R (actions) 319 0 R (aop-concepts) 88 0 R (architecture-must-be-robust) 108 0 R (collections) 316 0 R (css-class) 298 0 R (ddd-must-be-grounded) 103 0 R (ddd-takes-a-conscious-effort) 102 0 R (deploy-on-your-own-platform) 198 0 R (deploy-the-rest-api) 202 0 R (deploy-to-production) 192 0 R]
+/Names [(_ugfun_programming-model_view-models_jaxb_referencing-domain-entities) 827 0 R (_ugfun_programming-model_view-models_non-jaxb) 886 0 R (_ugfun_ui-hints) 923 0 R (_ugfun_ui-hints_action-icons-and-css) 957 0 R (_ugfun_ui-hints_eager-rendering) 996 0 R (_ugfun_ui-hints_layout) 925 0 R (_ugfun_ui-hints_names-and-descriptions) 976 0 R (_ugfun_ui-hints_object-titles-and-icons) 930 0 R (actions) 319 0 R (aop-concepts) 88 0 R (architecture-must-be-robust) 108 0 R (collections) 316 0 R (css-class) 298 0 R (ddd-must-be-grounded) 103 0 R (ddd-takes-a-conscious-effort) 102 0 R (deploy-on-your-own-platform) 198 0 R (deploy-the-rest-api) 202 0 R (deploy-to-production) 192 0 R]
>>
endobj
841 0 obj
@@ -133885,7 +133885,7 @@ endobj
/F6.1 361 0 R
/F1.0 8 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [844 0 R 845 0 R 846 0 R 847 0 R 848 0 R 849 0 R 850 0 R]
@@ -135443,7 +135443,7 @@ endobj
/F6.0 70 0 R
/F6.1 361 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [854 0 R 855 0 R]
@@ -138238,7 +138238,7 @@ endobj
/F6.1 361 0 R
/F1.0 8 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
>>
@@ -138996,7 +138996,7 @@ endobj
/F6.0 70 0 R
/F4.0 49 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [861 0 R 862 0 R 863 0 R 864 0 R]
@@ -140529,7 +140529,7 @@ endobj
/Font << /F6.0 70 0 R
/F1.0 8 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [867 0 R 868 0 R]
@@ -142164,7 +142164,7 @@ endobj
/Font << /F6.0 70 0 R
/F1.0 8 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
>>
@@ -143617,7 +143617,7 @@ endobj
/Font << /F6.0 70 0 R
/F1.0 8 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
>>
@@ -144614,7 +144614,7 @@ endobj
/F6.0 70 0 R
/F5.1 63 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [876 0 R 877 0 R 878 0 R 879 0 R 880 0 R 881 0 R 882 0 R 883 0 R 884 0 R 885 0 R 887 0 R]
@@ -146040,7 +146040,7 @@ endobj
/F2.0 16 0 R
/F6.0 70 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [890 0 R 891 0 R 892 0 R 893 0 R 895 0 R 896 0 R 897 0 R]
@@ -149041,7 +149041,7 @@ endobj
/F6.1 361 0 R
/F1.0 8 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
>>
@@ -150650,7 +150650,7 @@ endobj
/F1.0 8 0 R
/F6.0 70 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
>>
@@ -153378,7 +153378,7 @@ endobj
/F6.1 361 0 R
/F1.0 8 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [908 0 R 909 0 R 910 0 R 911 0 R]
@@ -155383,7 +155383,7 @@ endobj
/F6.0 70 0 R
/F6.1 361 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [914 0 R]
@@ -155404,7 +155404,7 @@ endobj
[913 0 R /XYZ 60.24 763.08 null]
endobj
916 0 obj
-<< /Length 32653
+<< /Length 32041
>>
stream
q
@@ -157200,7 +157200,7 @@ ET
BT
60.24000000000001 315.40599999999995 Td
/F1.0 10.5 Tf
-<6170695f446f6d61696e4f626a656374436f6e7461696e65725f6f626a6563742d6372656174696f6e2d6170695b> Tj
+[<6170695f46> 40.0390625 <6163746f7279536572766963655b>] TJ
ET
0.000 0.000 0.000 SCN
@@ -157209,9 +157209,9 @@ ET
0.694 0.129 0.275 SCN
BT
-304.15500000000003 315.40599999999995 Td
+158.43558984375 315.40599999999995 Td
/F6.0 10.5 Tf
-<446f6d61696e4f626a656374436f6e7461696e6572236d6978696e28> Tj
+<466163746f727953657276696365236d6978696e28> Tj
ET
0.000 0.000 0.000 SCN
@@ -157220,7 +157220,7 @@ ET
0.694 0.129 0.275 SCN
BT
-451.15500000000003 315.40599999999995 Td
+268.68558984375 315.40599999999995 Td
/F7.0 10.5 Tf
<c9> Tj
ET
@@ -157231,7 +157231,7 @@ ET
0.694 0.129 0.275 SCN
BT
-461.65500000000003 315.40599999999995 Td
+279.18558984375 315.40599999999995 Td
/F6.0 10.5 Tf
<29> Tj
ET
@@ -157242,7 +157242,7 @@ ET
0.200 0.200 0.200 SCN
BT
-466.90500000000003 315.40599999999995 Td
+284.43558984375 315.40599999999995 Td
/F1.0 10.5 Tf
<206d6574686f642e> Tj
ET
@@ -157359,7 +157359,7 @@ ET
BT
252.74 248.98499999999993 Td
/F6.0 11 Tf
-<636f6e7461696e6572> Tj
+<666163746f727953657276696365> Tj
ET
0.000 0.000 0.000 SCN
@@ -157368,7 +157368,7 @@ ET
0.200 0.200 0.200 SCN
BT
-302.24 248.98499999999993 Td
+329.74 248.98499999999993 Td
/F6.0 11 Tf
<2e> Tj
ET
@@ -157379,7 +157379,7 @@ ET
0.200 0.200 0.200 SCN
BT
-307.74 248.98499999999993 Td
+335.24 248.98499999999993 Td
/F6.0 11 Tf
<6d6978696e> Tj
ET
@@ -157390,7 +157390,7 @@ ET
0.200 0.200 0.200 SCN
BT
-335.24 248.98499999999993 Td
+362.74 248.98499999999993 Td
/F6.0 11 Tf
<28> Tj
ET
@@ -157401,7 +157401,7 @@ ET
0.200 0.200 0.200 SCN
BT
-340.74 248.98499999999993 Td
+368.24 248.98499999999993 Td
/F6.0 11 Tf
<446f63756d656e74486f6c6465725f646f63756d656e7473> Tj
ET
@@ -157412,7 +157412,7 @@ ET
0.200 0.200 0.200 SCN
BT
-472.74 248.98499999999993 Td
+71.24000000000001 234.24499999999995 Td
/F6.0 11 Tf
<2e> Tj
ET
@@ -157423,7 +157423,7 @@ ET
0.200 0.200 0.200 SCN
BT
-478.24 248.98499999999993 Td
+76.74000000000001 234.24499999999995 Td
/F6.0 11 Tf
<636c617373> Tj
ET
@@ -157434,7 +157434,7 @@ ET
0.200 0.200 0.200 SCN
BT
-505.74 248.98499999999993 Td
+104.24000000000001 234.24499999999995 Td
/F6.0 11 Tf
<2c> Tj
ET
@@ -157445,7 +157445,9 @@ ET
0.200 0.200 0.200 SCN
BT
-511.24 248.98499999999993 Td
+109.74000000000001 234.24499999999995 Td
+/F6.0 11 Tf
+<20> Tj
ET
0.000 0.000 0.000 SCN
@@ -157454,7 +157456,7 @@ ET
0.200 0.200 0.200 SCN
BT
-71.24000000000001 234.24499999999995 Td
+115.24000000000001 234.24499999999995 Td
/F6.0 11 Tf
<637573746f6d6572> Tj
ET
@@ -157465,7 +157467,7 @@ ET
0.200 0.200 0.200 SCN
BT
-115.24000000000001 234.24499999999995 Td
+159.24 234.24499999999995 Td
/F6.0 11 Tf
<29> Tj
ET
@@ -157476,7 +157478,7 @@ ET
0.200 0.200 0.200 SCN
BT
-120.74000000000001 234.24499999999995 Td
+164.74 234.24499999999995 Td
/F6.0 11 Tf
<3b> Tj
ET
@@ -157486,57 +157488,23 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-1.273 Tw
-
BT
60.24000000000001 196.36599999999993 Td
/F1.0 10.5 Tf
-<54686520> 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
-
-1.273 Tw
-
-BT
-82.9328888888889 196.36599999999993 Td
-/F6.0 10.5 Tf
-<496e746567726174696f6e546573744162737472616374> Tj
+<3d20436f6e747269627574656420736572766963657320286465707265636174656429> 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
-1.273 Tw
+4.682 Tw
BT
-203.6828888888889 196.36599999999993 Td
+60.24000000000001 168.58599999999993 Td
/F1.0 10.5 Tf
-<20616e6420> 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
-
-1.273 Tw
-
-BT
-230.77766666666665 196.36599999999993 Td
-/F6.0 10.5 Tf
-<46697874757265536372697074> Tj
+<436f6e74726962757465642073657276696365732061726520766572792073696d696c617220746f206d6978696e733b20696e64656564206d6978696e732061726520616e2065766f6c7574696f6e20616e64> Tj
ET
@@ -157546,57 +157514,12 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-1.273 Tw
+3.298 Tw
BT
-299.0276666666666 196.36599999999993 Td
+60.24000000000001 152.80599999999993 Td
/F1.0 10.5 Tf
-<20636c617373657320626f74682070726f76696465206120> 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
-
-1.273 Tw
-
-BT
-420.80811111111103 196.36599999999993 Td
-/F6.0 10.5 Tf
-<6d6978696e28> 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
-
-1.273 Tw
-
-BT
-452.30811111111103 196.36599999999993 Td
-/F7.0 10.5 Tf
-<c9> 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
-
-1.273 Tw
-
-BT
-462.80811111111103 196.36599999999993 Td
-/F6.0 10.5 Tf
-<29> Tj
+<726566696e656d656e74206f662074686520636f6e747269627574696f6e7320636f6e636570742e20417320737563682c20636f6e747269627574696f6e732073686f756c6420626520636f6e73696465726564206173> Tj
ET
@@ -157606,12 +157529,12 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-1.273 Tw
+2.265 Tw
BT
-468.05811111111103 196.36599999999993 Td
+60.24000000000001 137.02599999999993 Td
/F1.0 10.5 Tf
-<20636f6e76656e69656e6365> Tj
+[<646570726563617465642c20616e64206576656e7475616c6c792072656d6f76656420696e2061206675747572652076657273696f6e206f6620746865206672> 20.01953125 <616d65776f726b2c20746f206265207265706c61636564>] TJ
ET
@@ -157622,9 +157545,9 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24000000000001 180.58599999999993 Td
+60.24000000000001 121.24599999999992 Td
/F1.0 10.5 Tf
-<6d6574686f642e> Tj
+[<656e746972656c792062> 20.01953125 <79206d6978696e732e>] TJ
ET
0.000 0.000 0.000 SCN
@@ -157632,23 +157555,27 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
+4.065 Tw
+
BT
-60.24000000000001 152.80599999999993 Td
+60.24000000000001 93.46599999999992 Td
/F1.0 10.5 Tf
-<3d20436f6e747269627574656420736572766963657320286465707265636174656429> Tj
+<546865206d61696e20646966666572656e6365206265747765656e20636f6e747269627574656420736572766963657320616e64206d6978696e7320697320746861742074686520616374696f6e73206f662061> 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
-4.682 Tw
+1.108 Tw
BT
-60.24000000000001 125.02599999999993 Td
+60.24000000000001 77.68599999999992 Td
/F1.0 10.5 Tf
-<436f6e74726962757465642073657276696365732061726520766572792073696d696c617220746f206d6978696e733b20696e64656564206d6978696e732061726520616e2065766f6c7574696f6e20616e64> Tj
+<636f6e747269627574656420736572766963652077696c6c20636f6e7472696275746520746f20> Tj
ET
@@ -157658,12 +157585,12 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-3.298 Tw
+1.108 Tw
BT
-60.24000000000001 109.24599999999992 Td
-/F1.0 10.5 Tf
-<726566696e656d656e74206f662074686520636f6e747269627574696f6e7320636f6e636570742e20417320737563682c20636f6e747269627574696f6e732073686f756c6420626520636f6e73696465726564206173> Tj
+254.76850181361607 77.68599999999992 Td
+/F4.0 10.5 Tf
+<616c6c> Tj
ET
@@ -157673,12 +157600,12 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-2.265 Tw
+1.108 Tw
BT
-60.24000000000001 93.46599999999992 Td
+267.2320018136161 77.68599999999992 Td
/F1.0 10.5 Tf
-[<646570726563617465642c20616e64206576656e7475616c6c792072656d6f76656420696e2061206675747572652076657273696f6e206f6620746865206672> 20.01953125 <616d65776f726b2c20746f206265207265706c61636564>] TJ
+[<2074686520706172> 20.01953125 <616d6574657273206f662069747320616374696f6e732c20776865726561732061206d6978696e206f6e6c79>] TJ
ET
@@ -157689,9 +157616,9 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24000000000001 77.68599999999992 Td
+60.24000000000001 61.90599999999992 Td
/F1.0 10.5 Tf
-[<656e746972656c792062> 20.01953125 <79206d6978696e732e>] TJ
+<636f6e747269627574657320746f20746865207479706520616363657074656420696e2069747320636f6e7374727563746f722e> Tj
ET
0.000 0.000 0.000 SCN
@@ -157729,48 +157656,26 @@ endobj
/Font << /F6.0 70 0 R
/F1.0 8 0 R
/F7.0 169 0 R
+/F4.0 49 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
-/Annots [919 0 R 920 0 R]
>>
endobj
918 0 obj
[917 0 R /XYZ 60.24 430.27 null]
endobj
919 0 obj
-<< /Border [0 0 0]
-/A << /Type /Action
-/S /URI
-/URI (../ugtst/ugtst.pdf#__ugtst_integ-test-support_bootstrapping_IntegrationTestAbstract)
->>
-/Subtype /Link
-/Rect [82.9328888888889 194.89599999999993 203.6828888888889 205.39599999999993]
-/Type /Annot
->>
+[917 0 R /XYZ 60.24 208.32999999999993 null]
endobj
920 0 obj
-<< /Border [0 0 0]
-/A << /Type /Action
-/S /URI
-/URI (../rgcms/rgcms.pdf#_rgcms_classes_super_FixtureScript)
->>
-/Subtype /Link
-/Rect [230.77766666666665 194.89599999999993 299.0276666666666 205.39599999999993]
-/Type /Annot
->>
-endobj
-921 0 obj
-[917 0 R /XYZ 60.24 164.76999999999992 null]
-endobj
-922 0 obj
<< /Limits [(_ugfun_programming-model_mixins_nested-static-classes) (_ugfun_programming-model_view-models_jaxb_joda-datatypes)]
/Names [(_ugfun_programming-model_mixins_nested-static-classes) 915 0 R (_ugfun_programming-model_mixins_programmatic-usage) 918 0 R (_ugfun_programming-model_properties) 676 0 R (_ugfun_programming-model_properties-vs-parameters) 811 0 R (_ugfun_programming-model_view-models) 815 0 R (_ugfun_programming-model_view-models_dto) 839 0 R (_ugfun_programming-model_view-models_dto_dto-consumers) 873 0 R (_ugfun_programming-model_view-models_dto_generating-xsds) 860 0 R (_ugfun_programming-model_view-models_dto_versioning) 851 0 R (_ugfun_programming-model_view-models_jaxb) 818 0 R (_ugfun_programming-model_view-models_jaxb_joda-datatypes) 835 0 R]
>>
endobj
-923 0 obj
-<< /Length 22264
+921 0 obj
+<< /Length 22502
>>
stream
q
@@ -157779,81 +157684,10 @@ q
/DeviceRGB CS
0.200 0.200 0.200 SCN
-4.065 Tw
-
-BT
-60.24 794.6759999999999 Td
-/F1.0 10.5 Tf
-<546865206d61696e20646966666572656e6365206265747765656e20636f6e747269627574656420736572766963657320616e64206d6978696e7320697320746861742074686520616374696f6e73206f662061> 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
-
-1.108 Tw
-
-BT
-60.24 778.896 Td
-/F1.0 10.5 Tf
-<636f6e747269627574656420736572766963652077696c6c20636f6e7472696275746520746f20> 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
-
-1.108 Tw
-
-BT
-254.76850181361607 778.896 Td
-/F4.0 10.5 Tf
-<616c6c> 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
-
-1.108 Tw
-
-BT
-267.2320018136161 778.896 Td
-/F1.0 10.5 Tf
-[<2074686520706172> 20.01953125 <616d6574657273206f662069747320616374696f6e732c20776865726561732061206d6978696e206f6e6c79>] 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
-
-BT
-60.24 763.116 Td
-/F1.0 10.5 Tf
-<636f6e747269627574657320746f20746865207479706520616363657074656420696e2069747320636f6e7374727563746f722e> Tj
-ET
-
-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
-
4.127 Tw
BT
-60.24 735.3359999999999 Td
+60.24 793.9259999999999 Td
/F1.0 10.5 Tf
<416c736f2c20636f6e747269627574656420736572766963657320617265206c6f6e672d6c697665642073696e676c65746f6e732c2077686572656173206d6978696e732061726520696e7374616e746961746564206173> Tj
ET
@@ -157866,7 +157700,7 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 719.5559999999999 Td
+60.24 778.146 Td
/F1.0 10.5 Tf
[<7265717569726564202862> 20.01953125 <7920746865206672> 20.01953125 <616d65776f726b2920616e64207468656e2064697363617264656420616c6d6f737420696d6d6564696174656c79> 89.84375 <2e>] TJ
ET
@@ -157877,7 +157711,7 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 691.776 Td
+60.24 750.366 Td
/F1.0 10.5 Tf
[<3d3d2053> 20.01953125 <796e746178>] TJ
ET
@@ -157890,7 +157724,7 @@ ET
1.074 Tw
BT
-60.24 663.996 Td
+60.24 722.586 Td
/F1.0 10.5 Tf
[<416e> 20.01953125 <79206e2d706172> 20.01953125 <616d6574657220616374696f6e2070726f76696465642062> 20.01953125 <79206120736572766963652077696c6c206175746f6d61746963616c6c7920626520636f6e747269627574656420746f20746865206c697374206f66>] TJ
ET
@@ -157905,7 +157739,7 @@ ET
0.386 Tw
BT
-60.24 648.216 Td
+60.24 706.806 Td
/F1.0 10.5 Tf
[<616374696f6e7320666f722065616368206f66206974732028656e746974792920706172> 20.01953125 <616d65746572732e2046726f6d207468652076696577706f696e74206f662074686520656e746974792074686520616374696f6e2069732063616c6c6564>] TJ
ET
@@ -157918,7 +157752,7 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 632.436 Td
+60.24 691.0260000000001 Td
/F1.0 10.5 Tf
<6120636f6e747269627574656420616374696f6e2e> Tj
ET
@@ -157929,7 +157763,7 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 604.656 Td
+60.24 663.246 Td
/F1.0 10.5 Tf
[<46> 40.0390625 <6f72206578616d706c652c20676976656e206120736572766963653a>] TJ
ET
@@ -157938,28 +157772,28 @@ ET
0.000 0.000 0.000 scn
q
0.961 0.961 0.961 scn
-64.240 588.840 m
-531.040 588.840 l
-533.249 588.840 535.040 587.049 535.040 584.840 c
-535.040 526.620 l
-535.040 524.411 533.249 522.620 531.040 522.620 c
-64.240 522.620 l
-62.031 522.620 60.240 524.411 60.240 526.620 c
-60.240 584.840 l
-60.240 587.049 62.031 588.840 64.240 588.840 c
+64.240 647.430 m
+531.040 647.430 l
+533.249 647.430 535.040 645.639 535.040 643.430 c
+535.040 585.210 l
+535.040 583.001 533.249 581.210 531.040 581.210 c
+64.240 581.210 l
+62.031 581.210 60.240 583.001 60.240 585.210 c
+60.240 643.430 l
+60.240 645.639 62.031 647.430 64.240 647.430 c
h
f
0.800 0.800 0.800 SCN
0.75 w
-64.240 588.840 m
-531.040 588.840 l
-533.249 588.840 535.040 587.049 535.040 584.840 c
-535.040 526.620 l
-535.040 524.411 533.249 522.620 531.040 522.620 c
-64.240 522.620 l
-62.031 522.620 60.240 524.411 60.240 526.620 c
-60.240 584.840 l
-60.240 587.049 62.031 588.840 64.240 588.840 c
+64.240 647.430 m
+531.040 647.430 l
+533.249 647.430 535.040 645.639 535.040 643.430 c
+535.040 585.210 l
+535.040 583.001 533.249 581.210 531.040 581.210 c
+64.240 581.210 l
+62.031 581.210 60.240 583.001 60.240 585.210 c
+60.240 643.430 l
+60.240 645.639 62.031 647.430 64.240 647.430 c
h
S
Q
@@ -157967,7 +157801,7 @@ Q
0.000 0.400 0.600 SCN
BT
-71.24000000000001 566.015 Td
+71.24000000000001 624.605 Td
/F6.0 11 Tf
<7075626c6963> Tj
ET
@@ -157978,7 +157812,7 @@ ET
0.200 0.200 0.200 SCN
BT
-104.24000000000001 566.015 Td
+104.24000000000001 624.605 Td
/F6.0 11 Tf
<20> Tj
ET
@@ -157989,7 +157823,7 @@ ET
0.000 0.467 0.533 SCN
BT
-109.74000000000001 566.015 Td
+109.74000000000001 624.605 Td
/F6.0 11 Tf
<696e74657266616365> Tj
ET
@@ -158000,7 +157834,7 @@ ET
0.200 0.200 0.200 SCN
BT
-159.24 566.015 Td
+159.24 624.605 Td
/F6.0 11 Tf
<20> Tj
ET
@@ -158011,7 +157845,7 @@ ET
0.000 0.667 0.533 SCN
BT
-164.74 566.015 Td
+164.74 624.605 Td
/F6.0 11 Tf
<4c696272617279> Tj
ET
@@ -158022,7 +157856,7 @@ ET
0.200 0.200 0.200 SCN
BT
-203.24 566.015 Td
+203.24 624.605 Td
/F6.0 11 Tf
<20> Tj
ET
@@ -158033,7 +157867,7 @@ ET
0.200 0.200 0.200 SCN
BT
-208.74 566.015 Td
+208.74 624.605 Td
/F6.0 11 Tf
<7b> Tj
ET
@@ -158044,7 +157878,7 @@ ET
0.200 0.200 0.200 SCN
BT
-71.24000000000001 551.2750000000001 Td
+71.24000000000001 609.865 Td
/F6.0 11 Tf
<ca202020> Tj
ET
@@ -158055,7 +157889,7 @@ ET
0.000 0.400 0.600 SCN
BT
-93.24000000000001 551.2750000000001 Td
+93.24000000000001 609.865 Td
/F6.0 11 Tf
<7075626c6963> Tj
ET
@@ -158066,7 +157900,7 @@ ET
0.200 0.200 0.200 SCN
BT
-126.24000000000001 551.2750000000001 Td
+126.24000000000001 609.865 Td
/F6.0 11 Tf
<20> Tj
ET
@@ -158077,7 +157911,7 @@ ET
0.200 0.200 0.200 SCN
BT
-131.74 551.2750000000001 Td
+131.74 609.865 Td
/F6.0 11 Tf
<4c6f616e> Tj
ET
@@ -158088,7 +157922,7 @@ ET
0.200 0.200 0.200 SCN
BT
-153.74 551.2750000000001 Td
+153.74 609.865 Td
/F6.0 11 Tf
<20> Tj
ET
@@ -158099,7 +157933,7 @@ ET
0.200 0.200 0.200 SCN
BT
-159.24 551.2750000000001 Td
+159.24 609.865 Td
/F6.0 11 Tf
<626f72726f77> Tj
ET
@@ -158110,7 +157944,7 @@ ET
0.200 0.200 0.200 SCN
BT
-192.24 551.2750000000001 Td
+192.24 609.865 Td
/F6.0 11 Tf
<28> Tj
ET
@@ -158121,7 +157955,7 @@ ET
0.200 0.200 0.200 SCN
BT
-197.74 551.2750000000001 Td
+197.74 609.865 Td
/F6.0 11 Tf
<4c6f616e61626c65> Tj
ET
@@ -158132,7 +157966,7 @@ ET
0.200 0.200 0.200 SCN
BT
-241.74 551.2750000000001 Td
+241.74 609.865 Td
/F6.0 11 Tf
<20> Tj
ET
@@ -158143,7 +157977,7 @@ ET
0.200 0.200 0.200 SCN
BT
-247.24 551.2750000000001 Td
+247.24 609.865 Td
/F6.0 11 Tf
<6c> Tj
ET
@@ -158154,7 +157988,7 @@ ET
0.200 0.200 0.200 SCN
BT
-252.74 551.2750000000001 Td
+252.74 609.865 Td
/F6.0 11 Tf
<2c> Tj
ET
@@ -158165,7 +157999,7 @@ ET
0.200 0.200 0.200 SCN
BT
-258.24 551.2750000000001 Td
+258.24 609.865 Td
/F6.0 11 Tf
<20> Tj
ET
@@ -158176,7 +158010,7 @@ ET
0.200 0.200 0.200 SCN
BT
-263.74 551.2750000000001 Td
+263.74 609.865 Td
/F6.0 11 Tf
<426f72726f776572> Tj
ET
@@ -158187,7 +158021,7 @@ ET
0.200 0.200 0.200 SCN
BT
-307.74 551.2750000000001 Td
+307.74 609.865 Td
/F6.0 11 Tf
<20> Tj
ET
@@ -158198,7 +158032,7 @@ ET
0.200 0.200 0.200 SCN
BT
-313.24 551.2750000000001 Td
+313.24 609.865 Td
/F6.0 11 Tf
<62> Tj
ET
@@ -158209,7 +158043,7 @@ ET
0.200 0.200 0.200 SCN
BT
-318.74 551.2750000000001 Td
+318.74 609.865 Td
/F6.0 11 Tf
<29> Tj
ET
@@ -158220,7 +158054,7 @@ ET
0.200 0.200 0.200 SCN
BT
-324.24 551.2750000000001 Td
+324.24 609.865 Td
/F6.0 11 Tf
<3b> Tj
ET
@@ -158231,7 +158065,7 @@ ET
0.200 0.200 0.200 SCN
BT
-71.24000000000001 536.5350000000001 Td
+71.24000000000001 595.125 Td
/F6.0 11 Tf
<7d> Tj
ET
@@ -158242,7 +158076,7 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24000000000001 498.656 Td
+60.24000000000001 557.2460000000001 Td
/F1.0 10.5 Tf
<616e642074686520656e7469746965733a> Tj
ET
@@ -158251,28 +158085,28 @@ ET
0.000 0.000 0.000 scn
q
0.961 0.961 0.961 scn
-64.240 482.840 m
-531.040 482.840 l
-533.249 482.840 535.040 481.049 535.040 478.840 c
-535.040 450.100 l
-535.040 447.891 533.249 446.100 531.040 446.100 c
-64.240 446.100 l
-62.031 446.100 60.240 447.891 60.240 450.100 c
-60.240 478.840 l
-60.240 481.049 62.031 482.840 64.240 482.840 c
+64.240 541.430 m
+531.040 541.430 l
+533.249 541.430 535.040 539.639 535.040 537.430 c
+535.040 508.690 l
+535.040 506.481 533.249 504.690 531.040 504.690 c
+64.240 504.690 l
+62.031 504.690 60.240 506.481 60.240 508.690 c
+60.240 537.430 l
+60.240 539.639 62.031 541.430 64.240 541.430 c
h
f
0.800 0.800 0.800 SCN
0.75 w
-64.240 482.840 m
-531.040 482.840 l
-533.249 482.840 535.040 481.049 535.040 478.840 c
-535.040 450.100 l
-535.040 447.891 533.249 446.100 531.040 446.100 c
-64.240 446.100 l
-62.031 446.100 60.240 447.891 60.240 450.100 c
-60.240 478.840 l
-60.240 481.049 62.031 482.840 64.240 482.840 c
+64.240 541.430 m
+531.040 541.430 l
+533.249 541.430 535.040 539.639 535.040 537.430 c
+535.040 508.690 l
+535.040 506.481 533.249 504.690 531.040 504.690 c
+64.240 504.690 l
+62.031 504.690 60.240 506.481 60.240 508.690 c
+60.240 537.430 l
+60.240 539.639 62.031 541.430 64.240 541.430 c
h
S
Q
@@ -158280,7 +158114,7 @@ Q
0.000 0.400 0.600 SCN
BT
-71.24000000000001 460.01500000000004 Td
+71.24000000000001 518.605 Td
/F6.0 11 Tf
<7075626c6963> Tj
ET
@@ -158291,7 +158125,7 @@ ET
0.200 0.200 0.200 SCN
BT
-104.24000000000001 460.01500000000004 Td
+104.24000000000001 518.605 Td
/F6.0 11 Tf
<20> Tj
ET
@@ -158302,7 +158136,7 @@ ET
0.000 0.467 0.533 SCN
BT
-109.74000000000001 460.01500000000004 Td
+109.74000000000001 518.605 Td
/F6.0 11 Tf
<636c617373> Tj
ET
@@ -158313,7 +158147,7 @@ ET
0.200 0.200 0.200 SCN
BT
-137.24 460.01500000000004 Td
+137.24 518.605 Td
/F6.0 11 Tf
<20> Tj
ET
@@ -158324,7 +158158,7 @@ ET
0.000 0.667 0.533 SCN
BT
-142.74 460.01500000000004 Td
+142.74 518.605 Td
/F6.0 11 Tf
<426f6f6b> Tj
ET
@@ -158335,7 +158169,7 @@ ET
0.200 0.200 0.200 SCN
BT
-164.74 460.01500000000004 Td
+164.74 518.605 Td
/F6.0 11 Tf
<20> Tj
ET
@@ -158346,7 +158180,7 @@ ET
0.000 0.400 0.600 SCN
BT
-170.24 460.01500000000004 Td
+170.24 518.605 Td
/F6.0 11 Tf
<696d706c656d656e7473> Tj
ET
@@ -158357,7 +158191,7 @@ ET
0.200 0.200 0.200 SCN
BT
-225.24 460.01500000000004 Td
+225.24 518.605 Td
/F6.0 11 Tf
<20> Tj
ET
@@ -158368,7 +158202,7 @@ ET
0.200 0.200 0.200 SCN
BT
-230.74 460.01500000000004 Td
+230.74 518.605 Td
/F6.0 11 Tf
<4c6f616e61626c65> Tj
ET
@@ -158379,7 +158213,7 @@ ET
0.200 0.200 0.200 SCN
BT
-274.74 460.01500000000004 Td
+274.74 518.605 Td
/F6.0 11 Tf
<20> Tj
ET
@@ -158390,7 +158224,7 @@ ET
0.200 0.200 0.200 SCN
BT
-280.24 460.01500000000004 Td
+280.24 518.605 Td
/F6.0 11 Tf
<7b> Tj
ET
@@ -158401,7 +158235,7 @@ ET
0.200 0.200 0.200 SCN
BT
-285.74 460.01500000000004 Td
+285.74 518.605 Td
/F6.0 11 Tf
<20> Tj
ET
@@ -158412,7 +158246,7 @@ ET
0.200 0.200 0.200 SCN
BT
-291.24 460.01500000000004 Td
+291.24 518.605 Td
/F6.0 11 Tf
<2e> Tj
ET
@@ -158423,7 +158257,7 @@ ET
0.200 0.200 0.200 SCN
BT
-296.74 460.01500000000004 Td
+296.74 518.605 Td
/F6.0 11 Tf
<2e> Tj
ET
@@ -158434,7 +158268,7 @@ ET
0.200 0.200 0.200 SCN
BT
-302.24 460.01500000000004 Td
+302.24 518.605 Td
/F6.0 11 Tf
<2e> Tj
ET
@@ -158445,7 +158279,7 @@ ET
0.200 0.200 0.200 SCN
BT
-307.74 460.01500000000004 Td
+307.74 518.605 Td
/F6.0 11 Tf
<20> Tj
ET
@@ -158456,7 +158290,7 @@ ET
0.200 0.200 0.200 SCN
BT
-313.24 460.01500000000004 Td
+313.24 518.605 Td
/F6.0 11 Tf
<7d> Tj
ET
@@ -158467,7 +158301,7 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24000000000001 422.136 Td
+60.24000000000001 480.72600000000006 Td
/F1.0 10.5 Tf
<616e64> Tj
ET
@@ -158476,28 +158310,28 @@ ET
0.000 0.000 0.000 scn
q
0.961 0.961 0.961 scn
-64.240 406.320 m
-531.040 406.320 l
-533.249 406.320 535.040 404.529 535.040 402.320 c
-535.040 373.580 l
-535.040 371.371 533.249 369.580 531.040 369.580 c
-64.240 369.580 l
-62.031 369.580 60.240 371.371 60.240 373.580 c
-60.240 402.320 l
-60.240 404.529 62.031 406.320 64.240 406.320 c
+64.240 464.910 m
+531.040 464.910 l
+533.249 464.910 535.040 463.119 535.040 460.910 c
+535.040 432.170 l
+535.040 429.961 533.249 428.170 531.040 428.170 c
+64.240 428.170 l
+62.031 428.170 60.240 429.961 60.240 432.170 c
+60.240 460.910 l
+60.240 463.119 62.031 464.910 64.240 464.910 c
h
f
0.800 0.800 0.800 SCN
0.75 w
-64.240 406.320 m
-531.040 406.320 l
-533.249 406.320 535.040 404.529 535.040 402.320 c
-535.040 373.580 l
-535.040 371.371 533.249 369.580 531.040 369.580 c
-64.240 369.580 l
-62.031 369.580 60.240 371.371 60.240 373.580 c
-60.240 402.320 l
-60.240 404.529 62.031 406.320 64.240 406.320 c
+64.240 464.910 m
+531.040 464.910 l
+533.249 464.910 535.040 463.119 535.040 460.910 c
+535.040 432.170 l
+535.040 429.961 533.249 428.170 531.040 428.170 c
+64.240 428.170 l
+62.031 428.170 60.240 429.961 60.240 432.170 c
+60.240 460.910 l
+60.240 463.119 62.031 464.910 64.240 464.910 c
h
S
Q
@@ -158505,7 +158339,7 @@ Q
0.000 0.400 0.600 SCN
BT
-71.24000000000001 383.49500000000006 Td
+71.24000000000001 442.0850000000001 Td
/F6.0 11 Tf
<7075626c6963> Tj
ET
@@ -158516,7 +158350,7 @@ ET
0.200 0.200 0.200 SCN
BT
-104.24000000000001 383.49500000000006 Td
+104.24000000000001 442.0850000000001 Td
/F6.0 11 Tf
<20> Tj
ET
@@ -158527,7 +158361,7 @@ ET
0.000 0.467 0.533 SCN
BT
-109.74000000000001 383.49500000000006 Td
+109.74000000000001 442.0850000000001 Td
/F6.0 11 Tf
<636c617373> Tj
ET
@@ -158538,7 +158372,7 @@ ET
0.200 0.200 0.200 SCN
BT
-137.24 383.49500000000006 Td
+137.24 442.0850000000001 Td
/F6.0 11 Tf
<20> Tj
ET
@@ -158549,7 +158383,7 @@ ET
0.000 0.667 0.533 SCN
BT
-142.74 383.49500000000006 Td
+142.74 442.0850000000001 Td
/F6.0 11 Tf
<4c6962726172794d656d626572> Tj
ET
@@ -158560,7 +158394,7 @@ ET
0.200 0.200 0.200 SCN
BT
-214.24 383.49500000000006 Td
+214.24 442.0850000000001 Td
/F6.0 11 Tf
<20> Tj
ET
@@ -158571,7 +158405,7 @@ ET
0.000 0.400 0.600 SCN
BT
-219.74 383.49500000000006 Td
+219.74 442.0850000000001 Td
/F6.0 11 Tf
<696d706c656d656e7473> Tj
ET
@@ -158582,7 +158416,7 @@ ET
0.200 0.200 0.200 SCN
BT
-274.74 383.49500000000006 Td
+274.74 442.0850000000001 Td
/F6.0 11 Tf
<20> Tj
ET
@@ -158593,7 +158427,7 @@ ET
0.200 0.200 0.200 SCN
BT
-280.24 383.49500000000006 Td
+280.24 442.0850000000001 Td
/F6.0 11 Tf
<426f72726f776572> Tj
ET
@@ -158604,7 +158438,7 @@ ET
0.200 0.200 0.200 SCN
BT
-324.24 383.49500000000006 Td
+324.24 442.0850000000001 Td
/F6.0 11 Tf
<20> Tj
ET
@@ -158615,7 +158449,7 @@ ET
0.200 0.200 0.200 SCN
BT
-329.74 383.49500000000006 Td
+329.74 442.0850000000001 Td
/F6.0 11 Tf
<7b> Tj
ET
@@ -158626,7 +158460,7 @@ ET
0.200 0.200 0.200 SCN
BT
-335.24 383.49500000000006 Td
+335.24 442.0850000000001 Td
/F6.0 11 Tf
<20> Tj
ET
@@ -158637,7 +158471,7 @@ ET
0.200 0.200 0.200 SCN
BT
-340.74 383.49500000000006 Td
+340.74 442.0850000000001 Td
/F6.0 11 Tf
<2e> Tj
ET
@@ -158648,7 +158482,7 @@ ET
0.200 0.200 0.200 SCN
BT
-346.24 383.49500000000006 Td
+346.24 442.0850000000001 Td
/F6.0 11 Tf
<2e> Tj
ET
@@ -158659,7 +158493,7 @@ ET
0.200 0.200 0.200 SCN
BT
-351.74 383.49500000000006 Td
+351.74 442.0850000000001 Td
/F6.0 11 Tf
<2e> Tj
ET
@@ -158670,7 +158504,7 @@ ET
0.200 0.200 0.200 SCN
BT
-357.24 383.49500000000006 Td
+357.24 442.0850000000001 Td
/F6.0 11 Tf
<20> Tj
ET
@@ -158681,7 +158515,7 @@ ET
0.200 0.200 0.200 SCN
BT
-362.74 383.49500000000006 Td
+362.74 442.0850000000001 Td
/F6.0 11 Tf
<7d> Tj
ET
@@ -158692,7 +158526,7 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24000000000001 345.61600000000004 Td
+60.24000000000001 404.2060000000001 Td
/F1.0 10.5 Tf
<7468656e2074686520> Tj
ET
@@ -158703,7 +158537,7 @@ ET
0.694 0.129 0.275 SCN
BT
-104.39250000000001 345.61600000000004 Td
+104.39250000000001 404.2060000000001 Td
/F6.0 10.5 Tf
<626f72726f7728> Tj
ET
@@ -158714,7 +158548,7 @@ ET
0.694 0.129 0.275 SCN
BT
-141.1425 345.61600000000004 Td
+141.1425 404.2060000000001 Td
/F7.0 10.5 Tf
<c9> Tj
ET
@@ -158725,7 +158559,7 @@ ET
0.694 0.129 0.275 SCN
BT
-151.6425 345.61600000000004 Td
+151.6425 404.2060000000001 Td
/F6.0 10.5 Tf
<29> Tj
ET
@@ -158736,7 +158570,7 @@ ET
0.200 0.200 0.200 SCN
BT
-156.8925 345.61600000000004 Td
+156.8925 404.2060000000001 Td
/F1.0 10.5 Tf
<20616374696f6e2077696c6c20626520636f6e747269627574656420746f20626f746820> Tj
ET
@@ -158747,7 +158581,7 @@ ET
0.694 0.129 0.275 SCN
BT
-329.26050000000004 345.61600000000004 Td
+329.26050000000004 404.2060000000001 Td
/F6.0 10.5 Tf
<426f6f6b> Tj
ET
@@ -158758,7 +158592,7 @@ ET
0.200 0.200 0.200 SCN
BT
-350.26050000000004 345.61600000000004 Td
+350.26050000000004 404.2060000000001 Td
/F1.0 10.5 Tf
<20616e6420746f20> Tj
ET
@@ -158769,7 +158603,7 @@ ET
0.694 0.129 0.275 SCN
BT
-387.28350000000006 345.61600000000004 Td
+387.28350000000006 404.2060000000001 Td
/F6.0 10.5 Tf
<4c6962726172794d656d626572> Tj
ET
@@ -158780,7 +158614,7 @@ ET
0.200 0.200 0.200 SCN
BT
-455.53350000000006 345.61600000000004 Td
+455.53350000000006 404.2060000000001 Td
/F1.0 10.5 Tf
<2e> Tj
ET
@@ -158793,7 +158627,7 @@ ET
2.307 Tw
BT
-60.24000000000001 317.83600000000007 Td
+60.24000000000001 376.4260000000001 Td
/F1.0 10.5 Tf
[<3d2055492048696e7473203a4e6f746963653a204c6963656e73656420746f207468652041706163686520536f6674776172652046> 40.0390625 <6f756e646174696f6e20284153462920756e646572206f6e65206f72206d6f7265>] TJ
ET
@@ -158808,7 +158642,7 @@ ET
1.015 Tw
BT
-60.24000000000001 302.05600000000004 Td
+60.24000000000001 360.6460000000001 Td
/F1.0 10.5 Tf
[<636f6e7472696275746f72206c6963656e73652061677265656d656e74732e2053656520746865204e4f> 20.01953125 <544943452066696c652064697374726962757465642077697468207468697320776f726b20666f72206164646974696f6e616c>] TJ
ET
@@ -158823,7 +158657,7 @@ ET
0.141 Tw
BT
-60.24000000000001 286.27600000000007 Td
+60.24000000000001 344.8660000000001 Td
/F1.0 10.5 Tf
[<696e666f726d6174696f6e20726567617264696e6720636f70> 20.01953125 <797269676874206f776e6572736869702e2054686520415346206c6963656e73657320746869732066696c6520746f20796f7520756e6465722074686520417061636865>] TJ
ET
@@ -158838,7 +158672,7 @@ ET
1.425 Tw
BT
-60.24000000000001 270.4960000000001 Td
+60.24000000000001 329.0860000000001 Td
/F1.0 10.5 Tf
[<4c6963656e73652c2056> 60.05859375 <657273696f6e20322e30202874686520224c6963656e736522293b20796f75206d61> 20.01953125 <79206e6f742075736520746869732066696c652065786365707420696e20636f6d706c69616e6365207769746820746865>] TJ
ET
@@ -158853,7 +158687,7 @@ ET
0.391 Tw
BT
-60.24000000000001 254.71600000000007 Td
+60.24000000000001 313.3060000000001 Td
/F1.0 10.5 Tf
[<4c6963656e73652e2059> 69.82421875 <6f75206d61> 20.01953125 <79206f627461696e206120636f70> 20.01953125 <79206f6620746865204c6963656e73652061742e20>] TJ
ET
@@ -158868,7 +158702,7 @@ ET
0.391 Tw
BT
-309.2540435014204 254.71600000000007 Td
+309.2540435014204 313.3060000000001 Td
/F1.0 10.5 Tf
[<687474703a2f2f777777> 69.82421875 <2e6170616368652e6f72672f6c6963656e7365732f4c4943454e53452d322e30>] TJ
ET
@@ -158883,7 +158717,7 @@ ET
0.391 Tw
BT
-529.3043892045455 254.71600000000007 Td
+529.3043892045455 313.3060000000001 Td
/F1.0 10.5 Tf
<202e> Tj
ET
@@ -158898,7 +158732,7 @@ ET
2.354 Tw
BT
-60.24000000000001 238.93600000000006 Td
+60.24000000000001 297.52600000000007 Td
/F1.0 10.5 Tf
[<556e6c6573732072657175697265642062> 20.01953125 <79206170706c696361626c65206c6177206f722061677265656420746f20696e2077726974696e672c20736f66747761726520646973747269627574656420756e64657220746865>] TJ
ET
@@ -158913,7 +158747,7 @@ ET
0.770 Tw
BT
-60.24000000000001 223.15600000000006 Td
+60.24000000000001 281.7460000000001 Td
/F1.0 10.5 Tf
[<4c6963656e7365206973206469737472696275746564206f6e20616e2022> 80.078125 <4153204953222042> 20.01953125 <415349532c20574954484f55542057> 60.05859375 <415252414e54494553204f522020434f4e444954494f4e53204f4620414e59>] TJ
ET
@@ -158928,7 +158762,7 @@ ET
4.760 Tw
BT
-60.24000000000001 207.37600000000006 Td
+60.24000000000001 265.9660000000001 Td
/F1.0 10.5 Tf
<4b494e442c206569746865722065787072657373206f7220696d706c6965642e2053656520746865204c6963656e736520666f7220746865207370656369666963206c616e677561676520676f7665726e696e67> Tj
ET
@@ -158941,7 +158775,7 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24000000000001 191.59600000000006 Td
+60.24000000000001 250.1860000000001 Td
/F1.0 10.5 Tf
<7065726d697373696f6e7320616e64206c696d69746174696f6e7320756e64657220746865204c6963656e73652e> Tj
ET
@@ -158954,7 +158788,7 @@ ET
2.437 Tw
BT
-60.24000000000001 163.81600000000006 Td
+60.24000000000001 222.4060000000001 Td
/F1.0 10.5 Tf
[<5468652041706163686520497369732070726f6772> 20.01953125 <616d6d696e67206d6f64656c20696e636c75646573207365766572> 20.01953125 <616c206d656368616e69736d7320666f72206120646f6d61696e206f626a65637420746f>] TJ
ET
@@ -158969,7 +158803,7 @@ ET
0.784 Tw
BT
-60.24000000000001 148.03600000000006 Td
+60.24000000000001 206.6260000000001 Td
/F1.0 10.5 Tf
[<70726f766964652055492068696e74732e2054686573652072> 20.01953125 <616e67652066726f6d207468656972207469746c652028736f20616e20656e642d757365722063616e2064697374696e6775697368206f6e65206f626a6563742066726f6d>] TJ
ET
@@ -158982,7 +158816,7 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24000000000001 132.25600000000006 Td
+60.24000000000001 190.8460000000001 Td
/F1.0 10.5 Tf
<616e6f7468657229207468726f75676820746f2068696e747320746861742063616e20696d7061637420746865697220435353207374796c696e672e> Tj
ET
@@ -158995,7 +158829,7 @@ ET
2.976 Tw
BT
-60.24000000000001 104.47600000000006 Td
+60.24000000000001 163.0660000000001 Td
/F1.0 10.5 Tf
[<3d204c61> 20.01953125 <796f7574203a4e6f746963653a204c6963656e73656420746f207468652041706163686520536f6674776172652046> 40.0390625 <6f756e646174696f6e20284153462920756e646572206f6e65206f72206d6f7265>] TJ
ET
@@ -159010,7 +158844,7 @@ ET
1.015 Tw
BT
-60.24000000000001 88.69600000000005 Td
+60.24000000000001 147.2860000000001 Td
/F1.0 10.5 Tf
[<636f6e7472696275746f72206c6963656e73652061677265656d656e74732e2053656520746865204e4f> 20.01953125 <544943452066696c652064697374726962757465642077697468207468697320776f726b20666f72206164646974696f6e616c>] TJ
ET
@@ -159025,7 +158859,7 @@ ET
0.141 Tw
BT
-60.24000000000001 72.91600000000005 Td
+60.24000000000001 131.50600000000009 Td
/F1.0 10.5 Tf
[<696e666f726d6174696f6e20726567617264696e6720636f70> 20.01953125 <797269676874206f776e6572736869702e2054686520415346206c6963656e73657320746869732066696c6520746f20796f7520756e6465722074686520417061636865>] TJ
ET
@@ -159040,7 +158874,7 @@ ET
1.425 Tw
BT
-60.24000000000001 57.13600000000005 Td
+60.24000000000001 115.72600000000008 Td
/F1.0 10.5 Tf
[<4c6963656e73652c2056> 60.05859375 <657273696f6e20322e30202874686520224c6963656e736522293b20796f75206d61> 20.01953125 <79206e6f742075736520746869732066696c652065786365707420696e20636f6d706c69616e6365207769746820746865>] TJ
ET
@@ -159049,78 +158883,13 @@ ET
0.000 Tw
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-q
-0.000 0.000 0.000 scn
-0.000 0.000 0.000 SCN
-1 w
-0 J
-0 j
-[ ] 0 d
-/Stamp1 Do
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-BT
-530.9469999999999 14.388 Td
-/F1.0 9 Tf
-<313333> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-Q
-Q
-
-endstream
-endobj
-924 0 obj
-<< /Type /Page
-/Parent 3 0 R
-/MediaBox [0 0 595.28 841.89]
-/Contents 923 0 R
-/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F1.0 8 0 R
-/F4.0 49 0 R
-/F6.0 70 0 R
-/F7.0 169 0 R
->>
-/XObject << /Stamp1 1253 0 R
->>
->>
-/Annots [926 0 R]
->>
-endobj
-925 0 obj
-[924 0 R /XYZ 60.24 329.80000000000007 null]
-endobj
-926 0 obj
-<< /Border [0 0 0]
-/A << /Type /Action
-/S /URI
-/URI (http://www.apache.org/licenses/LICENSE-2.0)
->>
-/Subtype /Link
-/Rect [309.2540435014204 251.65000000000006 529.3043892045455 265.93000000000006]
-/Type /Annot
->>
-endobj
-927 0 obj
-[924 0 R /XYZ 60.24 116.44000000000005 null]
-endobj
-928 0 obj
-<< /Length 14239
->>
-stream
-q
-/DeviceRGB cs
0.200 0.200 0.200 scn
-/DeviceRGB CS
0.200 0.200 0.200 SCN
0.391 Tw
BT
-60.24 794.6759999999999 Td
+60.24000000000001 99.94600000000008 Td
/F1.0 10.5 Tf
[<4c6963656e73652e2059> 69.82421875 <6f75206d61> 20.01953125 <79206f627461696e206120636f70> 20.01953125 <79206f6620746865204c6963656e73652061742e20>] TJ
ET
@@ -159135,7 +158904,7 @@ ET
0.391 Tw
BT
-309.2540435014204 794.6759999999999 Td
+309.2540435014204 99.94600000000008 Td
/F1.0 10.5 Tf
[<687474703a2f2f777777> 69.82421875 <2e6170616368652e6f72672f6c6963656e7365732f4c4943454e53452d322e30>] TJ
ET
@@ -159150,7 +158919,7 @@ ET
0.391 Tw
BT
-529.3043892045454 794.6759999999999 Td
+529.3043892045455 99.94600000000008 Td
/F1.0 10.5 Tf
<202e> Tj
ET
@@ -159165,7 +158934,7 @@ ET
2.354 Tw
BT
-60.24 778.896 Td
+60.24000000000001 84.16600000000008 Td
/F1.0 10.5 Tf
[<556e6c6573732072657175697265642062> 20.01953125 <79206170706c696361626c65206c6177206f722061677265656420746f20696e2077726974696e672c20736f66747761726520646973747269627574656420756e64657220746865>] TJ
ET
@@ -159180,7 +158949,7 @@ ET
0.770 Tw
BT
-60.24 763.116 Td
+60.24000000000001 68.38600000000008 Td
/F1.0 10.5 Tf
[<4c6963656e7365206973206469737472696275746564206f6e20616e2022> 80.078125 <4153204953222042> 20.01953125 <415349532c20574954484f55542057> 60.05859375 <415252414e54494553204f522020434f4e444954494f4e53204f4620414e59>] TJ
ET
@@ -159195,7 +158964,7 @@ ET
4.760 Tw
BT
-60.24 747.336 Td
+60.24000000000001 52.60600000000008 Td
/F1.0 10.5 Tf
<4b494e442c206569746865722065787072657373206f7220696d706c6965642e2053656520746865204c6963656e736520666f7220746865207370656369666963206c616e677561676520676f7665726e696e67> Tj
ET
@@ -159204,11 +158973,86 @@ ET
0.000 Tw
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
+q
+0.000 0.000 0.000 scn
+0.000 0.000 0.000 SCN
+1 w
+0 J
+0 j
+[ ] 0 d
+/Stamp1 Do
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
BT
-60.24 731.556 Td
+530.9469999999999 14.388 Td
+/F1.0 9 Tf
+<313333> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+Q
+Q
+
+endstream
+endobj
+922 0 obj
+<< /Type /Page
+/Parent 3 0 R
+/MediaBox [0 0 595.28 841.89]
+/Contents 921 0 R
+/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
+/Font << /F1.0 8 0 R
+/F6.0 70 0 R
+/F7.0 169 0 R
+>>
+/XObject << /Stamp1 1247 0 R
+>>
+>>
+/Annots [924 0 R 926 0 R]
+>>
+endobj
+923 0 obj
+[922 0 R /XYZ 60.24 388.3900000000001 null]
+endobj
+924 0 obj
+<< /Border [0 0 0]
+/A << /Type /Action
+/S /URI
+/URI (http://www.apache.org/licenses/LICENSE-2.0)
+>>
+/Subtype /Link
+/Rect [309.2540435014204 310.2400000000001 529.3043892045455 324.5200000000001]
+/Type /Annot
+>>
+endobj
+925 0 obj
+[922 0 R /XYZ 60.24 175.0300000000001 null]
+endobj
+926 0 obj
+<< /Border [0 0 0]
+/A << /Type /Action
+/S /URI
+/URI (http://www.apache.org/licenses/LICENSE-2.0)
+>>
+/Subtype /Link
+/Rect [309.2540435014204 96.88000000000008 529.3043892045455 111.16000000000008]
+/Type /Annot
+>>
+endobj
+927 0 obj
+<< /Length 12631
+>>
+stream
+q
+/DeviceRGB cs
+0.200 0.200 0.200 scn
+/DeviceRGB CS
+0.200 0.200 0.200 SCN
+
+BT
+60.24 794.6759999999999 Td
/F1.0 10.5 Tf
<7065726d697373696f6e7320616e64206c696d69746174696f6e7320756e64657220746865204c6963656e73652e> Tj
ET
@@ -159221,7 +159065,7 @@ ET
2.288 Tw
BT
-60.24 703.776 Td
+60.24 766.896 Td
/F1.0 10.5 Tf
[<546865206d6f7374207369676e69666963616e7420617370656374206f662074686520554920697320746865206c61> 20.01953125 <796f7574206f6620746865206f626a656374d573206d656d626572733a206974732070726f706572746965732c>] TJ
ET
@@ -159234,7 +159078,7 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 687.996 Td
+60.24 751.116 Td
/F1.0 10.5 Tf
<636f6c6c656374696f6e7320616e6420616374696f6e732e2054686573652063616e206265206f7267616e697a656420696e746f20636f6c756d6e732c20726f777320616e6420746162732e> Tj
ET
@@ -159247,7 +159091,7 @@ ET
1.950 Tw
BT
-60.24 660.216 Td
+60.24 723.336 Td
/F1.0 10.5 Tf
[<546869732063616e206265206163636f6d706c6973686564207573696e672065697468657220616e6e6f746174696f6e73206f72207468726f7567682061207365706172> 20.01953125 <6174652066696c652d6261736564206c61> 20.01953125 <796f75742e>] TJ
ET
@@ -159260,7 +159104,7 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 644.436 Td
+60.24 707.556 Td
/F1.0 10.5 Tf
<53696e636520746869732069732061206c6172676520746f7069632c2069742068617320697473206f776e20> Tj
ET
@@ -159271,7 +159115,7 @@ ET
0.259 0.545 0.792 SCN
BT
-257.157 644.436 Td
+257.157 707.556 Td
/F1.0 10.5 Tf
[<6c61> 20.01953125 <796f75742063686170746572>] TJ
ET
@@ -159282,7 +159126,7 @@ ET
0.200 0.200 0.200 SCN
BT
-329.575294921875 644.436 Td
+329.575294921875 707.556 Td
/F1.0 10.5 Tf
[<20696e20746865205769636b> 20.01953125 <6574207669657765722067756964652e>] TJ
ET
@@ -159295,7 +159139,7 @@ ET
0.247 Tw
BT
-60.24 616.6560000000001 Td
+60.24 679.7760000000001 Td
/F1.0 10.5 Tf
[<3d204f626a656374205469746c657320616e642049636f6e73203a4e6f746963653a204c6963656e73656420746f207468652041706163686520536f6674776172652046> 40.0390625 <6f756e646174696f6e20284153462920756e646572206f6e65>] TJ
ET
@@ -159310,7 +159154,7 @@ ET
1.775 Tw
BT
-60.24 600.8760000000001 Td
+60.24 663.9960000000001 Td
/F1.0 10.5 Tf
[<6f72206d6f726520636f6e7472696275746f72206c6963656e73652061677265656d656e74732e2053656520746865204e4f> 20.01953125 <544943452066696c652064697374726962757465642077697468207468697320776f726b20666f72>] TJ
ET
@@ -159325,7 +159169,7 @@ ET
0.546 Tw
BT
-60.24 585.0960000000001 Td
+60.24 648.2160000000001 Td
/F1.0 10.5 Tf
[<6164646974696f6e616c20696e666f726d6174696f6e20726567617264696e6720636f70> 20.01953125 <797269676874206f776e6572736869702e2054686520415346206c6963656e73657320746869732066696c6520746f20796f7520756e646572>] TJ
ET
@@ -159340,7 +159184,7 @@ ET
0.463 Tw
BT
-60.24 569.3160000000001 Td
+60.24 632.4360000000001 Td
/F1.0 10.5 Tf
[<74686520417061636865204c6963656e73652c2056> 60.05859375 <657273696f6e20322e30202874686520224c6963656e736522293b20796f75206d61> 20.01953125 <79206e6f742075736520746869732066696c652065786365707420696e20636f6d706c69616e6365>] TJ
ET
@@ -159355,7 +159199,7 @@ ET
17.115 Tw
BT
-60.24 553.5360000000001 Td
+60.24 616.6560000000002 Td
/F1.0 10.5 Tf
[<7769746820746865204c6963656e73652e2059> 69.82421875 <6f75206d61> 20.01953125 <79206f627461696e206120636f70> 20.01953125 <79206f6620746865204c6963656e73652061742e>] TJ
ET
@@ -159370,7 +159214,7 @@ ET
0.114 Tw
BT
-60.24 537.7560000000001 Td
+60.24 600.8760000000001 Td
/F1.0 10.5 Tf
[<687474703a2f2f777777> 69.82421875 <2e6170616368652e6f72672f6c6963656e7365732f4c4943454e53452d322e30>] TJ
ET
@@ -159385,7 +159229,7 @@ ET
0.114 Tw
BT
-280.290345703125 537.7560000000001 Td
+280.290345703125 600.8760000000001 Td
/F1.0 10.5 Tf
[<202e20556e6c6573732072657175697265642062> 20.01953125 <79206170706c696361626c65206c6177206f722061677265656420746f20696e>] TJ
ET
@@ -159400,7 +159244,7 @@ ET
1.078 Tw
BT
-60.24 521.9760000000001 Td
+60.24 585.0960000000001 Td
/F1.0 10.5 Tf
[<77726974696e672c20736f66747761726520646973747269627574656420756e64657220746865204c6963656e7365206973206469737472696275746564206f6e20616e2022> 80.078125 <4153204953222042> 20.01953125 <415349532c20574954484f5554>] TJ
ET
@@ -159415,7 +159259,7 @@ ET
1.148 Tw
BT
-60.24 506.19600000000014 Td
+60.24 569.3160000000001 Td
/F1.0 10.5 Tf
[<57> 60.05859375 <415252414e54494553204f522020434f4e444954494f4e53204f4620414e59204b494e442c206569746865722065787072657373206f7220696d706c6965642e2053656520746865204c6963656e736520666f72>] TJ
ET
@@ -159428,7 +159272,7 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 490.4160000000001 Td
+60.24 553.5360000000001 Td
/F1.0 10.5 Tf
<746865207370656369666963206c616e677561676520676f7665726e696e67207065726d697373696f6e7320616e64206c696d69746174696f6e7320756e64657220746865204c6963656e73652e> Tj
ET
@@ -159441,7 +159285,7 @@ ET
0.443 Tw
BT
-60.24 462.63600000000014 Td
+60.24 525.7560000000001 Td
/F1.0 10.5 Tf
[<496e204170616368652049736973206576657279206f626a656374206973206964656e74696669656420746f2074686520757365722062> 20.01953125 <792061207469746c6520286c6162656c2920616e6420616e2069636f6e2e20546869732069732073686f776e>] TJ
ET
@@ -159456,7 +159300,7 @@ ET
1.393 Tw
BT
-60.24 446.8560000000001 Td
+60.24 509.9760000000001 Td
/F1.0 10.5 Tf
[<696e207365766572> 20.01953125 <616c20706c616365733a20617320746865206d61696e2068656164696e6720666f7220616e206f626a6563743b2061732061206c696e6b207465787420666f7220616e206f626a656374207265666572656e63696e67>] TJ
ET
@@ -159469,7 +159313,7 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 431.07600000000014 Td
+60.24 494.19600000000014 Td
/F1.0 10.5 Tf
<616e6f74686572206f626a6563742c20616e6420616c736f20696e207461626c657320726570726573656e74696e6720636f6c6c656374696f6e73206f66206f626a656374732e> Tj
ET
@@ -159482,7 +159326,7 @@ ET
1.317 Tw
BT
-60.24 403.2960000000001 Td
+60.24 466.4160000000001 Td
/F1.0 10.5 Tf
<5468652069636f6e206973206f6674656e207468652073616d6520666f7220616c6c20696e7374616e636573206f66206120706172746963756c617220636c6173732c20627574206974d57320616c736f20706f737369626c6520666f7220616e> Tj
ET
@@ -159497,7 +159341,7 @@ ET
0.729 Tw
BT
-60.24 387.5160000000001 Td
+60.24 450.6360000000001 Td
/F1.0 10.5 Tf
<696e646976696475616c20696e7374616e636520746f2072657475726e206120637573746f6d2069636f6e2e205468697320636f756c6420726570726573656e7420746865207374617465206f662074686174206f626a656374202865672061> Tj
ET
@@ -159510,7 +159354,7 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 371.7360000000001 Td
+60.24 434.8560000000001 Td
/F1.0 10.5 Tf
[<73686970706564206f726465722c207361> 20.01953125 <79> 89.84375 <2c206f72206f766572647565206c696272> 20.01953125 <61727920626f6f6b292e>] TJ
ET
@@ -159523,7 +159367,7 @@ ET
0.445 Tw
BT
-60.24 343.9560000000001 Td
+60.24 407.0760000000001 Td
/F1.0 10.5 Tf
<497420697320616c736f20706f737369626c6520666f7220616e206f626a65637420746f2070726f7669646520612043535320636c6173732068696e742e20496e20636f6e6a756e6374696f6e207769746820> Tj
ET
@@ -159538,7 +159382,7 @@ ET
0.445 Tw
BT
-457.0416470588235 343.9560000000001 Td
+457.0416470588235 407.0760000000001 Td
/F1.0 10.5 Tf
<637573746f6d697a656420435353> Tj
ET
@@ -159553,7 +159397,7 @@ ET
0.445 Tw
BT
-535.04 343.9560000000001 Td
+535.04 407.0760000000001 Td
ET
@@ -159566,7 +159410,7 @@ ET
0.005 Tw
BT
-60.24 328.17600000000004 Td
+60.24 391.29600000000005 Td
/F1.0 10.5 Tf
[<746869732063616e206265207573656420746f206170706c7920617262697472> 20.01953125 <617279207374796c696e673b20666f72206578616d706c652065616368206f626a65637420636f756c642062652072656e646572656420696e20612070616765>] TJ
ET
@@ -159579,7 +159423,7 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 312.3960000000001 Td
+60.24 375.5160000000001 Td
/F1.0 10.5 Tf
[<77697468206120646966666572656e74206261636b> 20.01953125 <67726f756e6420636f6c6f75722e>] TJ
ET
@@ -159590,7 +159434,7 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 284.61600000000004 Td
+60.24 347.73600000000005 Td
/F1.0 10.5 Tf
<3d3d204f626a656374205469746c65> Tj
ET
@@ -159603,7 +159447,7 @@ ET
1.266 Tw
BT
-60.24 256.83600000000007 Td
+60.24 319.9560000000001 Td
/F1.0 10.5 Tf
[<546865206f626a656374207469746c652069732061206c6162656c20746f206964656e7469667920616e206f626a65637420746f2074686520656e642d757365722e202047656e6572> 20.01953125 <616c6c7920746865206f626a656374207469746c652069732061>] TJ
ET
@@ -159618,7 +159462,7 @@ ET
1.832 Tw
BT
-60.24 241.05600000000007 Td
+60.24 304.17600000000004 Td
/F1.0 10.5 Tf
<6c6162656c20746f206964656e7469667920616e206f626a65637420746f2074686520656e642d757365722e20205468657265206973206e6f20726571756972656d656e7420666f7220697420746f206265206162736f6c7574656c79> Tj
ET
@@ -159633,7 +159477,7 @@ ET
0.508 Tw
BT
-60.24 225.27600000000007 Td
+60.24 288.3960000000001 Td
/F1.0 10.5 Tf
[<756e697175652c206275742069742073686f756c642062652022756e6971756520656e6f756768> 40.0390625 <2220746f2064697374696e677569736820746865206f626a6563742066726f6d206f74686572206f626a656374d573206c696b> 20.01953125 <656c7920746f>] TJ
ET
@@ -159646,7 +159490,7 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 209.49600000000007 Td
+60.24 272.6160000000001 Td
/F1.0 10.5 Tf
<62652072656e6465726564206f6e207468652073616d6520706167652e> Tj
ET
@@ -159659,7 +159503,7 @@ ET
1.409 Tw
BT
-60.24 181.71600000000007 Td
+60.24 244.83600000000007 Td
/F1.0 10.5 Tf
[<546865207469746c6520697320616c7761> 20.01953125 <79732073686f776e207769746820616e2069636f6e2c20736f2074686572652069732067656e6572> 20.01953125 <616c6c79206e6f206e65656420666f7220746865207469746c6520746f20696e636c756465>] TJ
ET
@@ -159674,7 +159518,7 @@ ET
2.483 Tw
BT
-60.24 165.93600000000006 Td
+60.24 229.05600000000007 Td
/F1.0 10.5 Tf
[<696e666f726d6174696f6e2061626f757420746865206f626a656374d57320747970652e202046> 40.0390625 <6f72206578616d706c6520746865207469746c65206f66206120637573746f6d6572206f626a6563742073686f756c646ed574>] TJ
ET
@@ -159689,7 +159533,7 @@ ET
0.770 Tw
BT
-60.24 150.15600000000006 Td
+60.24 213.27600000000007 Td
/F1.0 10.5 Tf
[<696e636c75646520746865206c69746572> 20.01953125 <616c20737472696e672022437573746f6d6572223b2069742063616e206a75737420686176652074686520637573746f6d6572> -29.78515625 <d573206e616d652c207265666572656e6365206f7220736f6d65>] TJ
ET
@@ -159702,7 +159546,7 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 134.37600000000006 Td
+60.24 197.49600000000007 Td
/F1.0 10.5 Tf
<6f74686572206d65616e696e6766756c20627573696e657373206964656e7469666965722e> Tj
ET
@@ -159713,7 +159557,7 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 106.59600000000006 Td
+60.24 169.71600000000007 Td
/F1.0 10.5 Tf
[<3d3d3d204465636c6172> 20.01953125 <6174697665207374796c65>] TJ
ET
@@ -159724,7 +159568,7 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 78.81600000000006 Td
+60.24 141.93600000000006 Td
/F1.0 10.5 Tf
<54686520> Tj
ET
@@ -159735,7 +159579,7 @@ ET
0.694 0.129 0.275 SCN
BT
-81.66 78.81600000000006 Td
+81.66 141.93600000000006 Td
/F6.0 10.5 Tf
<405469746c65> Tj
ET
@@ -159746,13 +159590,24 @@ ET
0.2
<TRUNCATED>
[16/39] isis-site git commit: ISIS-1810: updates docs for 2.0.0-M1
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/274edd1d/content/versions/SNAPSHOT/guides/rgant/rgant.html
----------------------------------------------------------------------
diff --git a/content/versions/SNAPSHOT/guides/rgant/rgant.html b/content/versions/SNAPSHOT/guides/rgant/rgant.html
index 7894892..a14aa88 100644
--- a/content/versions/SNAPSHOT/guides/rgant/rgant.html
+++ b/content/versions/SNAPSHOT/guides/rgant/rgant.html
@@ -6441,11 +6441,24 @@ WrapperFactory wrapperFactory;</code></pre>
</ul>
</div>
<div class="paragraph">
- <p>Whenever a domain object is instantiated or otherwise becomes known to the framework, a "created" lifecycle event is fired. This is typically when the <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_DomainObjectContainer"><code>DomainObjectContainer</code></a>'s <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_DomainObjectContainer_object-creation-api"><code>newTransientInstance()</code></a> is called; it will also happen if the object is simply instantiated with <code>new(…)</code>, and then the <code>ServiceRegistry</code>'s <a href="../rgsvc/rgsvc.html#_rgsvc_metadata-api_ServiceRegistry"><code>injectServicesInto(…)</code></a> method is called.</p>
+ <p>Whenever a domain object is instantiated or otherwise becomes known to the framework, a "created" lifecycle event is fired. This is typically when the <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_FactoryService"><code>FactoryService</code></a>'s <code>instantiate()</code> method is called.</p>
</div>
<div class="paragraph">
<p>Subscribers subscribe through the <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_EventBusService"><code>EventBusService</code></a> and can use the event to obtain a reference to the object just created. The subscriber could then, for example, update the object, eg looking up state from some external datastore.</p>
</div>
+ <div class="admonitionblock tip">
+ <table>
+ <tbody>
+ <tr>
+ <td class="icon"> <i class="fa icon-tip" title="Tip"></i> </td>
+ <td class="content">
+ <div class="paragraph">
+ <p>It’s possible to instantiate objects without firing this lifecycle; just instantiate using its regular constructor, and then use the <code>ServiceRegistry</code>'s <a href="../rgsvc/rgsvc.html#_rgsvc_metadata-api_ServiceRegistry"><code>injectServicesInto(…)</code></a> to manually inject any required domain services.</p>
+ </div> </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
<div class="paragraph">
<p>By default the event raised is <code>ObjectCreatedEvent.Default</code>. For example:</p>
</div>
@@ -6481,7 +6494,7 @@ WrapperFactory wrapperFactory;</code></pre>
<div class="sect3">
<h4 id="_subscribers_3">10.4.1. Subscribers</h4>
<div class="paragraph">
- <p>Subscribers (which must be domain services) subscribe using either the <a href="https://github.com/google/guava">Guava</a> API or (if the <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_EventBusService"><code>EventBusService</code></a> has been appropriately configured) using the <a href="http://www.axonframework.org/">Axon Framework</a> API. The examples below use the Guava API.</p>
+ <p>Subscribers (which must be domain services) subscribe using either the <a href="https://github.com/google/guava">Guava</a> API or (if the <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_EventBusService"><code>EventBusService</code></a> has been appropriately configured) using the <a href="http://www.axonframework.org/">Axon Framework</a> API. The examples below are compatible with both.</p>
</div>
<div class="paragraph">
<p>Subscribers can be either coarse-grained (if they subscribe to the top-level event type):</p>
@@ -6490,7 +6503,8 @@ WrapperFactory wrapperFactory;</code></pre>
<div class="content">
<pre class="CodeRay highlight"><code data-lang="java"><span class="annotation">@DomainService</span>(nature=NatureOfService.DOMAIN)
<span class="directive">public</span> <span class="type">class</span> <span class="class">SomeSubscriber</span> <span class="directive">extends</span> AbstractSubscriber {
- <span class="annotation">@com</span>.google.common.eventbus.Subscribe
+ <span class="annotation">@org</span>.axonframework.eventhandling.annotation.EventHandler <span class="comment">// if using axon</span>
+ <span class="annotation">@com</span>.google.common.eventbus.Subscribe <span class="comment">// if using guava</span>
<span class="directive">public</span> <span class="type">void</span> on(ObjectCreatedEvent ev) {
<span class="keyword">if</span>(ev.getSource() <span class="keyword">instanceof</span> ToDoItem) { ... }
}
@@ -6504,26 +6518,14 @@ WrapperFactory wrapperFactory;</code></pre>
<div class="content">
<pre class="CodeRay highlight"><code data-lang="java"><span class="annotation">@DomainService</span>(nature=NatureOfService.DOMAIN)
<span class="directive">public</span> <span class="type">class</span> <span class="class">SomeSubscriber</span> <span class="directive">extends</span> AbstractSubscriber {
- <span class="annotation">@com</span>.google.common.eventbus.Subscribe
+ <span class="annotation">@org</span>.axonframework.eventhandling.annotation.EventHandler <span class="comment">// if using axon</span>
+ <span class="annotation">@com</span>.google.common.eventbus.Subscribe <span class="comment">// if using guava</span>
<span class="directive">public</span> <span class="type">void</span> on(ToDoItem.ObjectCreatedEvent ev) {
...
}
}</code></pre>
</div>
</div>
- <div class="admonitionblock tip">
- <table>
- <tbody>
- <tr>
- <td class="icon"> <i class="fa icon-tip" title="Tip"></i> </td>
- <td class="content">
- <div class="paragraph">
- <p>If the AxonFramework is being used, replace <code>@com.google.common.eventbus.Subscribe</code> with <code>@org.axonframework.eventhandling.annotation.EventHandler</code>.</p>
- </div> </td>
- </tr>
- </tbody>
- </table>
- </div>
</div>
<div class="sect3">
<h4 id="_default_doop_and_noop_events_3">10.4.2. Default, Doop and Noop events</h4>
@@ -8139,7 +8141,7 @@ WrapperFactory wrapperFactory;</code></pre>
<div class="sect3">
<h4 id="_subscribers_10">11.4.1. Subscribers</h4>
<div class="paragraph">
- <p>Subscribers (which must be domain services) subscribe using either the <a href="https://github.com/google/guava">Guava</a> API or (if the <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_EventBusService"><code>EventBusService</code></a> has been appropriately configured) using the <a href="http://www.axonframework.org/">Axon Framework</a> API. The examples below use the Guava API.</p>
+ <p>Subscribers (which must be domain services) subscribe using either the <a href="https://github.com/google/guava">Guava</a> API or (if the <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_EventBusService"><code>EventBusService</code></a> has been appropriately configured) using the <a href="http://www.axonframework.org/">Axon Framework</a> API. The examples below are compatible with both.</p>
</div>
<div class="paragraph">
<p>Subscribers can be either coarse-grained (if they subscribe to the top-level event type):</p>
@@ -8148,7 +8150,8 @@ WrapperFactory wrapperFactory;</code></pre>
<div class="content">
<pre class="CodeRay highlight"><code data-lang="java"><span class="annotation">@DomainService</span>(nature=NatureOfService.DOMAIN)
<span class="directive">public</span> <span class="type">class</span> <span class="class">SomeSubscriber</span> <span class="directive">extends</span> AbstractSubscriber {
- <span class="annotation">@com</span>.google.common.eventbus.Subscribe
+ <span class="annotation">@org</span>.axonframework.eventhandling.annotation.EventHandler <span class="comment">// if using axon</span>
+ <span class="annotation">@com</span>.google.common.eventbus.Subscribe <span class="comment">// if using guava</span>
<span class="directive">public</span> <span class="type">void</span> on(CssClassUiEvent ev) {
<span class="keyword">if</span>(ev.getSource() <span class="keyword">instanceof</span> ToDoItemDto) { ... }
}
@@ -8162,7 +8165,8 @@ WrapperFactory wrapperFactory;</code></pre>
<div class="content">
<pre class="CodeRay highlight"><code data-lang="java"><span class="annotation">@DomainService</span>(nature=NatureOfService.DOMAIN)
<span class="directive">public</span> <span class="type">class</span> <span class="class">SomeSubscriber</span> <span class="directive">extends</span> AbstractSubscriber {
- <span class="annotation">@com</span>.google.common.eventbus.Subscribe
+ <span class="annotation">@org</span>.axonframework.eventhandling.annotation.EventHandler <span class="comment">// if using axon</span>
+ <span class="annotation">@com</span>.google.common.eventbus.Subscribe <span class="comment">// if using guava</span>
<span class="directive">public</span> <span class="type">void</span> on(ToDoItemDto.CssClassUiEvent ev) {
...
}
@@ -8172,19 +8176,6 @@ WrapperFactory wrapperFactory;</code></pre>
<div class="paragraph">
<p>The subscriber should then use <code>CssClassUiEvent#setCssClass(…)</code> to actually specify the CSS class to be used.</p>
</div>
- <div class="admonitionblock tip">
- <table>
- <tbody>
- <tr>
- <td class="icon"> <i class="fa icon-tip" title="Tip"></i> </td>
- <td class="content">
- <div class="paragraph">
- <p>If the AxonFramework is being used, replace <code>@com.google.common.eventbus.Subscribe</code> with <code>@org.axonframework.eventhandling.annotation.EventHandler</code>.</p>
- </div> </td>
- </tr>
- </tbody>
- </table>
- </div>
</div>
<div class="sect3">
<h4 id="_default_doop_and_noop_events_10">11.4.2. Default, Doop and Noop events</h4>
@@ -8204,7 +8195,7 @@ WrapperFactory wrapperFactory;</code></pre>
<div class="sect3">
<h4 id="_raising_events_programmatically_3">11.4.3. Raising events programmatically</h4>
<div class="paragraph">
- <p>Normally events are only raised for interactions through the UI. However, events can be raised programmatically either by calling the <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_EventBusService"><code>EventBusService</code></a> API directly, or as a result of calling the <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_DomainObjectContainer"><code>DomainObjectContainer</code></a>'s <code>cssClassOf(…)</code> method.</p>
+ <p>Normally events are only raised for interactions through the UI. However, events can be raised programmatically either by calling the <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_EventBusService"><code>EventBusService</code></a> API directly.</p>
</div>
</div>
</div>
@@ -8302,7 +8293,7 @@ WrapperFactory wrapperFactory;</code></pre>
<div class="sect3">
<h4 id="_subscribers_11">11.6.1. Subscribers</h4>
<div class="paragraph">
- <p>Subscribers (which must be domain services) subscribe using either the <a href="https://github.com/google/guava">Guava</a> API or (if the <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_EventBusService"><code>EventBusService</code></a> has been appropriately configured) using the <a href="http://www.axonframework.org/">Axon Framework</a> API. The examples below use the Guava API.</p>
+ <p>Subscribers (which must be domain services) subscribe using either the <a href="https://github.com/google/guava">Guava</a> API or (if the <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_EventBusService"><code>EventBusService</code></a> has been appropriately configured) using the <a href="http://www.axonframework.org/">Axon Framework</a> API. The examples below are compatible with both.</p>
</div>
<div class="paragraph">
<p>Subscribers can be either coarse-grained (if they subscribe to the top-level event type):</p>
@@ -8311,7 +8302,8 @@ WrapperFactory wrapperFactory;</code></pre>
<div class="content">
<pre class="CodeRay highlight"><code data-lang="java"><span class="annotation">@DomainService</span>(nature=NatureOfService.DOMAIN)
<span class="directive">public</span> <span class="type">class</span> <span class="class">SomeSubscriber</span> <span class="directive">extends</span> AbstractSubscriber {
- <span class="annotation">@com</span>.google.common.eventbus.Subscribe
+ <span class="annotation">@org</span>.axonframework.eventhandling.annotation.EventHandler <span class="comment">// if using axon</span>
+ <span class="annotation">@com</span>.google.common.eventbus.Subscribe <span class="comment">// if using guava</span>
<span class="directive">public</span> <span class="type">void</span> on(IconUiEvent ev) {
<span class="keyword">if</span>(ev.getSource() <span class="keyword">instanceof</span> ToDoItemDto) { ... }
}
@@ -8325,7 +8317,8 @@ WrapperFactory wrapperFactory;</code></pre>
<div class="content">
<pre class="CodeRay highlight"><code data-lang="java"><span class="annotation">@DomainService</span>(nature=NatureOfService.DOMAIN)
<span class="directive">public</span> <span class="type">class</span> <span class="class">SomeSubscriber</span> <span class="directive">extends</span> AbstractSubscriber {
- <span class="annotation">@com</span>.google.common.eventbus.Subscribe
+ <span class="annotation">@org</span>.axonframework.eventhandling.annotation.EventHandler <span class="comment">// if using axon</span>
+ <span class="annotation">@com</span>.google.common.eventbus.Subscribe <span class="comment">// if using guava</span>
<span class="directive">public</span> <span class="type">void</span> on(ToDoItemDto.IconUiEvent ev) {
...
}
@@ -8335,19 +8328,6 @@ WrapperFactory wrapperFactory;</code></pre>
<div class="paragraph">
<p>The subscriber should then use <code>IconUiEvent#setIconName(…)</code> to actually specify the icon name to be used.</p>
</div>
- <div class="admonitionblock tip">
- <table>
- <tbody>
- <tr>
- <td class="icon"> <i class="fa icon-tip" title="Tip"></i> </td>
- <td class="content">
- <div class="paragraph">
- <p>If the AxonFramework is being used, replace <code>@com.google.common.eventbus.Subscribe</code> with <code>@org.axonframework.eventhandling.annotation.EventHandler</code>.</p>
- </div> </td>
- </tr>
- </tbody>
- </table>
- </div>
</div>
<div class="sect3">
<h4 id="_default_doop_and_noop_events_11">11.6.2. Default, Doop and Noop events</h4>
@@ -8367,7 +8347,7 @@ WrapperFactory wrapperFactory;</code></pre>
<div class="sect3">
<h4 id="_raising_events_programmatically_4">11.6.3. Raising events programmatically</h4>
<div class="paragraph">
- <p>Normally events are only raised for interactions through the UI. However, events can be raised programmatically either by calling the <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_EventBusService"><code>EventBusService</code></a> API directly, or as a result of calling the <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_DomainObjectContainer"><code>DomainObjectContainer</code></a>'s <code>iconNameOf(…)</code> method.</p>
+ <p>Normally events are only raised for interactions through the UI. However, events can be raised programmatically either by calling the <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_EventBusService"><code>EventBusService</code></a> API directly, or as a result of calling the <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_TitleService"><code>TitleService</code></a>'s <code>iconNameOf(…)</code> method.</p>
</div>
</div>
</div>
@@ -9404,10 +9384,10 @@ WrapperFactory wrapperFactory;</code></pre>
)
<span class="annotation">@HomePage</span>
<span class="directive">public</span> ToDoAppDashboard lookup() {
- <span class="keyword">return</span> container.injectServicesInto(<span class="keyword">new</span> ToDoAppDashboard());
+ <span class="keyword">return</span> serviceRegistry.injectServicesInto(<span class="keyword">new</span> ToDoAppDashboard());
}
<span class="annotation">@Inject</span>
- <span class="directive">private</span> DomainObjectContainer container;
+ <span class="predefined-type">ServiceRegistry</span> serviceRegistry;
}</code></pre>
</div>
</div>
@@ -9472,7 +9452,7 @@ WrapperFactory wrapperFactory;</code></pre>
</table>
</div>
<div class="paragraph">
- <p>Isis supports several syntaxes for injecting domain services. The simplest uses the <code>@javax.inject.Inject</code> annotation on the field, as defined in <a href="https://jcp.org/en/jsr/detail?id=330">JSR-330</a>.</p>
+ <p>Apache Isis supports several syntaxes for injecting domain services. The simplest uses the <code>@javax.inject.Inject</code> annotation on the field, as defined in <a href="https://jcp.org/en/jsr/detail?id=330">JSR-330</a>.</p>
</div>
<div class="paragraph">
<p>For example:</p>
@@ -9505,7 +9485,7 @@ WrapperFactory wrapperFactory;</code></pre>
<div class="sect2">
<h3 id="_alternative_syntaxes">16.1. Alternative syntaxes</h3>
<div class="paragraph">
- <p>Isis also supports setter-based injection:</p>
+ <p>Apache Isis also supports setter-based injection:</p>
</div>
<div class="listingblock">
<div class="content">
@@ -9591,55 +9571,35 @@ WrapperFactory wrapperFactory;</code></pre>
<div class="sect2">
<h3 id="_manually_injecting_services">16.3. Manually injecting services</h3>
<div class="paragraph">
- <p>Isis performs dependency injection when domain entities are recreated. It will also perform dependency injection if an object is created through the <code>DomainObjectContainer</code>.</p>
+ <p>Apache Isis performs dependency injection when domain entities are recreated. It will also perform dependency injection if an object is created through the <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_FactoryService"><code>FactoryService</code></a> or <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_RepositoryService"><code>RepositoryService</code></a>.</p>
</div>
<div class="paragraph">
<p>For example, to create a new (transient) domain object, the idiom is:</p>
</div>
<div class="listingblock">
<div class="content">
- <pre class="CodeRay highlight"><code data-lang="java">Customer cust = container.newTransientInstance(Customer.class); <i class="conum" data-value="1"></i><b>(1)</b>
+ <pre class="CodeRay highlight"><code data-lang="java">Customer cust = repositoryService.instantiate(Customer.class); <i class="conum" data-value="1"></i><b>(1)</b>
<span class="comment">// initialize state of "cust"</span>
-container.persist(cust);</code></pre>
+repositoryService.persist(cust);</code></pre>
</div>
</div>
- <div class="colist arabic">
- <table>
- <tbody>
- <tr>
- <td><i class="conum" data-value="1"></i><b>1</b></td>
- <td>where <code>container</code> is an instance of <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_DomainObjectContainer"><code>DomainObjectContainer</code></a>.</td>
- </tr>
- </tbody>
- </table>
- </div>
<div class="paragraph">
- <p>View models are created similarly:</p>
+ <p>View models are created identically:</p>
</div>
<div class="listingblock">
<div class="content">
- <pre class="CodeRay highlight"><code data-lang="java">ToDoAppDashboard dashboard = container.newViewModelInstance(ToDoAppDashboard.class);</code></pre>
+ <pre class="CodeRay highlight"><code data-lang="java">ToDoAppDashboard dashboard = repositoryService.instantiate(ToDoAppDashboard.class);</code></pre>
</div>
</div>
<div class="paragraph">
- <p>If you prefer, though, you can simply instantiate domain objects using "new" and then inject domain services manually:</p>
+ <p>If you prefer, though, you can simply instantiate domain objects using "new" and then inject domain services manually using <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_ServiceRegistry"><code>ServiceRegistry</code></a>:</p>
</div>
<div class="listingblock">
<div class="content">
<pre class="CodeRay highlight"><code data-lang="java">Customer cust = <span class="keyword">new</span> Customer();
-container.injectServicesInto(cust);
+serviceRegistry.injectServicesInto(cust);
<span class="comment">// initialize state of "cust"</span>
-container.persist(cust);</code></pre>
- </div>
- </div>
- <div class="paragraph">
- <p>or if you prefer:</p>
- </div>
- <div class="listingblock">
- <div class="content">
- <pre class="CodeRay highlight"><code data-lang="java">Customer cust = container.injectServicesInto(<span class="keyword">new</span> Customer());
-<span class="comment">// initialize state of "cust"</span>
-container.persist(cust);</code></pre>
+repositoryService.persist(cust);</code></pre>
</div>
</div>
<div class="admonitionblock note">
@@ -9649,10 +9609,10 @@ container.persist(cust);</code></pre>
<td class="icon"> <i class="fa icon-note" title="Note"></i> </td>
<td class="content">
<div class="paragraph">
- <p>There is one subtle difference between using <code>DomainObjectContainer#newTransientInstance(…)</code> and <code>DomainObjectContainer#injectServicesInto(…)</code>, in that with the former Apache Isis will automatically initialize all fields to their default values.</p>
+ <p>Note that using either <code>FactoryService#instantiate(…)</code> or <code>RepositoryService#instantiate(…)</code> will also automatically initialize all fields to their default values, and will also fire a "created" lifecycle event.</p>
</div>
<div class="paragraph">
- <p>This isn’t a particular useful feature (and indeed can sometimes be rather confusing) so you may well wish to standardize on using <code>injectServicesInto(…)</code> throughout.</p>
+ <p>Neither of these are particularly useful (and indeed can sometimes be rather confusing) so you may well wish to standardize on using <code>injectServicesInto(…)</code> throughout.</p>
</div> </td>
</tr>
</tbody>
@@ -11202,41 +11162,7 @@ container.persist(cust);</code></pre>
</div>
</div>
<div class="paragraph">
- <p>Isis uses argument to pass in the configuration properties read from all <a href="../rgcfg/rgcfg.html#_rgcfg_configuration-files">configuration files</a>:</p>
- </div>
- <div class="admonitionblock tip">
- <table>
- <tbody>
- <tr>
- <td class="icon"> <i class="fa icon-tip" title="Tip"></i> </td>
- <td class="content">
- <div class="paragraph">
- <p>Alternatively, you could inject <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_DomainObjectContainer"><code>DomainObjectContainer</code></a> into the service and read configuration properties using <code>DomainObjectContainer#getProperty(…)</code> and related methods. Note that when using this latter API only those configuration properties prefixes <code>application.</code> key are provided.</p>
- </div> </td>
- </tr>
- </tbody>
- </table>
- </div>
- <div class="paragraph">
- <p>A common use case is for domain services that interact with the <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_EventBusService"><code>EventBusService</code></a>. For example:</p>
- </div>
- <div class="listingblock">
- <div class="content">
- <pre class="CodeRay highlight"><code data-lang="java"><span class="annotation">@DomainService</span>(nature=NatureOfService.DOMAIN)
-<span class="directive">public</span> <span class="type">class</span> <span class="class">MySubscribingService</span> {
- <span class="annotation">@PostConstruct</span>
- <span class="directive">public</span> <span class="type">void</span> postConstruct() {
- eventBusService.register(<span class="local-variable">this</span>);
- }
- <span class="annotation">@PreDestroy</span>
- <span class="directive">public</span> <span class="type">void</span> preDestroy() {
- eventBusService.unregister(<span class="local-variable">this</span>);
- }
- ...
- <span class="annotation">@javax</span>.inject.Inject
- EventBusService eventBusService;
-}</code></pre>
- </div>
+ <p>Apache Isis uses argument to pass in the configuration properties read from all <a href="../rgcfg/rgcfg.html#_rgcfg_configuration-files">configuration files</a>:</p>
</div>
<div class="admonitionblock tip">
<table>
@@ -11245,14 +11171,14 @@ container.persist(cust);</code></pre>
<td class="icon"> <i class="fa icon-tip" title="Tip"></i> </td>
<td class="content">
<div class="paragraph">
- <p>In this particular use case, it is generally simpler to just subclass from <a href="../rgcms/rgcms.html#_rgcms_classes_super_AbstractSubscriber"><code>AbstractSubscriber</code></a>.</p>
+ <p>Alternatively, you could inject <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_ConfigurationService"><code>ConfigurationService</code></a> into the service and read configuration properties using <code>ConfigurationService#getProperty(…)</code> and related methods. However, be aware when using this latter API that only those configuration properties keys with an <code>application.</code> prefix are provided.</p>
</div> </td>
</tr>
</tbody>
</table>
</div>
<div class="paragraph">
- <p>Other use cases include obtaining connections to external datasources, eg subscribing to an ActiveMQ router, say, or initializing/cleaning up a background scheduler such as Quartz.</p>
+ <p>Use cases include obtaining connections to external datasources, eg subscribing to an ActiveMQ router, say, or initializing/cleaning up a background scheduler such as Quartz.</p>
</div>
<div class="paragraph">
<p>See also <a href="../rgant/rgant.html#_rgant-PreDestroy"><code>@PreDestroy</code></a></p>
@@ -11360,7 +11286,7 @@ container.persist(cust);</code></pre>
<p>The <code>@javax.jdo.annotation.PrimaryKey</code> annotation is used by JDO/DataNucleus to indicate that a property is used as the primary key for an entity with application-managed identity.</p>
</div>
<div class="paragraph">
- <p>Apache Isis also uses this annotation in a very minimal way: to ensure that the framework’s own logic to initialize newly instantiated objects (eg using <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_DomainObjectContainer"><code>DomainObjectContainer#newTransientInstance(…)</code></a> does not touch the primary key, and also to ensure that the primary key property is always disabled (read-only).</p>
+ <p>Apache Isis also uses this annotation in a very minimal way: to ensure that the framework’s own logic to initialize newly instantiated objects (eg using <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_FactoryService"><code>FactoryService#instantiate(…)</code></a> does not touch the primary key, and also to ensure that the primary key property is always disabled (read-only).</p>
</div>
<div class="admonitionblock note">
<table>
[11/39] isis-site git commit: ISIS-1810: updates docs for 2.0.0-M1
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/274edd1d/content/versions/SNAPSHOT/guides/rgfis/rgfis.pdf
----------------------------------------------------------------------
diff --git a/content/versions/SNAPSHOT/guides/rgfis/rgfis.pdf b/content/versions/SNAPSHOT/guides/rgfis/rgfis.pdf
index 9b5283b..64cc14f 100644
--- a/content/versions/SNAPSHOT/guides/rgfis/rgfis.pdf
+++ b/content/versions/SNAPSHOT/guides/rgfis/rgfis.pdf
@@ -4,16 +4,16 @@
<< /Title (Framework Internal Services)
/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:20180812182503+01'00')
-/ModDate (D:20180812182503+01'00')
+/CreationDate (D:20180814003839+02'00')
+/ModDate (D:20180814003839+02'00')
>>
endobj
2 0 obj
<< /Type /Catalog
/Pages 3 0 R
/Names 14 0 R
-/Outlines 293 0 R
-/PageLabels 310 0 R
+/Outlines 292 0 R
+/PageLabels 309 0 R
/PageMode /UseOutlines
/OpenAction [7 0 R /FitH 842.89]
/ViewerPreferences << /DisplayDocTitle true
@@ -23,7 +23,7 @@ endobj
3 0 obj
<< /Type /Pages
/Count 22
-/Kids [7 0 R 10 0 R 12 0 R 36 0 R 57 0 R 65 0 R 70 0 R 75 0 R 82 0 R 94 0 R 106 0 R 110 0 R 120 0 R 141 0 R 151 0 R 164 0 R 171 0 R 200 0 R 215 0 R 225 0 R 229 0 R 237 0 R]
+/Kids [7 0 R 10 0 R 12 0 R 36 0 R 57 0 R 65 0 R 70 0 R 75 0 R 82 0 R 94 0 R 107 0 R 110 0 R 121 0 R 142 0 R 152 0 R 165 0 R 172 0 R 201 0 R 216 0 R 226 0 R 230 0 R 237 0 R]
>>
endobj
4 0 obj
@@ -80,11 +80,11 @@ endobj
<< /Type /Font
/BaseFont /AAAABU+NotoSerif
/Subtype /TrueType
-/FontDescriptor 312 0 R
+/FontDescriptor 311 0 R
/FirstChar 32
/LastChar 255
-/Widths 314 0 R
-/ToUnicode 313 0 R
+/Widths 313 0 R
+/ToUnicode 312 0 R
>>
endobj
9 0 obj
@@ -779,7 +779,7 @@ endobj
/F5.0 40 0 R
>>
>>
-/Annots [255 0 R 256 0 R 257 0 R 258 0 R 259 0 R 260 0 R 261 0 R 262 0 R 263 0 R 264 0 R 265 0 R 266 0 R 267 0 R 268 0 R 269 0 R 270 0 R 271 0 R 272 0 R 273 0 R 274 0 R 275 0 R 276 0 R 277 0 R 278 0 R 279 0 R 280 0 R 281 0 R 282 0 R 283 0 R 284 0 R 285 0 R 286 0 R 287 0 R 288 0 R 289 0 R 290 0 R 291 0 R]
+/Annots [254 0 R 255 0 R 256 0 R 257 0 R 258 0 R 259 0 R 260 0 R 261 0 R 262 0 R 263 0 R 264 0 R 265 0 R 266 0 R 267 0 R 268 0 R 269 0 R 270 0 R 271 0 R 272 0 R 273 0 R 274 0 R 275 0 R 276 0 R 277 0 R 278 0 R 279 0 R 280 0 R 281 0 R 282 0 R 283 0 R 284 0 R 285 0 R 286 0 R 287 0 R 288 0 R 289 0 R 290 0 R]
>>
endobj
11 0 obj
@@ -1465,7 +1465,7 @@ endobj
/F1.0 8 0 R
/F3.1 17 0 R
>>
-/XObject << /Stamp1 292 0 R
+/XObject << /Stamp1 291 0 R
>>
>>
/Annots [18 0 R 20 0 R 21 0 R 22 0 R 23 0 R 24 0 R 25 0 R 26 0 R 27 0 R 28 0 R 29 0 R 30 0 R 31 0 R 32 0 R 33 0 R 34 0 R]
@@ -1480,29 +1480,29 @@ endobj
>>
endobj
15 0 obj
-<< /Kids [156 0 R 157 0 R 231 0 R]
+<< /Kids [157 0 R 158 0 R 232 0 R]
>>
endobj
16 0 obj
<< /Type /Font
/BaseFont /AAAABV+NotoSerif-Bold
/Subtype /TrueType
-/FontDescriptor 316 0 R
+/FontDescriptor 315 0 R
/FirstChar 32
/LastChar 255
-/Widths 318 0 R
-/ToUnicode 317 0 R
+/Widths 317 0 R
+/ToUnicode 316 0 R
>>
endobj
17 0 obj
<< /Type /Font
/BaseFont /AAAABW+FontAwesome
/Subtype /TrueType
-/FontDescriptor 320 0 R
+/FontDescriptor 319 0 R
/FirstChar 32
/LastChar 255
-/Widths 322 0 R
-/ToUnicode 321 0 R
+/Widths 321 0 R
+/ToUnicode 320 0 R
>>
endobj
18 0 obj
@@ -3140,7 +3140,7 @@ endobj
/F4.0 39 0 R
/F5.0 40 0 R
>>
-/XObject << /Stamp1 292 0 R
+/XObject << /Stamp1 291 0 R
>>
>>
/Annots [38 0 R 41 0 R 42 0 R 43 0 R 44 0 R 45 0 R 46 0 R 47 0 R 48 0 R 49 0 R 50 0 R 51 0 R 52 0 R 54 0 R 55 0 R]
@@ -3164,22 +3164,22 @@ endobj
<< /Type /Font
/BaseFont /AAAABX+NotoSerif-Italic
/Subtype /TrueType
-/FontDescriptor 324 0 R
+/FontDescriptor 323 0 R
/FirstChar 32
/LastChar 255
-/Widths 326 0 R
-/ToUnicode 325 0 R
+/Widths 325 0 R
+/ToUnicode 324 0 R
>>
endobj
40 0 obj
<< /Type /Font
/BaseFont /AAAABY+mplus1mn-regular
/Subtype /TrueType
-/FontDescriptor 328 0 R
+/FontDescriptor 327 0 R
/FirstChar 32
/LastChar 255
-/Widths 330 0 R
-/ToUnicode 329 0 R
+/Widths 329 0 R
+/ToUnicode 328 0 R
>>
endobj
41 0 obj
@@ -4095,7 +4095,7 @@ endobj
/F5.0 40 0 R
>>
/XObject << /I1 62 0 R
-/Stamp1 292 0 R
+/Stamp1 291 0 R
>>
>>
/Annots [58 0 R 59 0 R 60 0 R 61 0 R 63 0 R]
@@ -5998,7 +5998,7 @@ endobj
/F5.0 40 0 R
/F5.1 67 0 R
>>
-/XObject << /Stamp1 292 0 R
+/XObject << /Stamp1 291 0 R
>>
>>
>>
@@ -6010,11 +6010,11 @@ endobj
<< /Type /Font
/BaseFont /AAAABZ+mplus1mn-regular
/Subtype /TrueType
-/FontDescriptor 332 0 R
+/FontDescriptor 331 0 R
/FirstChar 32
/LastChar 255
-/Widths 334 0 R
-/ToUnicode 333 0 R
+/Widths 333 0 R
+/ToUnicode 332 0 R
>>
endobj
68 0 obj
@@ -8250,7 +8250,7 @@ endobj
/F1.0 8 0 R
/F6.0 71 0 R
>>
-/XObject << /Stamp1 292 0 R
+/XObject << /Stamp1 291 0 R
>>
>>
/Annots [72 0 R 73 0 R]
@@ -8260,11 +8260,11 @@ endobj
<< /Type /Font
/BaseFont /AAAACA+mplus-1p-regular
/Subtype /TrueType
-/FontDescriptor 336 0 R
+/FontDescriptor 335 0 R
/FirstChar 32
/LastChar 255
-/Widths 338 0 R
-/ToUnicode 337 0 R
+/Widths 337 0 R
+/ToUnicode 336 0 R
>>
endobj
72 0 obj
@@ -8748,7 +8748,7 @@ endobj
/F2.0 16 0 R
>>
/XObject << /I2 79 0 R
-/Stamp1 292 0 R
+/Stamp1 291 0 R
>>
>>
/Annots [76 0 R 78 0 R 80 0 R]
@@ -9601,7 +9601,7 @@ endobj
/F2.0 16 0 R
>>
/XObject << /I3 83 0 R
-/Stamp1 292 0 R
+/Stamp1 291 0 R
>>
>>
/Annots [84 0 R 86 0 R 87 0 R 88 0 R 90 0 R 91 0 R 92 0 R]
@@ -9907,7 +9907,7 @@ endobj
>>
endobj
93 0 obj
-<< /Length 13089
+<< /Length 12110
>>
stream
q
@@ -10188,12 +10188,12 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-1.425 Tw
+1.216 Tw
BT
48.24 594.6860000000003 Td
/F1.0 10.5 Tf
-[<5468652064656661756c7420696d706c656d656e746174696f6e2067656e6572> 20.01953125 <6174657320726570726573656e746174696f6e73206163636f7264696e6720746f2074686520>] TJ
+[<5468652064656661756c7420696d706c656d656e746174696f6e7320756c74696d6174656c792067656e6572> 20.01953125 <61746520726570726573656e746174696f6e73206163636f7264696e6720746f2074686520>] TJ
ET
@@ -10203,27 +10203,27 @@ ET
0.259 0.545 0.792 scn
0.259 0.545 0.792 SCN
-1.425 Tw
+1.216 Tw
BT
-418.287716796875 594.6860000000003 Td
+471.8098294921875 594.6860000000003 Td
/F1.0 10.5 Tf
-<5265737466756c204f626a656374732073706563> Tj
+<5265737466756c204f626a65637473> 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
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
-1.425 Tw
+0.324 Tw
BT
-519.8270722656249 594.6860000000003 Td
+48.24 578.9060000000003 Td
/F1.0 10.5 Tf
-<2076312e302e> Tj
+<73706563> Tj
ET
@@ -10233,12 +10233,12 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-3.342 Tw
+0.324 Tw
BT
-48.24 578.9060000000003 Td
+70.19550000000001 578.9060000000003 Td
/F1.0 10.5 Tf
-<486f77657665722c20697420616c736f2064656c65676174657320746f2074686520> Tj
+<2076312e302e20486f77657665722c20697420616c736f2064656c65676174657320746f2074686520> Tj
ET
@@ -10248,10 +10248,10 @@ ET
0.694 0.129 0.275 scn
0.694 0.129 0.275 SCN
-3.342 Tw
+0.324 Tw
BT
-232.15281818181813 578.9060000000003 Td
+265.1613333333333 578.9060000000003 Td
/F5.0 10.5 Tf
<436f6e74656e744e65676f74696174696f6e53657276696365> Tj
ET
@@ -10263,12 +10263,12 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-3.342 Tw
+0.324 Tw
BT
-363.40281818181813 578.9060000000003 Td
+396.41133333333335 578.9060000000003 Td
/F1.0 10.5 Tf
-<2077686963682070726f76696465732061206d656368616e69736d20666f72> Tj
+<2077686963682070726f76696465732061206d656368616e69736d> Tj
ET
@@ -10278,45 +10278,42 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
+3.650 Tw
+
BT
48.24 563.1260000000003 Td
/F1.0 10.5 Tf
-<616c746572696e6720726570726573656e746174696f6e73206163636f7264696e6720746f20746865204854545020> Tj
+<666f7220616c746572696e6720726570726573656e746174696f6e73206163636f7264696e6720746f20746865204854545020> 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.650 Tw
+
BT
-285.3195 563.1260000000003 Td
+328.46954166666666 563.1260000000003 Td
/F5.0 10.5 Tf
<416363657074> Tj
ET
-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
-
-BT
-316.81950000000006 563.1260000000003 Td
-/F1.0 10.5 Tf
-<206865616465722e> 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
-0.616 Tw
+3.650 Tw
BT
-48.24 535.3460000000002 Td
+359.96954166666666 563.1260000000003 Td
/F1.0 10.5 Tf
-[<546865207072696e636970616c206d6f7469766174696f6e20697320746f20616c6c6f77206d6f726520666c657869626c6520726570726573656e746174696f6e7320746f2062652067656e6572> 20.01953125 <6174656420666f7220524553> 20.01953125 <5420636c69656e7473>] TJ
+<206865616465722e205468697320616c6c6f7773206d6f726520666c657869626c65> Tj
ET
@@ -10326,12 +10323,12 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-1.344 Tw
+2.856 Tw
BT
-48.24 519.5660000000003 Td
+48.24 547.3460000000003 Td
/F1.0 10.5 Tf
-[<74686174202870657268617073207468726f75676820746865697220757365206f662061206365727461696e204a617661736372697074206c696272> 20.01953125 <617279> 89.84375 <2c207361> 20.01953125 <7929206578706563742c206f72206174206c6561737420776f726b732062657374>] TJ
+[<726570726573656e746174696f6e7320746f2062652067656e6572> 20.01953125 <6174656420666f7220524553> 20.01953125 <5420636c69656e74732074686174202870657268617073207468726f75676820746865697220757365206f662061206365727461696e>] TJ
ET
@@ -10342,9 +10339,9 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24 503.7860000000003 Td
+48.24 531.5660000000003 Td
/F1.0 10.5 Tf
-<776974682c2061206365727461696e207374796c65206f6620726570726573656e746174696f6e2e> Tj
+[<4a617661736372697074206c696272> 20.01953125 <617279> 89.84375 <2c207361> 20.01953125 <7929206578706563742c206f72206174206c6561737420776f726b73206265737420776974682c2061206365727461696e207374796c65206f6620726570726573656e746174696f6e2e>] TJ
ET
0.000 0.000 0.000 SCN
@@ -10355,7 +10352,7 @@ ET
0.009 Tw
BT
-48.24 476.00600000000026 Td
+48.24 503.78600000000034 Td
/F1.0 10.5 Tf
[<496e20616c6c2074686572652061726520746872656520646f6d61696e20736572766963657320746861742063616e20696e666c75656e63652074686520726570726573656e746174696f6e732067656e6572> 20.01953125 <617465643a207468697320736572766963652c>] TJ
ET
@@ -10370,7 +10367,7 @@ ET
2.758 Tw
BT
-48.24 460.2260000000002 Td
+48.24 488.0060000000003 Td
ET
@@ -10383,7 +10380,7 @@ ET
2.758 Tw
BT
-48.24 460.2260000000002 Td
+48.24 488.0060000000003 Td
/F5.0 10.5 Tf
<436f6e74656e744e65676f74696174696f6e53657276696365> Tj
ET
@@ -10398,9 +10395,9 @@ ET
2.758 Tw
BT
-179.49 460.2260000000002 Td
+179.49 488.0060000000003 Td
/F1.0 10.5 Tf
-<616e642074686520> Tj
+<20616e642074686520> Tj
ET
@@ -10413,7 +10410,7 @@ ET
2.758 Tw
BT
-225.52499001736112 460.2260000000002 Td
+231.00223502604166 488.0060000000003 Td
/F5.0 10.5 Tf
<436f6e74656e744d617070696e6753657276696365> Tj
ET
@@ -10428,9 +10425,9 @@ ET
2.758 Tw
BT
-335.7749900173611 460.2260000000002 Td
+341.25223502604166 488.0060000000003 Td
/F1.0 10.5 Tf
-[<2e2020546865206469616772> 20.01953125 <616d2062656c6f772073686f777320686f77207468657365>] TJ
+[<2e20546865206469616772> 20.01953125 <616d2062656c6f772073686f777320686f77207468657365>] TJ
ET
@@ -10441,7 +10438,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24 444.44600000000025 Td
+48.24 472.22600000000034 Td
/F1.0 10.5 Tf
[<636f6c6c61626f72> 20.01953125 <6174653a>] TJ
ET
@@ -10451,10 +10448,10 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-0.946 Tw
+6.229 Tw
BT
-48.24 404.6660000000002 Td
+48.24 432.4460000000003 Td
/F1.0 10.5 Tf
<54686520> Tj
ET
@@ -10466,12 +10463,12 @@ ET
0.694 0.129 0.275 scn
0.694 0.129 0.275 SCN
-0.946 Tw
+6.229 Tw
BT
-70.60591167534722 404.6660000000002 Td
+75.8888125 432.4460000000003 Td
/F5.0 10.5 Tf
-<526570726573656e746174696f6e53657276696365466f725265737466756c4f626a65637473> Tj
+<526570726573656e746174696f6e53657276696365436f6e74656e744e65676f746961746f72> Tj
ET
@@ -10481,12 +10478,12 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-0.946 Tw
+6.229 Tw
BT
-270.1059116753472 404.6660000000002 Td
+275.3888125 432.4460000000003 Td
/F1.0 10.5 Tf
-[<206973207468652064656661756c7420696d706c656d656e746174696f6e206f66207468697320736572766963653b206c696b> 20.01953125 <6577697365>] TJ
+<206973207468652064656661756c7420696d706c656d656e746174696f6e206f662074686520746f702d6c6576656c> Tj
ET
@@ -10496,12 +10493,12 @@ ET
0.694 0.129 0.275 scn
0.694 0.129 0.275 SCN
-19.540 Tw
+0.567 Tw
BT
-48.24 388.8860000000002 Td
+48.24 416.6660000000003 Td
/F5.0 10.5 Tf
-<436f6e74656e744e65676f74696174696f6e5365727669636558526f446f6d61696e54797065> Tj
+<526570726573656e746174696f6e53657276696365> Tj
ET
@@ -10511,12 +10508,12 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-19.540 Tw
+0.567 Tw
BT
-247.74 388.8860000000002 Td
+158.49 416.6660000000003 Td
/F1.0 10.5 Tf
-<206973207468652064656661756c7420696d706c656d656e746174696f6e206f6620746865> Tj
+<2c20616e642069742064656c65676174657320746f206c697374206f6620696e6a656374696e6720> Tj
ET
@@ -10526,10 +10523,10 @@ ET
0.694 0.129 0.275 scn
0.694 0.129 0.275 SCN
-6.885 Tw
+0.567 Tw
BT
-48.24 373.1060000000002 Td
+338.32149999999996 416.6660000000003 Td
/F5.0 10.5 Tf
<436f6e74656e744e65676f74696174696f6e53657276696365> Tj
ET
@@ -10541,27 +10538,12 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-6.885 Tw
-
-BT
-179.49 373.1060000000002 Td
-/F1.0 10.5 Tf
-<2e2020496620796f7520696e73706563742074686520736f7572636520636f646520796f75d56c6c207365652074686174207468652064656661756c74> 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
-
-1.696 Tw
+0.567 Tw
BT
-48.24 357.32600000000025 Td
+469.57149999999996 416.6660000000003 Td
/F1.0 10.5 Tf
-[<696d706c656d656e746174696f6e206f6620746869732073657276696365d573207072696d61727920726573706f6e736962696c69747920697320746f2067656e6572> 20.01953125 <617465207468652064656661756c74205265737466756c204f626a65637473>] TJ
+<2073657276696365732e205573696e67> Tj
ET
@@ -10571,42 +10553,12 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-1.419 Tw
+1.966 Tw
BT
-48.24 341.5460000000002 Td
+48.24 400.8860000000003 Td
/F1.0 10.5 Tf
-[<726570726573656e746174696f6e732e20205468657265666f72652c20696620796f75207768617420796f752077616e7420746f20646f20697320746f2067656e6572> 20.01953125 <617465206120>] 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
-
-1.419 Tw
-
-BT
-424.8915529947916 341.5460000000002 Td
-/F4.0 10.5 Tf
-<646966666572656e74205f726570726573656e746174696f6e> 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
-
-0.398 Tw
-
-BT
-48.24 325.7660000000002 Td
-/F4.0 10.5 Tf
-[<7468656e20696e206d616e> 20.01953125 <79206361736573207265706c6163696e672065697468657220746869732073657276696365205f6f72>] TJ
+[<6120636861696e206f6620726573706f6e736962696c697479207061747465726e2c2069742072657475726e7320746865206669727374206e6f6e2d6e756c6c20726570726573656e746174696f6e2e2046> 40.0390625 <6f7220746865697220706172742c20746865>] TJ
ET
@@ -10616,12 +10568,12 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-0.398 Tw
+2.077 Tw
BT
-299.8959211237981 325.7660000000002 Td
+48.24 385.10600000000034 Td
/F1.0 10.5 Tf
-<2074686520> Tj
+<696d706c656d656e746174696f6e73206f6620> Tj
ET
@@ -10631,10 +10583,10 @@ ET
0.694 0.129 0.275 scn
0.694 0.129 0.275 SCN
-0.398 Tw
+2.077 Tw
BT
-322.10145267427885 325.7660000000002 Td
+152.8472645596591 385.10600000000034 Td
/F5.0 10.5 Tf
<436f6e74656e744e65676f74696174696f6e53657276696365> Tj
ET
@@ -10646,12 +10598,12 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-0.398 Tw
+2.077 Tw
BT
-453.35145267427885 325.7660000000002 Td
+284.0972645596591 385.10600000000034 Td
/F1.0 10.5 Tf
-<2077696c6c206265206571756976616c656e74> Tj
+[<207573652074686520485454502041> 20.01953125 <63636570742068656164657220746f2064657465726d696e652069662074686579>] TJ
ET
@@ -10662,9 +10614,9 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24 309.9860000000002 Td
+48.24 369.3260000000003 Td
/F1.0 10.5 Tf
-<28796f75d56c6c206e6f74696365207468617420746865697220535049732061726520766572792073696d696c6172292e> Tj
+[<73686f756c642072656e64657220616e> 20.01953125 <7920726570726573656e746174696f6e206f72206a7573742072657475726e206e756c6c2e>] TJ
ET
0.000 0.000 0.000 SCN
@@ -10673,7 +10625,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24 275.48600000000016 Td
+48.24 334.8260000000003 Td
/F2.0 13 Tf
<322e322e312e20535049> Tj
ET
@@ -10684,7 +10636,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24 248.92600000000016 Td
+48.24 308.2660000000003 Td
/F1.0 10.5 Tf
[<5468652053504920646566696e65642062> 20.01953125 <79207468697320736572766963652069733a>] TJ
ET
@@ -10724,12 +10676,11 @@ endobj
/Font << /F2.0 16 0 R
/F1.0 8 0 R
/F5.0 40 0 R
-/F4.0 39 0 R
>>
-/XObject << /Stamp1 292 0 R
+/XObject << /Stamp1 291 0 R
>>
>>
-/Annots [96 0 R 97 0 R 99 0 R 100 0 R 101 0 R 102 0 R 103 0 R]
+/Annots [96 0 R 97 0 R 99 0 R 100 0 R 101 0 R 102 0 R 103 0 R 104 0 R]
>>
endobj
95 0 obj
@@ -10778,7 +10729,7 @@ endobj
/URI (http://restfulobjects.org)
>>
/Subtype /Link
-/Rect [418.287716796875 591.6200000000002 519.8270722656249 605.9000000000003]
+/Rect [471.8098294921875 591.6200000000002 547.04 605.9000000000003]
/Type /Annot
>>
endobj
@@ -10786,10 +10737,10 @@ endobj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
-/URI (../rgfis/rgfis.pdf#_rgfis_presentation-layer_ContentNegotiationService)
+/URI (http://restfulobjects.org)
>>
/Subtype /Link
-/Rect [232.15281818181813 577.4360000000003 363.40281818181813 587.9360000000003]
+/Rect [48.24 575.8400000000003 70.19550000000001 590.1200000000003]
/Type /Annot
>>
endobj
@@ -10800,7 +10751,7 @@ endobj
/URI (../rgfis/rgfis.pdf#_rgfis_presentation-layer_ContentNegotiationService)
>>
/Subtype /Link
-/Rect [48.24 458.7560000000002 179.49 469.2560000000002]
+/Rect [265.1613333333333 577.4360000000003 396.41133333333335 587.9360000000003]
/Type /Annot
>>
endobj
@@ -10808,18 +10759,29 @@ endobj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
-/URI (../rgsvc/rgsvc.pdf#_rgsvc_presentation-layer-spi_ContentMappingService)
+/URI (../rgfis/rgfis.pdf#_rgfis_presentation-layer_ContentNegotiationService)
>>
/Subtype /Link
-/Rect [225.52499001736112 458.7560000000002 335.7749900173611 469.2560000000002]
+/Rect [48.24 486.5360000000003 179.49 497.0360000000003]
/Type /Annot
>>
endobj
104 0 obj
-[94 0 R /XYZ 0 294.1700000000002 null]
+<< /Border [0 0 0]
+/A << /Type /Action
+/S /URI
+/URI (../rgsvc/rgsvc.pdf#_rgsvc_presentation-layer-spi_ContentMappingService)
+>>
+/Subtype /Link
+/Rect [231.00223502604166 486.5360000000003 341.25223502604166 497.0360000000003]
+/Type /Annot
+>>
endobj
105 0 obj
-<< /Length 30025
+[94 0 R /XYZ 0 353.51000000000033 null]
+endobj
+106 0 obj
+<< /Length 29646
>>
stream
q
@@ -12389,7 +12351,7 @@ ET
BT
64.809 426.9059999999999 Td
/F1.0 10.5 Tf
-[<726570726573656e746174696f6e206f6620612073696e676c65206f626a6563742c206173207065722073656374696f6e2031342e34206f66207468652052> 20.01953125 <4f20737065632c2076312e30>] TJ
+[<726570726573656e746174696f6e206f6620612073696e676c65206f626a6563742c206567206173207065722073656374696f6e2031342e34206f66207468652052> 20.01953125 <4f20737065632c2076312e30>] TJ
ET
0.000 0.000 0.000 SCN
@@ -12411,7 +12373,7 @@ ET
BT
64.809 405.1259999999999 Td
/F1.0 10.5 Tf
-[<726570726573656e746174696f6e206f6620612073696e676c652070726f7065727479206f6620616e206f626a6563742c206173207065722073656374696f6e2031362e34206f66207468652052> 20.01953125 <4f20737065632076312e30>] TJ
+[<726570726573656e746174696f6e206f6620612073696e676c652070726f7065727479206f6620616e206f626a6563742c206567206173207065722073656374696f6e2031362e34206f66207468652052> 20.01953125 <4f20737065632076312e30>] TJ
ET
0.000 0.000 0.000 SCN
@@ -12433,7 +12395,7 @@ ET
BT
64.809 383.34599999999995 Td
/F1.0 10.5 Tf
-[<726570726573656e746174696f6e206f6620612073696e676c6520636f6c6c656374696f6e206f6620616e206f626a6563742c206173207065722073656374696f6e2031372e35206f66207468652052> 20.01953125 <4f20737065632076312e30>] TJ
+[<726570726573656e746174696f6e206f6620612073696e676c6520636f6c6c656374696f6e206f6620616e206f626a6563742c206567206173207065722073656374696f6e2031372e35206f66207468652052> 20.01953125 <4f20737065632076312e30>] TJ
ET
0.000 0.000 0.000 SCN
@@ -12455,7 +12417,7 @@ ET
BT
64.809 361.566 Td
/F1.0 10.5 Tf
-[<726570726573656e746174696f6e206f6620612073696e676c6520616374696f6e202870726f6d707429206f6620616e206f626a6563742c206173207065722073656374696f6e2031382e32206f66207468652052> 20.01953125 <4f20737065632076312e30>] TJ
+[<726570726573656e746174696f6e206f6620612073696e676c6520616374696f6e202870726f6d707429206f6620616e206f626a6563742c206567206173207065722073656374696f6e2031382e32206f66207468652052> 20.01953125 <4f20737065632076312e30>] TJ
ET
0.000 0.000 0.000 SCN
@@ -12474,10 +12436,25 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
+0.792 Tw
+
BT
64.809 339.786 Td
/F1.0 10.5 Tf
-[<726570726573656e746174696f6e206f662074686520726573756c7473206f6620612073696e676c6520616374696f6e20696e766f636174696f6e2c206173207065722073656374696f6e2031392e35206f66207468652052> 20.01953125 <4f20737065632076312e30>] TJ
+[<726570726573656e746174696f6e206f662074686520726573756c7473206f6620612073696e676c6520616374696f6e20696e766f636174696f6e2c206567206173207065722073656374696f6e2031392e35206f66207468652052> 20.01953125 <4f2073706563>] 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
+
+BT
+64.809 324.006 Td
+/F1.0 10.5 Tf
+<76312e30> Tj
ET
0.000 0.000 0.000 SCN
@@ -12486,7 +12463,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.239999999999995 312.00600000000003 Td
+48.239999999999995 296.226 Td
/F1.0 10.5 Tf
<5468657365206d6574686f64732070726f766964653a> Tj
ET
@@ -12499,7 +12476,7 @@ ET
0.200 0.200 0.200 SCN
BT
-56.8805 284.22600000000006 Td
+56.8805 268.44599999999997 Td
/F1.0 10.5 Tf
<a5> Tj
ET
@@ -12514,7 +12491,7 @@ ET
0.642 Tw
BT
-66.24 284.22600000000006 Td
+66.24 268.44599999999997 Td
/F1.0 10.5 Tf
<6120> Tj
ET
@@ -12529,7 +12506,7 @@ ET
0.642 Tw
BT
-75.50240909090908 284.22600000000006 Td
+75.50240909090908 268.44599999999997 Td
/F5.0 10.5 Tf
<52656e6465726572436f6e74657874> Tj
ET
@@ -12544,7 +12521,7 @@ ET
0.642 Tw
BT
-154.25240909090908 284.22600000000006 Td
+154.25240909090908 268.44599999999997 Td
/F1.0 10.5 Tf
<2077686963682070726f76696465732061636365737320746f20726571756573742d737065636966696320636f6e746578742028656720485454502068656164657273292c2073657373696f6e2d> Tj
ET
@@ -12557,7 +12534,7 @@ ET
0.200 0.200 0.200 SCN
BT
-66.24 268.446 Td
+66.24 252.66599999999997 Td
/F1.0 10.5 Tf
[<737065636966696320636f6e74657874202865672061757468656e7469636174696f6e2920616e6420676c6f62616c20636f6e746578742028656720636f6e6669677572> 20.01953125 <6174696f6e2073657474696e677329>] TJ
ET
@@ -12570,7 +12547,7 @@ ET
0.200 0.200 0.200 SCN
BT
-56.8805 246.66600000000005 Td
+56.8805 230.88599999999997 Td
/F1.0 10.5 Tf
<a5> Tj
ET
@@ -12583,7 +12560,7 @@ ET
0.200 0.200 0.200 SCN
BT
-66.24 246.66600000000005 Td
+66.24 230.88599999999997 Td
/F1.0 10.5 Tf
<616e206f626a65637420726570726573656e74696e672074686520696e666f726d6174696f6e20746f2062652072656e6465726564> Tj
ET
@@ -12594,7 +12571,7 @@ ET
0.200 0.200 0.200 SCN
BT
-66.24 218.88600000000005 Td
+66.24 203.10599999999997 Td
/F1.0 10.5 Tf
<656720> Tj
ET
@@ -12605,7 +12582,7 @@ ET
0.694 0.129 0.275 SCN
BT
-80.226 218.88600000000005 Td
+80.226 203.10599999999997 Td
/F5.0 10.5 Tf
<4f626a65637441646170746572> Tj
ET
@@ -12616,7 +12593,7 @@ ET
0.200 0.200 0.200 SCN
BT
-148.476 218.88600000000005 Td
+148.476 203.10599999999997 Td
/F1.0 10.5 Tf
<2c20> Tj
ET
@@ -12627,7 +12604,7 @@ ET
0.694 0.129 0.275 SCN
BT
-153.82049999999998 218.88600000000005 Td
+153.82049999999998 203.10599999999997 Td
/F5.0 10.5 Tf
<4f626a656374416e6450726f7065727479> Tj
ET
@@ -12638,7 +12615,7 @@ ET
0.200 0.200 0.200 SCN
BT
-243.07049999999998 218.88600000000005 Td
+243.07049999999998 203.10599999999997 Td
/F1.0 10.5 Tf
<2c20> Tj
ET
@@ -12649,7 +12626,7 @@ ET
0.694 0.129 0.275 SCN
BT
-248.41500000000002 218.88600000000005 Td
+248.41500000000002 203.10599999999997 Td
/F5.0 10.5 Tf
<4f626a656374416e64436f6c6c656374696f6e> Tj
ET
@@ -12660,7 +12637,7 @@ ET
0.200 0.200 0.200 SCN
BT
-348.165 218.88600000000005 Td
+348.165 203.10599999999997 Td
/F1.0 10.5 Tf
<20657463> Tj
ET
@@ -12673,7 +12650,7 @@ ET
0.200 0.200 0.200 SCN
BT
-56.8805 191.10600000000005 Td
+56.8805 175.32599999999996 Td
/F1.0 10.5 Tf
<a5> Tj
ET
@@ -12686,7 +12663,7 @@ ET
0.200 0.200 0.200 SCN
BT
-66.24 191.10600000000005 Td
+66.24 175.32599999999996 Td
/F1.0 10.5 Tf
<666f72206d656d626572732c20776865746865722074686520726570726573656e746174696f6e20697320696e20726561642f7772697465206d6f6465> Tj
ET
@@ -12697,7 +12674,7 @@ ET
0.200 0.200 0.200 SCN
BT
-66.24 163.32600000000005 Td
+66.24 147.54599999999996 Td
/F1.0 10.5 Tf
<696520> Tj
ET
@@ -12708,7 +12685,7 @@ ET
0.694 0.129 0.275 SCN
BT
-77.92649999999999 163.32600000000005 Td
+77.92649999999999 147.54599999999996 Td
/F5.0 10.5 Tf
<4d656d626572526570724d6f6465> Tj
ET
@@ -12719,7 +12696,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.239999999999995 122.82600000000004 Td
+48.239999999999995 107.04599999999996 Td
/F2.0 13 Tf
<322e322e322e20496d706c656d656e746174696f6e> Tj
ET
@@ -12732,7 +12709,7 @@ ET
7.977 Tw
BT
-48.239999999999995 96.26600000000003 Td
+48.239999999999995 80.48599999999998 Td
/F1.0 10.5 Tf
[<41732064697363757373656420696e2074686520696e74726f64756374696f6e2c20746865206672> 20.01953125 <616d65776f726b2070726f766964657320612064656661756c7420696d706c656d656e746174696f6e2c>] TJ
ET
@@ -12744,10 +12721,10 @@ ET
0.694 0.129 0.275 scn
0.694 0.129 0.275 SCN
-10.676 Tw
+19.606 Tw
BT
-48.239999999999995 80.48600000000003 Td
+48.239999999999995 64.70599999999997 Td
/F5.0 10.5 Tf
<6f2e612e692e762e726f2e72656e646572696e672e736572766963652e526570726573656e746174696f6e53657276696365436f6e74656e744e65676f746961746f72> Tj
ET
@@ -12759,42 +12736,12 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-10.676 Tw
-
-BT
-399.99 80.48600000000003 Td
-/F1.0 10.5 Tf
-<2e202020546869732064656c65676174657320746f> 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
-
-0.368 Tw
-
-BT
-48.239999999999995 64.70600000000003 Td
-/F5.0 10.5 Tf
-<436f6e74656e744e65676f74696174696f6e53657276696365> 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
-
-0.368 Tw
+19.606 Tw
BT
-179.49 64.70600000000003 Td
+399.99 64.70599999999997 Td
/F1.0 10.5 Tf
-[<20746f2067656e6572> 20.01953125 <61746520616e20616c7465726e617469766520726570726573656e746174696f6e3b20627574206966206e6f6e652069732070726f7669646564207468656e206974>] TJ
+<2e20546869732064656c65676174657320746f> Tj
ET
@@ -12825,49 +12772,67 @@ Q
endstream
endobj
-106 0 obj
+107 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 105 0 R
+/Contents 106 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/Font << /F5.0 40 0 R
/F5.1 67 0 R
/F1.0 8 0 R
/F2.0 16 0 R
>>
-/XObject << /Stamp1 292 0 R
+/XObject << /Stamp1 291 0 R
>>
>>
-/Annots [108 0 R]
>>
endobj
-107 0 obj
-[106 0 R /XYZ 0 141.51000000000005 null]
-endobj
108 0 obj
-<< /Border [0 0 0]
-/A << /Type /Action
-/S /URI
-/URI (../rgfis/rgfis.pdf#_rgfis_presentation-layer_ContentNegotiationService)
->>
-/Subtype /Link
-/Rect [48.239999999999995 63.23600000000003 179.49 73.73600000000003]
-/Type /Annot
->>
+[107 0 R /XYZ 0 125.72999999999996 null]
endobj
109 0 obj
-<< /Length 6264
+<< /Length 6778
>>
stream
q
/DeviceRGB cs
-0.200 0.200 0.200 scn
+0.694 0.129 0.275 scn
/DeviceRGB CS
-0.200 0.200 0.200 SCN
+0.694 0.129 0.275 SCN
+
+0.368 Tw
BT
48.24 794.6759999999999 Td
+/F5.0 10.5 Tf
+<436f6e74656e744e65676f74696174696f6e53657276696365> 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
+
+0.368 Tw
+
+BT
+179.49 794.6759999999999 Td
+/F1.0 10.5 Tf
+[<20746f2067656e6572> 20.01953125 <61746520616e20616c7465726e617469766520726570726573656e746174696f6e3b20627574206966206e6f6e652069732070726f7669646564207468656e206974>] 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
+
+BT
+48.24 778.896 Td
/F1.0 10.5 Tf
[<66616c6c73206261636b206f6e2067656e6572> 20.01953125 <6174696e672074686520726570726573656e746174696f6e7320617320646566696e656420696e2074686520>] TJ
ET
@@ -12878,7 +12843,7 @@ ET
0.259 0.545 0.792 SCN
BT
-356.383294921875 794.6759999999999 Td
+356.383294921875 778.896 Td
/F1.0 10.5 Tf
<5265737466756c204f626a656374732073706563> Tj
ET
@@ -12889,7 +12854,7 @@ ET
0.200 0.200 0.200 SCN
BT
-455.072794921875 794.6759999999999 Td
+455.072794921875 778.896 Td
/F1.0 10.5 Tf
<2076312e302e> Tj
ET
@@ -12902,7 +12867,7 @@ ET
1.712 Tw
BT
-48.24 766.896 Td
+48.24 751.116 Td
/F1.0 10.5 Tf
[<54> 29.78515625 <6f2075736520616e20616c7465726e617469766520696d706c656d656e746174696f6e2c2075736520>] TJ
ET
@@ -12917,7 +12882,7 @@ ET
1.712 Tw
BT
-271.49670234375 766.896 Td
+271.49670234375 751.116 Td
/F5.0 10.5 Tf
<40446f6d61696e536572766963654c61796f7574236d656e754f726465722829> Tj
ET
@@ -12932,7 +12897,7 @@ ET
1.712 Tw
BT
-439.49670234375003 766.896 Td
+439.49670234375003 751.116 Td
/F1.0 10.5 Tf
<20286173206578706c61696e656420696e20746865> Tj
ET
@@ -12945,7 +12910,7 @@ ET
0.259 0.545 0.792 SCN
BT
-48.24 751.116 Td
+48.24 735.336 Td
/F1.0 10.5 Tf
<696e74726f64756374696f6e> Tj
ET
@@ -12956,7 +12921,7 @@ ET
0.200 0.200 0.200 SCN
BT
-111.19800000000001 751.116 Td
+111.19800000000001 735.336 Td
/F1.0 10.5 Tf
<20746f2074686973206775696465292e> Tj
ET
@@ -12967,7 +12932,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24 716.6160000000001 Td
+48.24 700.8360000000001 Td
/F2.0 13 Tf
<322e322e332e205265676973746572696e6720746865205365727669636573> Tj
ET
@@ -12980,7 +12945,7 @@ ET
1.855 Tw
BT
-48.24 690.0560000000002 Td
+48.24 674.2760000000002 Td
/F1.0 10.5 Tf
<417373756d696e6720746861742074686520> Tj
ET
@@ -12995,7 +12960,7 @@ ET
1.855 Tw
BT
-147.09779999999998 690.0560000000002 Td
+147.09779999999998 674.2760000000002 Td
/F5.0 10.5 Tf
<636f6e66696775726174696f6e2d616e642d616e6e6f746174696f6e> Tj
ET
@@ -13010,7 +12975,7 @@ ET
1.855 Tw
BT
-294.0978 690.0560000000002 Td
+294.0978 674.2760000000002 Td
/F1.0 10.5 Tf
<20736572766963657320696e7374616c6c657220697320636f6e666967757265642028696d706c69636974206966207573696e67> Tj
ET
@@ -13025,7 +12990,7 @@ ET
8.605 Tw
BT
-48.24 674.2760000000002 Td
+48.24 658.4960000000002 Td
/F1.0 10.5 Tf
<74686520> Tj
ET
@@ -13040,7 +13005,7 @@ ET
8.605 Tw
BT
-75.5350186434659 674.2760000000002 Td
+75.5350186434659 658.4960000000002 Td
/F5.0 10.5 Tf
<4170704d616e6966657374> Tj
ET
@@ -13055,7 +13020,7 @@ ET
8.605 Tw
BT
-133.28501864346592 674.2760000000002 Td
+133.28501864346592 658.4960000000002 Td
/F1.0 10.5 Tf
<20746f20> Tj
ET
@@ -13070,7 +13035,7 @@ ET
8.605 Tw
BT
-165.6885559303977 674.2760000000002 Td
+165.6885559303977 658.4960000000002 Td
/F1.0 10.5 Tf
[<626f6f74737472> 20.01953125 <61702074686520617070>] TJ
ET
@@ -13085,7 +13050,7 @@ ET
8.605 Tw
BT
-270.83588813920454 674.2760000000002 Td
+270.83588813920454 658.4960000000002 Td
/F1.0 10.5 Tf
<29207468656e204170616368652049736973272064656661756c7420696d706c656d656e746174696f6e206f66> Tj
ET
@@ -13100,7 +13065,7 @@ ET
4.722 Tw
BT
-48.24 658.4960000000002 Td
+48.24 642.7160000000002 Td
/F5.0 10.5 Tf
<526570726573656e746174696f6e53657276696365> Tj
ET
@@ -13115,7 +13080,7 @@ ET
4.722 Tw
BT
-158.49 658.4960000000002 Td
+158.49 642.7160000000002 Td
/F1.0 10.5 Tf
<2073657276696365206973206175746f6d61746963616c6c79207265676973746572656420616e6420696e6a65637465642028697420697320616e6e6f74617465642077697468> Tj
ET
@@ -13128,7 +13093,7 @@ ET
0.694 0.129 0.275 SCN
BT
-48.24 642.7160000000002 Td
+48.24 626.9360000000003 Td
/F5.0 10.5 Tf
<40446f6d61696e53657276696365> Tj
ET
@@ -13139,7 +13104,7 @@ ET
0.200 0.200 0.200 SCN
BT
-121.74000000000001 642.7160000000002 Td
+121.74000000000001 626.9360000000003 Td
/F1.0 10.5 Tf
[<2920736f206e6f206675727468657220636f6e6669677572> 20.01953125 <6174696f6e2069732072657175697265642e>] TJ
ET
@@ -13150,7 +13115,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24 608.2160000000002 Td
+48.24 592.4360000000003 Td
/F2.0 13 Tf
<322e322e342e2052656c61746564205365727669636573> Tj
ET
@@ -13163,7 +13128,7 @@ ET
0.564 Tw
BT
-48.24 581.6560000000003 Td
+48.24 565.8760000000003 Td
/F1.0 10.5 Tf
<5468652064656661756c7420696d706c656d656e746174696f6e2064656c65676174657320746f20> Tj
ET
@@ -13178,7 +13143,7 @@ ET
0.564 Tw
BT
-255.4218125 581.6560000000003 Td
+255.4218125 565.8760000000003 Td
/F5.0 10.5 Tf
<436f6e74656e744e65676f74696174696f6e53657276696365> Tj
ET
@@ -13193,7 +13158,7 @@ ET
0.564 Tw
BT
-386.6718125 581.6560000000003 Td
+386.6718125 565.8760000000003 Td
/F1.0 10.5 Tf
<2c2077686f73652064656661756c7420696d706c656d656e746174696f6e> Tj
ET
@@ -13206,7 +13171,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24 565.8760000000003 Td
+48.24 550.0960000000003 Td
/F1.0 10.5 Tf
[<6d61> 20.01953125 <792064656c656761746520696e207475726e20746f20>] TJ
ET
@@ -13217,7 +13182,7 @@ ET
0.694 0.129 0.275 SCN
BT
-167.099794921875 565.8760000000003 Td
+167.099794921875 550.0960000000003 Td
/F5.0 10.5 Tf
<436f6e74656e744d617070696e6753657276696365> Tj
ET
@@ -13228,7 +13193,7 @@ ET
0.200 0.200 0.200 SCN
BT
-277.349794921875 565.8760000000003 Td
+277.349794921875 550.0960000000003 Td
/F1.0 10.5 Tf
<202869662070726573656e74292e> Tj
ET
@@ -13265,24 +13230,24 @@ endobj
/MediaBox [0 0 595.28 841.89]
/Contents 109 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F1.0 8 0 R
-/F5.0 40 0 R
+/Font << /F5.0 40 0 R
+/F1.0 8 0 R
/F2.0 16 0 R
>>
-/XObject << /Stamp1 292 0 R
+/XObject << /Stamp1 291 0 R
>>
>>
-/Annots [111 0 R 112 0 R 113 0 R 115 0 R 117 0 R 118 0 R]
+/Annots [111 0 R 112 0 R 113 0 R 114 0 R 116 0 R 118 0 R 119 0 R]
>>
endobj
111 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
-/URI (http://restfulobjects.org)
+/URI (../rgfis/rgfis.pdf#_rgfis_presentation-layer_ContentNegotiationService)
>>
/Subtype /Link
-/Rect [356.383294921875 791.6099999999999 455.072794921875 805.89]
+/Rect [48.24 793.2059999999999 179.49 803.7059999999999]
/Type /Annot
>>
endobj
@@ -13290,10 +13255,10 @@ endobj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
-/URI (../rgant/rgant.pdf#_rgant-DomainServiceLayout_menuOrder)
+/URI (http://restfulobjects.org)
>>
/Subtype /Link
-/Rect [271.49670234375 765.4259999999999 439.49670234375003 775.9259999999999]
+/Rect [356.383294921875 775.8299999999999 455.072794921875 790.11]
/Type /Annot
>>
endobj
@@ -13301,53 +13266,64 @@ endobj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
-/URI (../rgsvc/rgsvc.pdf#__rgsvc_intro_overriding-the-services)
+/URI (../rgant/rgant.pdf#_rgant-DomainServiceLayout_menuOrder)
>>
/Subtype /Link
-/Rect [48.24 748.05 111.19800000000001 762.33]
+/Rect [271.49670234375 749.646 439.49670234375003 760.146]
/Type /Annot
>>
endobj
114 0 obj
-[110 0 R /XYZ 0 735.3000000000001 null]
+<< /Border [0 0 0]
+/A << /Type /Action
+/S /URI
+/URI (../rgsvc/rgsvc.pdf#__rgsvc_intro_overriding-the-services)
+>>
+/Subtype /Link
+/Rect [48.24 732.27 111.19800000000001 746.5500000000001]
+/Type /Annot
+>>
endobj
115 0 obj
+[110 0 R /XYZ 0 719.5200000000001 null]
+endobj
+116 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
/URI (../rgcms/rgcms.pdf#_rgcms_classes_AppManifest-bootstrapping)
>>
/Subtype /Link
-/Rect [165.6885559303977 671.2100000000002 270.83588813920454 685.4900000000002]
+/Rect [165.6885559303977 655.4300000000002 270.83588813920454 669.7100000000003]
/Type /Annot
>>
endobj
-116 0 obj
-[110 0 R /XYZ 0 626.9000000000002 null]
-endobj
117 0 obj
+[110 0 R /XYZ 0 611.1200000000002 null]
+endobj
+118 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
/URI (../rgfis/rgfis.pdf#_rgfis_presentation-layer_ContentNegotiationService)
>>
/Subtype /Link
-/Rect [255.4218125 580.1860000000003 386.6718125 590.6860000000003]
+/Rect [255.4218125 564.4060000000003 386.6718125 574.9060000000003]
/Type /Annot
>>
endobj
-118 0 obj
+119 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
/URI (../rgsvc/rgsvc.pdf#_rgsvc_presentation-layer-spi_ContentMappingService)
>>
/Subtype /Link
-/Rect [167.099794921875 564.4060000000003 277.349794921875 574.9060000000003]
+/Rect [167.099794921875 548.6260000000003 277.349794921875 559.1260000000003]
/Type /Annot
>>
endobj
-119 0 obj
+120 0 obj
<< /Length 21579
>>
stream
@@ -14832,27 +14808,27 @@ Q
endstream
endobj
-120 0 obj
+121 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 119 0 R
+/Contents 120 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/Font << /F2.0 16 0 R
/F1.0 8 0 R
/F4.0 39 0 R
/F5.0 40 0 R
>>
-/XObject << /Stamp1 292 0 R
+/XObject << /Stamp1 291 0 R
>>
>>
-/Annots [122 0 R 123 0 R 124 0 R 125 0 R 126 0 R 127 0 R 128 0 R 129 0 R 130 0 R 131 0 R 132 0 R 133 0 R 134 0 R 135 0 R 136 0 R 137 0 R 138 0 R 139 0 R]
+/Annots [123 0 R 124 0 R 125 0 R 126 0 R 127 0 R 128 0 R 129 0 R 130 0 R 131 0 R 132 0 R 133 0 R 134 0 R 135 0 R 136 0 R 137 0 R 138 0 R 139 0 R 140 0 R]
>>
endobj
-121 0 obj
-[120 0 R /XYZ 0 841.89 null]
-endobj
122 0 obj
+[121 0 R /XYZ 0 841.89 null]
+endobj
+123 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -14863,7 +14839,7 @@ endobj
/Type /Annot
>>
endobj
-123 0 obj
+124 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -14874,7 +14850,7 @@ endobj
/Type /Annot
>>
endobj
-124 0 obj
+125 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -14885,7 +14861,7 @@ endobj
/Type /Annot
>>
endobj
-125 0 obj
+126 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -14896,7 +14872,7 @@ endobj
/Type /Annot
>>
endobj
-126 0 obj
+127 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -14907,7 +14883,7 @@ endobj
/Type /Annot
>>
endobj
-127 0 obj
+128 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -14918,7 +14894,7 @@ endobj
/Type /Annot
>>
endobj
-128 0 obj
+129 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -14929,7 +14905,7 @@ endobj
/Type /Annot
>>
endobj
-129 0 obj
+130 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -14940,7 +14916,7 @@ endobj
/Type /Annot
>>
endobj
-130 0 obj
+131 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -14951,7 +14927,7 @@ endobj
/Type /Annot
>>
endobj
-131 0 obj
+132 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -14962,7 +14938,7 @@ endobj
/Type /Annot
>>
endobj
-132 0 obj
+133 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -14973,7 +14949,7 @@ endobj
/Type /Annot
>>
endobj
-133 0 obj
+134 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -14984,7 +14960,7 @@ endobj
/Type /Annot
>>
endobj
-134 0 obj
+135 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -14995,7 +14971,7 @@ endobj
/Type /Annot
>>
endobj
-135 0 obj
+136 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -15006,7 +14982,7 @@ endobj
/Type /Annot
>>
endobj
-136 0 obj
+137 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -15017,7 +14993,7 @@ endobj
/Type /Annot
>>
endobj
-137 0 obj
+138 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -15028,7 +15004,7 @@ endobj
/Type /Annot
>>
endobj
-138 0 obj
+139 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -15039,7 +15015,7 @@ endobj
/Type /Annot
>>
endobj
-139 0 obj
+140 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -15050,7 +15026,7 @@ endobj
/Type /Annot
>>
endobj
-140 0 obj
+141 0 obj
<< /Length 13767
>>
stream
@@ -15948,29 +15924,29 @@ Q
endstream
endobj
-141 0 obj
+142 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 140 0 R
+/Contents 141 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/Font << /F2.0 16 0 R
/F5.0 40 0 R
/F1.0 8 0 R
>>
-/XObject << /Stamp1 292 0 R
+/XObject << /Stamp1 291 0 R
>>
>>
-/Annots [144 0 R 146 0 R 147 0 R 148 0 R]
+/Annots [145 0 R 147 0 R 148 0 R 149 0 R]
>>
endobj
-142 0 obj
-[141 0 R /XYZ 0 841.89 null]
-endobj
143 0 obj
-[141 0 R /XYZ 0 711.27 null]
+[142 0 R /XYZ 0 841.89 null]
endobj
144 0 obj
+[142 0 R /XYZ 0 711.27 null]
+endobj
+145 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -15981,10 +15957,10 @@ endobj
/Type /Annot
>>
endobj
-145 0 obj
-[141 0 R /XYZ 0 420.3500000000001 null]
-endobj
146 0 obj
+[142 0 R /XYZ 0 420.3500000000001 null]
+endobj
+147 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -15995,7 +15971,7 @@ endobj
/Type /Annot
>>
endobj
-147 0 obj
+148 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -16006,7 +15982,7 @@ endobj
/Type /Annot
>>
endobj
-148 0 obj
+149 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -16017,10 +15993,10 @@ endobj
/Type /Annot
>>
endobj
-149 0 obj
-[141 0 R /XYZ 0 305.15000000000003 null]
-endobj
150 0 obj
+[142 0 R /XYZ 0 305.15000000000003 null]
+endobj
+151 0 obj
<< /Length 32239
>>
stream
@@ -18206,11 +18182,11 @@ Q
endstream
endobj
-151 0 obj
+152 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 150 0 R
+/Contents 151 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/Font << /F5.0 40 0 R
/F5.1 67 0 R
@@ -18218,13 +18194,13 @@ endobj
/F4.0 39 0 R
/F2.0 16 0 R
>>
-/XObject << /Stamp1 292 0 R
+/XObject << /Stamp1 291 0 R
>>
>>
-/Annots [152 0 R 153 0 R 154 0 R 158 0 R 159 0 R 161 0 R 162 0 R]
+/Annots [153 0 R 154 0 R 155 0 R 159 0 R 160 0 R 162 0 R 163 0 R]
>>
endobj
-152 0 obj
+153 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -18235,7 +18211,7 @@ endobj
/Type /Annot
>>
endobj
-153 0 obj
+154 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -18246,7 +18222,7 @@ endobj
/Type /Annot
>>
endobj
-154 0 obj
+155 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -18257,20 +18233,20 @@ endobj
/Type /Annot
>>
endobj
-155 0 obj
-[151 0 R /XYZ 0 281.2099999999999 null]
-endobj
156 0 obj
+[152 0 R /XYZ 0 281.2099999999999 null]
+endobj
+157 0 obj
<< /Limits [(__rgfis) (implementation-2)]
-/Names [(__rgfis) 13 0 R (_rgfis_application-layer) 121 0 R (_rgfis_application-layer_AuthenticationSessionProvider) 142 0 R (_rgfis_application-layer_CommandDtoServiceInternal) 145 0 R (_rgfis_application-layer_InteractionDtoServiceInternal) 160 0 R (_rgfis_persistence-layer) 172 0 R (_rgfis_persistence-layer_AuditingServiceInternal) 197 0 R (_rgfis_persistence-layer_ChangedObjectsServiceInternal) 210 0 R (_rgfis_persistence-layer_PersistenceSessionServiceInternal) 226 0 R (_rgfis_persistence-layer_PublishingServiceInternal) 233 0 R (_rgfis_presentation-layer) 37 0 R (_rgfis_presentation-layer_ContentNegotiationService) 53 0 R (_rgfis_presentation-layer_RepresentationService) 98 0 R (configuration) 85 0 R (implementation) 68 0 R (implementation-2) 107 0 R]
+/Names [(__rgfis) 13 0 R (_rgfis_application-layer) 122 0 R (_rgfis_application-layer_AuthenticationSessionProvider) 143 0 R (_rgfis_application-layer_CommandDtoServiceInternal) 146 0 R (_rgfis_application-layer_InteractionDtoServiceInternal) 161 0 R (_rgfis_persistence-layer) 173 0 R (_rgfis_persistence-layer_AuditingServiceInternal) 198 0 R (_rgfis_persistence-layer_ChangedObjectsServiceInternal) 211 0 R (_rgfis_persistence-layer_PersistenceSessionServiceInternal) 227 0 R (_rgfis_persistence-layer_PublishingServiceInternal) 234 0 R (_rgfis_presentation-layer) 37 0 R (_rgfis_presentation-layer_ContentNegotiationService) 53 0 R (_rgfis_presentation-layer_RepresentationService) 98 0 R (configuration) 85 0 R (implementation) 68 0 R (implementation-2) 108 0 R]
>>
endobj
-157 0 obj
+158 0 obj
<< /Limits [(other-guides) (related-services-3)]
-/Names [(other-guides) 19 0 R (registering-the-service) 205 0 R (registering-the-service-2) 219 0 R (registering-the-service-3) 247 0 R (registering-the-services) 89 0 R (registering-the-services-2) 114 0 R (related-classes) 207 0 R (related-classes-2) 221 0 R (related-classes-3) 249 0 R (related-services) 95 0 R (related-services-2) 116 0 R (related-services-3) 155 0 R]
+/Names [(other-guides) 19 0 R (registering-the-service) 206 0 R (registering-the-service-2) 220 0 R (registering-the-service-3) 247 0 R (registering-the-services) 89 0 R (registering-the-services-2) 115 0 R (related-classes) 208 0 R (related-classes-2) 222 0 R (related-classes-3) 249 0 R (related-services) 95 0 R (related-services-2) 117 0 R (related-services-3) 156 0 R]
>>
endobj
-158 0 obj
+159 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -18281,7 +18257,7 @@ endobj
/Type /Annot
>>
endobj
-159 0 obj
+160 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -18292,10 +18268,10 @@ endobj
/Type /Annot
>>
endobj
-160 0 obj
-[151 0 R /XYZ 0 204.3699999999999 null]
-endobj
161 0 obj
+[152 0 R /XYZ 0 204.3699999999999 null]
+endobj
+162 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -18306,7 +18282,7 @@ endobj
/Type /Annot
>>
endobj
-162 0 obj
+163 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -18317,7 +18293,7 @@ endobj
/Type /Annot
>>
endobj
-163 0 obj
+164 0 obj
<< /Length 18672
>>
stream
@@ -19540,27 +19516,27 @@ Q
endstream
endobj
-164 0 obj
+165 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 163 0 R
+/Contents 164 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/Font << /F2.0 16 0 R
/F1.0 8 0 R
/F5.0 40 0 R
/F5.1 67 0 R
>>
-/XObject << /Stamp1 292 0 R
+/XObject << /Stamp1 291 0 R
>>
>>
-/Annots [166 0 R 168 0 R 169 0 R]
+/Annots [167 0 R 169 0 R 170 0 R]
>>
endobj
-165 0 obj
-[164 0 R /XYZ 0 841.89 null]
-endobj
166 0 obj
+[165 0 R /XYZ 0 841.89 null]
+endobj
+167 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -19571,10 +19547,10 @@ endobj
/Type /Annot
>>
endobj
-167 0 obj
-[164 0 R /XYZ 0 368.8100000000001 null]
-endobj
168 0 obj
+[165 0 R /XYZ 0 368.8100000000001 null]
+endobj
+169 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -19585,7 +19561,7 @@ endobj
/Type /Annot
>>
endobj
-169 0 obj
+170 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -19596,7 +19572,7 @@ endobj
/Type /Annot
>>
endobj
-170 0 obj
+171 0 obj
<< /Length 24608
>>
stream
@@ -21249,27 +21225,27 @@ Q
endstream
endobj
-171 0 obj
+172 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 170 0 R
+/Contents 171 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/Font << /F2.0 16 0 R
/F1.0 8 0 R
/F4.0 39 0 R
/F5.0 40 0 R
>>
-/XObject << /Stamp1 292 0 R
+/XObject << /Stamp1 291 0 R
>>
>>
-/Annots [173 0 R 174 0 R 175 0 R 176 0 R 177 0 R 178 0 R 179 0 R 180 0 R 181 0 R 182 0 R 183 0 R 184 0 R 185 0 R 186 0 R 187 0 R 188 0 R 189 0 R 190 0 R 191 0 R 192 0 R 193 0 R 194 0 R 195 0 R 196 0 R 198 0 R]
+/Annots [174 0 R 175 0 R 176 0 R 177 0 R 178 0 R 179 0 R 180 0 R 181 0 R 182 0 R 183 0 R 184 0 R 185 0 R 186 0 R 187 0 R 188 0 R 189 0 R 190 0 R 191 0 R 192 0 R 193 0 R 194 0 R 195 0 R 196 0 R 197 0 R 199 0 R]
>>
endobj
-172 0 obj
-[171 0 R /XYZ 0 841.89 null]
-endobj
173 0 obj
+[172 0 R /XYZ 0 841.89 null]
+endobj
+174 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -21280,7 +21256,7 @@ endobj
/Type /Annot
>>
endobj
-174 0 obj
+175 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -21291,7 +21267,7 @@ endobj
/Type /Annot
>>
endobj
-175 0 obj
+176 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -21302,7 +21278,7 @@ endobj
/Type /Annot
>>
endobj
-176 0 obj
+177 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -21313,7 +21289,7 @@ endobj
/Type /Annot
>>
endobj
-177 0 obj
+178 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -21324,7 +21300,7 @@ endobj
/Type /Annot
>>
endobj
-178 0 obj
+179 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -21335,7 +21311,7 @@ endobj
/Type /Annot
>>
endobj
-179 0 obj
+180 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -21346,7 +21322,7 @@ endobj
/Type /Annot
>>
endobj
-180 0 obj
+181 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -21357,7 +21333,7 @@ endobj
/Type /Annot
>>
endobj
-181 0 obj
+182 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -21368,7 +21344,7 @@ endobj
/Type /Annot
>>
endobj
-182 0 obj
+183 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -21379,7 +21355,7 @@ endobj
/Type /Annot
>>
endobj
-183 0 obj
+184 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -21390,7 +21366,7 @@ endobj
/Type /Annot
>>
endobj
-184 0 obj
+185 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -21401,7 +21377,7 @@ endobj
/Type /Annot
>>
endobj
-185 0 obj
+186 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -21412,7 +21388,7 @@ endobj
/Type /Annot
>>
endobj
-186 0 obj
+187 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -21423,7 +21399,7 @@ endobj
/Type /Annot
>>
endobj
-187 0 obj
+188 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -21434,7 +21410,7 @@ endobj
/Type /Annot
>>
endobj
-188 0 obj
+189 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -21445,7 +21421,7 @@ endobj
/Type /Annot
>>
endobj
-189 0 obj
+190 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -21456,7 +21432,7 @@ endobj
/Type /Annot
>>
endobj
-190 0 obj
+191 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -21467,7 +21443,7 @@ endobj
/Type /Annot
>>
endobj
-191 0 obj
+192 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -21478,7 +21454,7 @@ endobj
/Type /Annot
>>
endobj
-192 0 obj
+193 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -21489,7 +21465,7 @@ endobj
/Type /Annot
>>
endobj
-193 0 obj
+194 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -21500,7 +21476,7 @@ endobj
/Type /Annot
>>
endobj
-194 0 obj
+195 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -21511,7 +21487,7 @@ endobj
/Type /Annot
>>
endobj
-195 0 obj
+196 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -21522,7 +21498,7 @@ endobj
/Type /Annot
>>
endobj
-196 0 obj
+197 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -21533,10 +21509,10 @@ endobj
/Type /Annot
>>
endobj
-197 0 obj
-[171 0 R /XYZ 0 184.6600000000001 null]
-endobj
198 0 obj
+[172 0 R /XYZ 0 184.6600000000001 null]
+endobj
+199 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -21547,8 +21523,8 @@ endobj
/Type /Annot
>>
endobj
-199 0 obj
-<< /Length 18355
+200 0 obj
+<< /Length 18353
>>
stream
q
@@ -22576,12 +22552,12 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-0.443 Tw
+0.654 Tw
BT
48.239999999999995 209.80600000000027 Td
/F1.0 10.5 Tf
-[<726573706f6e7369626c6520666f7220636f6c6c656374696e67207468652064657461696c73206f6620616c6c206368616e67657320746f20646f6d61696e206f626a656374732077697468696e20616e20696e746572> 20.01953125 <616374696f6e2e202054686973206973>] TJ
+[<726573706f6e7369626c6520666f7220636f6c6c656374696e67207468652064657461696c73206f6620616c6c206368616e67657320746f20646f6d61696e206f626a656374732077697468696e20616e20696e746572> 20.01953125 <616374696f6e2e2054686973206973>] TJ
ET
@@ -22701,27 +22677,27 @@ Q
endstream
endobj
-200 0 obj
+201 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 199 0 R
+/Contents 200 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/Font << /F2.0 16 0 R
/F1.0 8 0 R
/F5.0 40 0 R
/F5.1 67 0 R
>>
-/XObject << /Stamp1 292 0 R
+/XObject << /Stamp1 291 0 R
>>
>>
-/Annots [202 0 R 203 0 R 204 0 R 206 0 R 208 0 R 209 0 R 211 0 R 212 0 R]
+/Annots [203 0 R 204 0 R 205 0 R 207 0 R 209 0 R 210 0 R 212 0 R 213 0 R]
>>
endobj
-201 0 obj
-[200 0 R /XYZ 0 841.89 null]
-endobj
202 0 obj
+[201 0 R /XYZ 0 841.89 null]
+endobj
+203 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -22732,7 +22708,7 @@ endobj
/Type /Annot
>>
endobj
-203 0 obj
+204 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -22743,7 +22719,7 @@ endobj
/Type /Annot
>>
endobj
-204 0 obj
+205 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -22754,10 +22730,10 @@ endobj
/Type /Annot
>>
endobj
-205 0 obj
-[200 0 R /XYZ 0 553.7700000000002 null]
-endobj
206 0 obj
+[201 0 R /XYZ 0 553.7700000000002 null]
+endobj
+207 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -22768,10 +22744,10 @@ endobj
/Type /Annot
>>
endobj
-207 0 obj
-[200 0 R /XYZ 0 445.37000000000035 null]
-endobj
208 0 obj
+[201 0 R /XYZ 0 445.37000000000035 null]
+endobj
+209 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -22782,7 +22758,7 @@ endobj
/Type /Annot
>>
endobj
-209 0 obj
+210 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -22793,10 +22769,10 @@ endobj
/Type /Annot
>>
endobj
-210 0 obj
-[200 0 R /XYZ 0 277.6300000000003 null]
-endobj
211 0 obj
+[201 0 R /XYZ 0 277.6300000000003 null]
+endobj
+212 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -22807,7 +22783,7 @@ endobj
/Type /Annot
>>
endobj
-212 0 obj
+213 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -22818,10 +22794,10 @@ endobj
/Type /Annot
>>
endobj
-213 0 obj
-[200 0 R /XYZ 0 162.43000000000026 null]
-endobj
214 0 obj
+[201 0 R /XYZ 0 162.43000000000026 null]
+endobj
+215 0 obj
<< /Length 31521
>>
stream
@@ -25004,24 +24980,24 @@ Q
endstream
endobj
-215 0 obj
+216 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 214 0 R
+/Contents 215 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/Font << /F5.0 40 0 R
/F5.1 67 0 R
/F1.0 8 0 R
/F2.0 16 0 R
>>
-/XObject << /Stamp1 292 0 R
+/XObject << /Stamp1 291 0 R
>>
>>
-/Annots [216 0 R 217 0 R 218 0 R 220 0 R 222 0 R 223 0 R]
+/Annots [217 0 R 218 0 R 219 0 R 221 0 R 223 0 R 224 0 R]
>>
endobj
-216 0 obj
+217 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -25032,7 +25008,7 @@ endobj
/Type /Annot
>>
endobj
-217 0 obj
+218 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -25043,7 +25019,7 @@ endobj
/Type /Annot
>>
endobj
-218 0 obj
+219 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -25054,10 +25030,10 @@ endobj
/Type /Annot
>>
endobj
-219 0 obj
-[215 0 R /XYZ 0 218.98999999999987 null]
-endobj
220 0 obj
+[216 0 R /XYZ 0 218.98999999999987 null]
+endobj
+221 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -25068,10 +25044,10 @@ endobj
/Type /Annot
>>
endobj
-221 0 obj
-[215 0 R /XYZ 0 110.58999999999983 null]
-endobj
222 0 obj
+[216 0 R /XYZ 0 110.58999999999983 null]
+endobj
+223 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -25082,7 +25058,7 @@ endobj
/Type /Annot
>>
endobj
-223 0 obj
+224 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -25093,7 +25069,7 @@ endobj
/Type /Annot
>>
endobj
-224 0 obj
+225 0 obj
<< /Length 28942
>>
stream
@@ -27000,11 +26976,11 @@ Q
endstream
endobj
-225 0 obj
+226 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 224 0 R
+/Contents 225 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/Font << /F1.0 8 0 R
/F2.0 16 0 R
@@ -27012,19 +26988,19 @@ endobj
/F3.1 17 0 R
/F5.1 67 0 R
>>
-/XObject << /Stamp1 292 0 R
+/XObject << /Stamp1 291 0 R
>>
>>
>>
endobj
-226 0 obj
-[225 0 R /XYZ 0 778.86 null]
-endobj
227 0 obj
-[225 0 R /XYZ 0 596.32 null]
+[226 0 R /XYZ 0 778.86 null]
endobj
228 0 obj
-<< /Length 40711
+[226 0 R /XYZ 0 596.32 null]
+endobj
+229 0 obj
+<< /Length 40357
>>
stream
q
@@ -29843,29 +29819,7 @@ ET
BT
189.48600000000002 77.16599999999974 Td
/F1.0 10.5 Tf
-<206f722028646570726563617465642920> Tj
-ET
-
-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
-
-BT
-271.785 77.16599999999974 Td
-/F5.0 10.5 Tf
-<5075626c697368696e6753657276696365> Tj
-ET
-
-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
-
-BT
-361.035 77.16599999999974 Td
-/F1.0 10.5 Tf
-<20646f6d61696e2073657276696365732e> Tj
+<20646f6d61696e20736572766963652873292e> Tj
ET
0.000 0.000 0.000 SCN
@@ -29894,32 +29848,32 @@ Q
endstream
endobj
-229 0 obj
+230 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 228 0 R
+/Contents 229 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/Font << /F5.0 40 0 R
/F2.0 16 0 R
/F1.0 8 0 R
/F6.0 71 0 R
>>
-/XObject << /Stamp1 292 0 R
+/XObject << /Stamp1 291 0 R
>>
>>
-/Annots [232 0 R 234 0 R 235 0 R]
+/Annots [233 0 R 235 0 R]
>>
endobj
-230 0 obj
-[229 0 R /XYZ 0 314.9499999999998 null]
-endobj
231 0 obj
+[230 0 R /XYZ 0 314.9499999999998 null]
+endobj
+232 0 obj
<< /Limits [(related-services-4) (usage)]
-/Names [(related-services-4) 167 0 R (runtime-vs-noop-implementation) 230 0 R (spi) 66 0 R (spi-2) 104 0 R (spi-3) 227 0 R (spi-and-implementation) 143 0 R (spi-and-implementation-2) 201 0 R (spi-and-implementation-3) 213 0 R (spi-and-implementation-4) 239 0 R (spi-implementation) 149 0 R (spi-implementation-2) 165 0 R (usage) 77 0 R]
+/Names [(related-services-4) 168 0 R (runtime-vs-noop-implementation) 231 0 R (spi) 66 0 R (spi-2) 105 0 R (spi-3) 228 0 R (spi-and-implementation) 144 0 R (spi-and-implementation-2) 202 0 R (spi-and-implementation-3) 214 0 R (spi-and-implementation-4) 239 0 R (spi-implementation) 150 0 R (spi-implementation-2) 166 0 R (usage) 77 0 R]
>>
endobj
-232 0 obj
+233 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -29930,33 +29884,22 @@ endobj
/Type /Annot
>>
endobj
-233 0 obj
-[229 0 R /XYZ 0 144.98999999999975 null]
-endobj
234 0 obj
-<< /Border [0 0 0]
-/A << /Type /Action
-/S /URI
-/URI (../rgsvc/rgsvc.pdf#_rgsvc_persistence-layer-spi_PublisherService)
->>
-/Subtype /Link
-/Rect [105.48600000000002 75.69599999999974 189.48600000000002 86.19599999999974]
-/Type /Annot
->>
+[230 0 R /XYZ 0 144.98999999999975 null]
endobj
235 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
-/URI (../rgsvc/rgsvc.pdf#_rgsvc_persistence-layer-spi_PublishingService)
+/URI (../rgsvc/rgsvc.pdf#_rgsvc_persistence-layer-spi_PublisherService)
>>
/Subtype /Link
-/Rect [271.785 75.69599999999974 361.035 86.19599999999974]
+/Rect [105.48600000000002 75.69599999999974 189.48600000000002 86.19599999999974]
/Type /Annot
>>
endobj
236 0 obj
-<< /Length 25500
+<< /Length 25079
>>
stream
q
@@ -30755,7 +30698,7 @@ ET
0.694 0.129 0.275 scn
0.694 0.129 0.275 SCN
-6.405 Tw
+7.317 Tw
BT
64.809 452.19600000000025 Td
@@ -30770,12 +30713,12 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-6.405 Tw
+7.317 Tw
BT
148.809 452.19600000000025 Td
/F1.0 10.5 Tf
-<2e202054686520> Tj
+<2e2054686520> Tj
ET
@@ -30785,10 +30728,10 @@ ET
0.694 0.129 0.275 scn
0.694 0.129 0.275 SCN
-6.405 Tw
+7.317 Tw
BT
-197.50731818181816 452.19600000000025 Td
+190.2079 452.19600000000025 Td
/F5.0 10.5 Tf
<457865637574696f6e> Tj
ET
@@ -30800,10 +30743,10 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-6.405 Tw
+7.317 Tw
BT
-244.75731818181816 452.19600000000025 Td
+237.4579 452.19600000000025 Td
/F1.0 10.5 Tf
<206f626a6563742077696c6c20626520616e20696e7374616e6365206f6620> Tj
ET
@@ -30815,10 +30758,10 @@ ET
0.694 0.129 0.275 scn
0.694 0.129 0.275 SCN
-6.405 Tw
+7.317 Tw
BT
-434.3122272727272 452.19600000000025 Td
+433.3998 452.19600000000025 Td
/F5.0 10.5 Tf
<416374696f6e496e766f636174696f6e> Tj
ET
@@ -30830,10 +30773,10 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-6.405 Tw
+7.317 Tw
BT
-518.3122272727272 452.19600000000025 Td
+517.3998 452.19600000000025 Td
/F1.0 10.5 Tf
<2028736565> Tj
ET
@@ -30968,7 +30911,7 @@ ET
0.694 0.129 0.275 scn
0.694 0.129 0.275 SCN
-8.314 Tw
+9.417 Tw
BT
64.809 383.07600000000025 Td
@@ -30983,12 +30926,12 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-8.314 Tw
+9.417 Tw
BT
148.809 383.07600000000025 Td
/F1.0 10.5 Tf
-<2e202054686520> Tj
+<2e2054686520> Tj
ET
@@ -30998,10 +30941,10 @@ ET
0.694 0.129 0.275 scn
0.694 0.129 0.275 SCN
-8.314 Tw
+9.417 Tw
BT
-203.23459090909088 383.07600000000025 Td
+194.4079 383.07600000000025 Td
/F5.0 10.5 Tf
<457865637574696f6e> Tj
ET
@@ -31013,10 +30956,10 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-8.314 Tw
+9.417 Tw
BT
-250.48459090909088 383.07600000000025 Td
+241.6579 383.07600000000025 Td
/F1.0 10.5 Tf
<206f626a6563742077696c6c20626520616e20696e7374616e6365206f6620> Tj
ET
@@ -31028,10 +30971,10 @@ ET
0.694 0.129 0.275 scn
0.694 0.129 0.275 SCN
-8.314 Tw
+9.417 Tw
BT
-453.40313636363635 383.07600000000025 Td
+452.2998 383.07600000000025 Td
/F5.0 10.5 Tf
<50726f706572747945646974> Tj
ET
@@ -31043,10 +30986,10 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-8.314 Tw
+9.417 Tw
BT
-516.4031363636363 383.07600000000025 Td
+515.2998 383.07600000000025 Td
/F1.0 10.5 Tf
<2028736565> Tj
ET
@@ -31461,28 +31404,6 @@ ET
BT
189.486 116.71600000000015 Td
/F1.0 10.5 Tf
-<20616e642020> Tj
-ET
-
-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
-
-BT
-216.7545 116.71600000000015 Td
-/F5.0 10.5 Tf
-<5075626c697368696e6753657276696365> Tj
-ET
-
-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
-
-BT
-306.0045 116.71600000000015 Td
-/F1.0 10.5 Tf
<2e> Tj
ET
@@ -31631,10 +31552,10 @@ endobj
/F2.0 16 0 R
/F5.1 67 0 R
>>
-/XObject << /Stamp1 292 0 R
+/XObject << /Stamp1 291 0 R
>>
>>
-/Annots [238 0 R 240 0 R 241 0 R 242 0 R 243 0 R 244 0 R 245 0 R 246 0 R 248 0 R 250 0 R 251 0 R 252 0 R 253 0 R 254 0 R]
+/Annots [238 0 R 240 0 R 241 0 R 242 0 R 243 0 R 244 0 R 245 0 R 246 0 R 248 0 R 250 0 R 251 0 R 252 0 R 253 0 R]
>>
endobj
238 0 obj
@@ -31771,17 +31692,6 @@ endobj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
-/URI (../rgsvc/rgsvc.pdf#_rgsvc_persistence-layer-spi_PublishingService)
->>
-/Subtype /Link
-/Rect [216.7545 115.24600000000015 306.0045 125.74600000000015]
-/Type /Annot
->>
-endobj
-253 0 obj
-<< /Border [0 0 0]
-/A << /Type /Action
-/S /URI
/URI (../rgfis/rgfis.pdf#_rgfis_persistence-layer_AuditingServiceInternal)
>>
/Subtype /Link
@@ -31789,7 +31699,7 @@ endobj
/Type /Annot
>>
endobj
-254 0 obj
+253 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -31800,7 +31710,7 @@ endobj
/Type /Annot
>>
endobj
-255 0 obj
+254 0 obj
<< /Border [0 0 0]
/Dest (__rgfis)
/Subtype /Link
@@ -31808,7 +31718,7 @@ endobj
/Type /Annot
>>
endobj
-256 0 obj
+255 0 obj
<< /Border [0 0 0]
/Dest (__rgfis)
/Subtype /Link
@@ -31816,7 +31726,7 @@ endobj
/Type /Annot
>>
endobj
-257 0 obj
+256 0 obj
<< /Border [0 0 0]
/Dest (other-guides)
/Subtype /Link
@@ -31824,7 +31734,7 @@ endobj
/Type /Annot
>>
endobj
-258 0 obj
+257 0 obj
<< /Border [0 0 0]
/Dest (other-guides)
/Subtype /Link
@@ -31832,7 +31742,7 @@ endobj
/Type /Annot
>>
endobj
-259 0 obj
+258 0 obj
<< /Border [0 0 0]
/Dest (_rgfis_presentation-layer)
/Subtype /Link
@@ -31840,7 +31750,7 @@ endobj
/Type /Annot
>>
endobj
-260 0 obj
+259 0 obj
<< /Border [0 0 0]
/Dest (_rgfis_presentation-layer)
/Subtype /Link
@@ -31848,7 +31758,7 @@ endobj
/Type /Annot
>>
endobj
-261 0 obj
+260 0 obj
<< /Border [0 0 0]
/Dest (_rgfis_presentation-layer_ContentNegotiationService)
/Subtype /Link
@@ -31856,7 +31766,7 @@ endobj
/Type /Annot
>>
endobj
-262 0 obj
+261 0 obj
<< /Border [0 0 0]
/Dest (_rgfis_presentation-layer_ContentNegotiationService)
/Subtype /Link
@@ -31864,7 +31774,7 @@ endobj
/Type /Annot
>>
endobj
-263 0 obj
+262 0 obj
<< /Border [0 0 0]
/Dest (_rgfis_presentation-layer_ContentNegotiationService)
/Subtype /Link
@@ -31872,7 +31782,7 @@ endobj
/Type /Annot
>>
endobj
-264 0 obj
+263 0 obj
<< /Border [0 0 0]
/Dest (_rgfis_presentation-layer_RepresentationService)
/Subtype /Link
@@ -31880,7 +31790,7 @@ endobj
/Type /Annot
>>
endobj
-265 0 obj
+264 0 obj
<< /Border [0 0 0]
/Dest (_rgfis_presentation-layer_RepresentationService)
/Subtype /Link
@@ -31888,7 +31798,7 @@ endobj
/Type /Annot
>>
endobj
-266 0 obj
+265 0 obj
<< /Border [0 0 0]
/Dest (_rgfis_presentation-layer_RepresentationService)
/Subtype /Link
@@ -31896,7 +31806,7 @@ endobj
/Type /Annot
>>
endobj
-267 0 obj
+266 0 obj
<< /Border [0 0 0]
/Dest (_rgfis_application-layer)
/Subtype /Link
@@ -31904,7 +31814,7 @@ endobj
/Type /Annot
>>
endobj
-268 0 obj
+267 0 obj
<< /Border [0 0 0]
/Dest (_rgfis_application-layer)
/Subtype /Link
@@ -31912,7 +31822,7 @@ endobj
/Type /Annot
>>
endobj
-269 0 obj
+268 0 obj
<< /Border [0 0 0]
/Dest (_rgfis_application-layer_AuthenticationSessionProvider)
/Subtype /Link
@@ -31920,7 +31830,7 @@ endobj
/Type /Annot
>>
endobj
-270 0 obj
+269 0 obj
<< /Border [0 0 0]
/Dest (_rgfis_application-layer_AuthenticationSessionProvider)
/Subtype /Link
@@ -31928,7 +31838,7 @@ endobj
/Type /Annot
>>
endobj
-271 0 obj
+270 0 obj
<< /Border [0 0 0]
/Dest (_rgfis_application-layer_AuthenticationSessionProvider)
/Subtype /Link
@@ -31936,7 +31846,7 @@ endobj
/Type /Annot
>>
endobj
-272 0 obj
+271 0 obj
<< /Border [0 0 0]
/Dest (_rgfis_application-layer_CommandDtoServiceInternal)
/Subtype /Link
@@ -31944,7 +31854,7 @@ endobj
/Type /Annot
>>
endobj
-273 0 obj
+272 0 obj
<< /Border [0 0 0]
/Dest (_rgfis_application-layer_CommandDtoServiceInternal)
/Subtype /Link
@@ -31952,7 +31862,7 @@ endobj
/Type /Annot
>>
endobj
-274 0 obj
+273 0 obj
<< /Border [0 0 0]
/Dest (_rgfis_application-layer_CommandDtoServiceInternal)
/Subtype /Link
@@ -31960,7 +31870,7 @@ endobj
/Type /Annot
>>
endobj
-275 0 obj
+274 0 obj
<< /Border [0 0 0]
/Dest (_rgfis_application-layer_InteractionDtoServiceInternal)
/Subtype /Link
@@ -31968,7 +31878,7 @@ endobj
/Type /Annot
>>
endobj
-276 0 obj
+275 0 obj
<< /Border [0 0 0]
/Dest (_rgfis_application-layer_InteractionDtoServiceInternal)
/Subtype /Link
@@ -31976,7 +31886,7 @@ endobj
/Type /Annot
>>
endobj
-277 0 obj
+276 0 obj
<< /Border [0 0 0]
/Dest (_rgfis_application-layer_InteractionDtoServiceInternal)
/Subtype /Link
@@ -31984,7 +31894,7 @@ endobj
/Type /Annot
>>
endobj
-278 0 obj
+277 0 obj
<< /Border [0 0 0]
/Dest (_rgfis_persistence-layer)
/Subtype /Link
@@ -31992,7 +31902,7 @@ endobj
/Type /Annot
>>
endobj
-279 0 obj
+278 0 obj
<< /Border [0 0 0]
/Dest (_rgfis_persistence-layer)
/Subtype /Link
@@ -32000,7 +31910,7 @@ endobj
/Type /Annot
>>
endobj
-280 0 obj
+279 0 obj
<< /Border [0 0 0]
/Dest (_rgfis_persistence-layer_AuditingServiceInternal)
/Subtype /Link
@@ -32008,7 +31918,7 @@ endobj
/Type /Annot
>>
endobj
-281 0 obj
+280 0 obj
<< /Border [0 0 0]
/Dest (_rgfis_persistence-layer_AuditingServiceInternal)
/Subtype /Link
@@ -32016,7 +31926,7 @@ endobj
/Type /Annot
>>
endobj
-282 0 obj
+281 0 obj
<< /Border [0 0 0]
/Dest (_rgfis_persistence-layer_AuditingServiceInternal)
/Subtype /Link
@@ -32024,7 +31934,7 @@ endobj
/Type /Annot
>>
endobj
-283 0 obj
+282 0 obj
<< /Border [0 0 0]
/Dest (_rgfis_persistence-layer_ChangedObjectsServiceInternal)
/Subtype /Link
@@ -32032,7 +31942,7 @@ endobj
/Type /Annot
>>
endobj
-284 0 obj
+283 0 obj
<< /Border [0 0 0]
/Dest (_rgfis_persistence-layer_ChangedObjectsServiceInternal)
/Subtype /Link
@@ -32040,7 +31950,7 @@ endobj
/Type /Annot
>>
endobj
-285 0 obj
+284 0 obj
<< /Border [0 0 0]
/Dest (_rgfis_persistence-layer_ChangedObjectsServiceInternal)
/Subtype /Link
@@ -32048,7 +31958,7 @@ endobj
/Type /Annot
>>
endobj
-286 0 obj
+285 0 obj
<< /Border [0 0 0]
/Dest (_rgfis_persistence-layer_PersistenceSessionServiceInternal)
/Subtype /Link
@@ -32056,7 +31966,7 @@ endobj
/Type /Annot
>>
endobj
-287 0 obj
+286 0 obj
<< /Border [0 0 0]
/Dest (_rgfis_persistence-layer_PersistenceSessionServiceInternal)
/Subtype /Link
@@ -32064,7 +31974,7 @@ endobj
/Type /Annot
>>
endobj
-288 0 obj
+287 0 obj
<< /Border [0 0 0]
/Dest (_rgfis_persistence-layer_PersistenceSessionServiceInternal)
/Subtype /Link
@@ -32072,7 +31982,7 @@ endobj
/Type /Annot
>>
endobj
-289 0 obj
+288 0 obj
<< /Border [0 0 0]
/Dest (_rgfis_persistence-layer_PublishingServiceInternal)
/Subtype /Link
@@ -32080,7 +31990,7 @@ endobj
/Type /Annot
>>
endobj
-290 0 obj
+289 0 obj
<< /Border [0 0 0]
/Dest (_rgfis_persistence-layer_PublishingServiceInternal)
/Subtype /Link
@@ -32088,7 +31998,7 @@ endobj
/Type /Annot
>>
endobj
-291 0 obj
+290 0 obj
<< /Border [0 0 0]
/Dest (_rgfis_persistence-layer_PublishingServiceInternal)
/Subtype /Link
@@ -32096,7 +32006,7 @@ endobj
/Type /Annot
>>
endobj
-292 0 obj
+291 0 obj
<< /Type /XObject
/Subtype /Form
/BBox [0 0 595.28 841.89]
@@ -32124,156 +32034,156 @@ Q
endstream
endobj
-293 0 obj
+292 0 obj
<< /Type /Outlines
/Count 16
-/First 294 0 R
-/Last 305 0 R
+/First 293 0 R
+/Last 304 0 R
>>
endobj
-294 0 obj
+293 0 obj
<< /Title <feff004600720061006d00650077006f0072006b00200049006e007400650072006e0061006c002000530065007200760069006300650073>
-/Parent 293 0 R
+/Parent 292 0 R
/Count 0
-/Next 295 0 R
+/Next 294 0 R
/Dest [7 0 R /XYZ 0 841.89 null]
>>
endobj
-295 0 obj
+294 0 obj
<< /Title <feff005400610062006c00650020006f006600200043006f006e00740065006e00740073>
-/Parent 293 0 R
+/Parent 292 0 R
/Count 0
-/Next 296 0 R
-/Prev 294 0 R
+/Next 295 0 R
+/Prev 293 0 R
/Dest [10 0 R /XYZ 0 841.89 null]
>>
endobj
-296 0 obj
+295 0 obj
<< /Title <feff004300680061007000740065007200200031002e0020004600720061006d00650077006f0072006b00200049006e007400650072006e0061006c002000530065007200760069006300650073>
-/Parent 293 0 R
+/Parent 292 0 R
/Count 1
-/First 297 0 R
-/Last 297 0 R
-/Next 298 0 R
-/Prev 295 0 R
+/First 296 0 R
+/Last 296 0 R
+/Next 297 0 R
+/Prev 294 0 R
/Dest [12 0 R /XYZ 0 841.89 null]
>>
endobj
-297 0 obj
+296 0 obj
<< /Title <feff0031002e0031002e0020004f00740068006500720020004700750069006400650073>
-/Parent 296 0 R
+/Parent 295 0 R
/Count 0
/Dest [12 0 R /XYZ 0 654.2700000000001 null]
>>
endobj
-298 0 obj
+297 0 obj
<< /Title <feff004300680061007000740065007200200032002e002000500072006500730065006e0074006100740069006f006e0020004c0061007900650072>
-/Parent 293 0 R
+/Parent 292 0 R
/Count 2
-/First 299 0 R
-/Last 300 0 R
-/Next 301 0 R
-/Prev 296 0 R
+/First 298 0 R
+/Last 299 0 R
+/Next 300 0 R
+/Prev 295 0 R
/Dest [36 0 R /XYZ 0 841.89 null]
>>
endobj
-299 0 obj
+298 0 obj
<< /Title <feff0032002e0031002e00200043006f006e00740065006e0074004e00650067006f00740069006100740069006f006e0053006500720076006900630065>
-/Parent 298 0 R
+/Parent 297 0 R
/Count 0
-/Next 300 0 R
+/Next 299 0 R
/Dest [36 0 R /XYZ 0 249.34000000000026 null]
>>
endobj
-300 0 obj
+299 0 obj
<< /Title <feff0032002e0032002e00200052006500700072006500730065006e0074006100740069006f006e0053006500720076006900630065>
-/Parent 298 0 R
+/Parent 297 0 R
/Count 0
-/Prev 299 0 R
+/Prev 298 0 R
/Dest [94 0 R /XYZ 0 690.2900000000002 null]
>>
endobj
-301 0 obj
+300 0 obj
<< /Title <feff004300680061007000740065007200200033002e0020004100700070006c00690063006100740069006f006e0020004c0061007900650072>
-/Parent 293 0 R
+/Parent 292 0 R
/Count 3
-/First 302 0 R
-/Last 304 0 R
-/Next 305 0 R
-/Prev 298 0 R
-/Dest [120 0 R /XYZ 0 841.89 null]
+/First 301 0 R
+/Last 303 0 R
+/Next 304 0 R
+/Prev 297 0 R
+/Dest [121 0 R /XYZ 0 841.89 null]
>>
endobj
-302 0 obj
+301 0 obj
<< /Title <feff0033002e0031002e002000410075007400680065006e007400690063006100740069006f006e00530065007300730069006f006e00500072006f00760069006400650072>
-/Parent 301 0 R
+/Parent 300 0 R
/Count 0
-/Next 303 0 R
-/Dest [141 0 R /XYZ 0 841.89 null]
+/Next 302 0 R
+/Dest [142 0 R /XYZ 0 841.89 null]
>>
endobj
-303 0 obj
+302 0 obj
<< /Title <feff0033002e0032002e00200043006f006d006d0061006e006400440074006f00530065007200760069006300650049006e007400650072006e0061006c>
-/Parent 301 0 R
+/Parent 300 0 R
/Count 0
-/Next 304 0 R
-/Prev 302 0 R
-/Dest [141 0 R /XYZ 0 420.3500000000001 null]
+/Next 303 0 R
+/Prev 301 0 R
+/Dest [142 0 R /XYZ 0 420.3500000000001 null]
>>
endobj
-304 0 obj
+303 0 obj
<< /Title <feff0033002e0033002e00200049006e0074006500720061006300740069006f006e00440074006f00530065007200760069006300650049006e007400650072006e0061006c>
-/Parent 301 0 R
+/Parent 300 0 R
/Count 0
-/Prev 303 0 R
-/Dest [151 0 R /XYZ 0 204.3699999999999 null]
+/Prev 302 0 R
+/Dest [152 0 R /XYZ 0 204.3699999999999 null]
>>
endobj
-305 0 obj
+304 0 obj
<< /Title <feff004300680061007000740065007200200034002e002000500065007200730069007300740065006e006300650020004c006100790065007200200069006e007400650072006e0061006c0020005300500049>
-/Parent 293 0 R
+/Parent 292 0 R
/Count 4
-/First 306 0 R
-/Last 309 0 R
-/Prev 301 0 R
-/Dest [171 0 R /XYZ 0 841.89 null]
+/First 305 0 R
+/Last 308 0 R
+/Prev 300 0 R
+/Dest [172 0 R /XYZ 0 841.89 null]
>>
endobj
-306 0 obj
+305 0 obj
<< /Title <feff0034002e0031002e0020004100750064006900740069006e006700530065007200760069006300650049006e007400650072006e0061006c>
-/Parent 305 0 R
+/Parent 304 0 R
+/Count 0
+/Next 306 0 R
+/Dest [172 0 R /XYZ 0 184.6600000000001 null]
+>>
+endobj
+306 0 obj
+<< /Title <feff0034002e0032002e0020004300680061006e006700650064004f0062006a006500630074007300530065007200760069006300650049006e007400650072006e0061006c>
+/Parent 304 0 R
/Count 0
/Next 307 0 R
-/Dest [171 0 R /XYZ 0 184.6600000000001 null]
+/Prev 305 0 R
+/Dest [201 0 R /XYZ 0 277.6300000000003 null]
>>
endobj
307 0 obj
-<< /Title <feff0034002e0032002e0020004300680061006e006700650064004f0062006a006500630074007300530065007200760069006300650049006e007400650072006e0061006c>
-/Parent 305 0 R
+<< /Title <feff0034002e0033002e002000500065007200730069007300740065006e0063006500530065007300730069006f006e00530065007200760069006300650049006e007400650072006e0061006c>
+/Parent 304 0 R
/Count 0
/Next 308 0 R
/Prev 306 0 R
-/Dest [200 0 R /XYZ 0 277.6300000000003 null]
+/Dest [226 0 R /XYZ 0 778.86 null]
>>
endobj
308 0 obj
-<< /Title <feff0034002e0033002e002000500065007200730069007300740065006e0063006500530065007300730069006f006e00530065007200760069006300650049006e007400650072006e0061006c>
-/Parent 305 0 R
+<< /Title <feff0034002e0034002e0020005000750062006c0069007300680069006e006700530065007200760069006300650049006e007400650072006e0061006c>
+/Parent 304 0 R
/Count 0
-/Next 309 0 R
/Prev 307 0 R
-/Dest [225 0 R /XYZ 0 778.86 null]
+/Dest [230 0 R /XYZ 0 144.98999999999975 null]
>>
endobj
309 0 obj
-<< /Title <feff0034002e0034002e0020005000750062006c0069007300680069006e006700530065007200760069006300650049006e007400650072006e0061006c>
-/Parent 305 0 R
-/Count 0
-/Prev 308 0 R
-/Dest [229 0 R /XYZ 0 144.98999999999975 null]
->>
-endobj
-310 0 obj
<< /Nums [0 << /P (i)
>> 1 << /P (ii)
>> 2 << /P (1)
@@ -32289,7 +32199,7 @@ endobj
>>]
>>
endobj
-311 0 obj
+310 0 obj
<< /Length1 13080
/Length 8247
/Filter [/FlateDecode]
@@ -32321,10 +32231,10 @@ RA
���v6�C㻷�Q����1<6��������0���ׇ��
����$�
endstream
endobj
-312 0 obj
+311 0 obj
<< /Type /FontDescriptor
/FontName /AAAABU+NotoSerif
-/FontFile2 311 0 R
+/FontFile2 310 0 R
/FontBBox [-212 -250 1246 1047]
/Flags 6
/StemV 0
@@ -32335,7 +32245,7 @@ endobj
/XHeight 1098
>>
endobj
-313 0 obj
+312 0 obj
<< /Length 1286
/Filter [/FlateDecode]
>>
@@ -32345,10 +32255,10 @@ x
���J���J��특���x��x��x��+�!Êw�� B�x�b�x��+ށ�r�;�� 2��k�Μ�J�Y�e�Y��7+|��x� oS��7+[ƛețךyޢoV��浖 -㭌���"���R�W�*��4Xq��C�^J�[(��^�1�»�y]���k�}�YM-x ����V�z�����[YE�V�Y���_}/7�*�Y%��e�ӫq+��:��.�7�J���E�/�3Y(Y�*A�W R��VJS�����:(u@c��D�]a*��f)�9J���)�o, #�\�Z>M�U��\�jPS�
{HS��M���j����{fk���yG�m[z*E�sa��>�&�ӫ���j%u���; �2^���W�[���®�v�[���2�쯲u�[���P�:���V̡�Յ> �M��Bi2 .Ħ����ԇ!���d�k�`���=o� �qWޕwdJF(�L164�U��)�x0E�~��Z? �=��/����ί ���~:�o?$���������O
endstream
endobj
-314 0 obj
+313 0 obj
[259 1000 408 559 1000 1000 1000 220 346 346 1000 1000 250 310 250 288 559 559 559 559 559 559 559 559 559 559 286 286 559 559 559 1000 1000 705 653 613 727 623 589 713 792 367 356 700 623 937 763 742 604 742 655 543 612 716 1000 1046 660 625 1000 1000 1000 1000 1000 458 1000 562 613 492 613 535 369 538 634 319 299 584 310 944 645 577 613 613 471 451 352 634 579 861 578 564 511 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 361 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 259 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 250 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
1000 1000 1000 1000 1000 1000 1000 1000 1000]
endobj
-315 0 obj
+314 0 obj
<< /Length1 9636
/Length 6389
/Filter [/FlateDecode]
@@ -32380,10 +32290,10 @@ fu33
�axh��q ،1P�ҡ�FMS�m ^}0÷3677]i�M
�m���mCSI�� �Lٙ ���+���A�)��
x,���Гp�Ɍo�λv�%3j1�g��ǧ�p�����ը�y�m �C ���'g�b�����X\]; �S�N�z) �6T�q��� �v f���c�Z��y���gʀ�6��t ��1� �M͌�i�����H[w�J�����Rm�ylj���> ��zX5� �"���t��a^p���ܚW��a�c�ە� /�amE�Y.]��K����/�*
endstream
endobj
-316 0 obj
+315 0 obj
<< /Type /FontDescriptor
/FontName /AAAABV+NotoSerif-Bold
-/FontFile2 315 0 R
+/FontFile2 314 0 R
/FontBBox [-212 -250 1306 1058]
/Flags 6
/StemV 0
@@ -32394,7 +32304,7 @@ endobj
/XHeight 1098
>>
endobj
-317 0 obj
+316 0 obj
<< /Length 1286
/Filter [/FlateDecode]
>>
@@ -32404,10 +32314,10 @@ x
���J���J��특���x��x��x��+�!Êw�� B�x�b�x��+ށ�r�;�� 2��k�Μ�J�Y�e�Y��7+|��x� oS��7+[ƛețךyޢoV��浖 -㭌���"���R�W�*��4Xq��C�^J�[(��^�1�»�y]���k�}�YM-x ����V�z�����[YE�V�Y���_}/7�*�Y%��e�ӫq+��:��.�7�J���E�/�3Y(Y�*A�W R��VJS�����:(u@c��D�]a*��f)�9J���)�o, #�\�Z>M�U��\�jPS�
{HS��M���j����{fk���yG�m[z*E�sa��>�&�ӫ���j%u���; �2^���W�[���®�v�[���2�쯲u�[���P�:���V̡�Յ> �M��Bi2 .Ħ����ԇ!���d�k�`���=o� �qWޕwdJF(�L164�U��)�x0E�~��Z? �=��/����ί ���~:�o?$���������O
endstream
endobj
-318 0 obj
+317 0 obj
[259 1000 1000 1000 1000 1000 800 1000 399 399 1000 1000 1000 1000 293 1000 1000 559 559 559 559 559 559 1000 1000 1000 304 1000 1000 1000 1000 1000 1000 752 1000 667 1000 1000 621 769 1000 400 1000 1000 653 952 788 787 638 1000 707 585 652 747 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 599 648 526 648 570 407 560 666 352 1000 636 352 985 666 612 645 1000 522 487 404 666 605 855 1000 579 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 279 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000]
endobj
-319 0 obj
+318 0 obj
<< /Length1 2044
/Length 1027
/Filter [/FlateDecode]
@@ -32421,10 +32331,10 @@ x
5�Uƃ8��ܞ�U��d�� u"��/��a��x\��nO��u� J�2�̃��p�Q��"Od�� �w������ �k���'�5��v��p�v)�6��? �(�
endstream
endobj
-320 0 obj
+319 0 obj
<< /Type /FontDescriptor
/FontName /AAAABW+FontAwesome
-/FontFile2 319 0 R
+/FontFile2 318 0 R
/FontBBox [-10 -155 1290 867]
/Flags 4
/StemV 0
@@ -32435,7 +32345,7 @@ endobj
/XHeight 0
>>
endobj
-321 0 obj
+320 0 obj
<< /Length 233
/Filter [/FlateDecode]
>>
@@ -32444,38 +32354,30 @@ x
�Fɇ_��� � J�=Xt ��E/��N�e���Ğ?��ڊ�k-�I$ f�R}�\/0����09�It- ���k� �Ԕ�-룮7i�*��W4����J! �~�Sq�� ��r�
endstream
endobj
-322 0 obj
+321 0 obj
[250 1000 857 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500]
endobj
-323 0 obj
-<< /Length1 5484
-/Length 3534
+322 0 obj
+<< /Length1 4588
+/Length 2925
/Filter [/FlateDecode]
>>
stream
-x��X}\S��?�{o�ݼ�J��H�DIBZ|+�/�0��' � $1 "ʔ)SA��Ծ�8�Z���Vm��&릭�=�~��vs~*s־hu�Yg��s��Ѳ�ߒ�ͽ�s�s��{��� �l�����[v�� �H�Zj#f'~�Ͽ�jpV[�O%�[�}��k[7������Z��j���x@8�����.0��؞�m��m��]:l`{������h��mvX���O< ���jB��|@����x���G1<�C�kQ 4#���=]��{�I 9Y
- �+��a��i1� L���Ї����%��-D���4�\|��pA{ad[���`E���o �����D�2��ҍ�t�:���
� mco�tH}��FKYD�:9h�3��]��':��:QVl2Q#/�i79�[�Q�� #��8Q�b�'���'Q
-9%!�4Ԭ��)dx���'�����w�.�'�+��M�������U:�3 ���{ֱ�a�j~�������ʨ�F268�
���� �$�(�:>�3*��;$�I�"���.| �'��0��Ǿ{��)Sަu;~�k3����
�g;������Y|���+w��rJ\��ڻ8�CșY�6L��D /����C� �b��Ҙ*S�G�vN���#c�
��mSQ�]yJ8R�K_� �! �4"��\N �&i�(5G Z�� ����W-?y���^>��[n��%�����᭧H�� n[g����Sϼy�ղmmWך'۫��g.�Ҟ/�7�ȃXb � �:>��e*Z�㡶���| 2mݲ��1wz��Y�U ���0 ��,f��2R˾�,�9�c/�q~�hDeT��ݬi� {� � �>Ϙa$�[5š�UZ�Q�1�$F�1��2�Lqm����{�m+�$�VkyVWlvFyBﶾ�چׯ���8��c'�$��_��>W��f���`&5\�fu�h�p�nD�Ib9D�NF��B��������OB�\&Q���,!�,# U
-C�붰},۫X`9��z�P�a.s�t�J���' �|���N���w�:{�=�/b�/�X�pI9���� #ui�A���#&�$�{OuIiQ���a��=9IBɠ�tAq�F���/9� �xH��C,�1X��c����{"����C� ��*7z��ۗ' ���>��r�>��I!�Ib$JT<� v�?�R3�:�)�f$r �V�[�#��wotm�'v��ӗ�ɠ�P���d�
-$�BJ�
-�
-ڈ :��gC���"c�L�R�N�x �dT�߱��{%Sb.�Cwc��<� ~�,}�(�E�%�[7t`y��a��i���2�?�r�%h� $y a�J9Y�n����)�T�eI��X�*N@o��ֵ<>s~*���V��~�,`/��`3��T�|u������ӽ�{����Du�W�����"��~v���� V�98DB /�����eٯ����:��r� `U�dw�፫7qyW.�ǣܚ�� A���g ����2 ��|�!�`nA�&�
-k�6�����1H�e�rY�lF*]@�2�F������:��c �f������dFʥX
?:���h��*U,��5����*tj�/���&g<ُyr�g�Ĺ5.gnY¶�Ef�RI�(ڕ�tu^!{��s�.�2�QZ�Y�R�8�ϡ���s�ĺ�JI�5AgQe���gE�1�w,�t5�,ôt~�J�7IS Tj�t M�Q�t<�ݿ����o��Q�C�*{�(�w�<#���<- Yް��6I�Ri���
-�h���16i��j��e��S�7� �臘��{o�c� ����������*�d�}n=����<�n����<�k?�0�r�/�Y4��ި��α��??G�/}��� 0�?}�^g�/�O��ط#d�M2�u�b?���?����:�shpA"����8 ��7[��R��DJ9@�����ɾ��l*��G���k��?Q��&��������G�k�L��j[1��J*$�W���1�'N�чh��; ��p��qŕC����Oq��OQ�� �
{�-W٭u<����\|t8G�c|9}�k��T)�OF�|a�t��dŪ�U�>��K�
- {�y����z��]��1u�ՋsVj �v
��g�w /�����j�k��v> ��&��8�+ ΐ�4�N���%B��[�|*o�-;��l�=�v��ƒU]_\I-)&qw�|��pֱ&��A��ߟ%&5�t[`Ǩ6A���3�����U�u��d&lذ�28����|�2�S�{i`~�����^lK��v�r�m�t#u˓-�j��L0S��d�\dQѺt)�� L)ANNn�G]�� � _6w+{��;tg�ɷ��^�������� vE�:٣����xĢN
�J�u0Y/� "*~eQ��� �+"IJ_Q��(��ҷ�>a��7V���2��7�������+�v��sw=����h�4�#���C� f�d �BN�T:�@��@g�k���mFϘ�>�D3E��gEx��N ��?��X´�/�u��� b��Puv���<f/�1�`�/� ��(�����Ü�r� �x='I�r��<����G��PN�
:j�Q��,5�8{�;&u�� ���;8� ��j|�'�?J�� �x����6�\"���(�
�
��sPKF(�BD#b&Q�E,�'`� �%s��.�����?�CP7U���O?�sE�W����M�j�v�sP,��dd_���,<-! r �
-���{���2X�P+�OB<���j �6���3��E��V0t r��v r
-Ϗ� r
-Ϧo
-rf��9�> r&�dA�@<��"��
-A.�X�J��!�l�%ؿO�#� �A
-J,ȃ�Q*F�O9�+�'�L�)A Zj� 3�� �X:\���<z�؉;�� �P�o�a��#�à��!���Qf� �RfM�����ټʴ�sҔ�Ng]�UY��(3���+���걺�Xk4�
NpA �� ��^L�4�
s�W�!u��ъ�Bp@5h�)%
x/ ��[V�[Q�����ש,���x,vb/'�*�{ء��ki�W�V/XP� �; No� �m��� u�T�=J��b��൵���QC jp�7�ʉ��=�l}W�C���n���P����+�l��\7��<R"gdN�OM`��OVY
-g�����{���m��6Zܫ����q燝�Ղ�
Y�R+�
�P����0D�!�W�p� �c��� J���8�� >�\8x���1��(� 6�Ë�%h��(�Z�cjkƩ��A^ c���x�� N��*4��������y�� ���Yc���k���Z� qj����� �{���kѠ�{�jxy#�w��b�4777kX�j�����|@s3�ՠ�����ۃ�&�����^mux��&G�խ�ڬ�L��oY��DL��ƹ3u9�ҫx��S���Ƴ���,�/к�,�<��i\*��h�=�8�uچ� ����%%���㵌��A�n�T��1� �,����5d V^.�/o���H��v��R1� TH�?�Ͽ���n�0鋠*\��P�1VJ�
+x��X{Tg���$�!� �D�I,I��YE8�#�HY8�@�$� b�Y�+���Uk�K�V����Vmٮ����]kϩ��u=�Z���Z� {g2 Z����3���|�������� A�*�3uB%" D]S�P�9�����S�Wq��IcpB�����WlQ|��$��\.'���R��f��x��>d� ���f�3n �`B����@�ܢ�b����Y�q�����t�A���>�ċ��`�*� r�EЌb����TQ���X���'$Pk��!�v�����\!SH D$�X̙� �V�Z(oz(/�1��8��ȸ��Kq�aXD��N!�d�)#Ӫɴ��>Œ9��.�F�f�:�L�p% ���Q� ˴mxw�������ݞ�O]}ng��MY�y{�0j�) �����b �O�#J�贔�$g ��֧���۫v[7���7>�K0�s������@ǭ-�p�ɿgG�
+!�%TN+KvI�{n�t3z�1
Q�� q1Fr�T�":-�O+:���Փź����>c� ���Ѷv��k�O�g�Y�䟶���v���N�æ��;�w|���'��ͺʜ"�������Y�Y�� EC�OQ��ۉüY�i�J��GT�>��<\ �H �o��(�U ����Ҧ�c���n1u�u��X<�} �^�� �7��>�2$�_P �7���=�\� �t��~~Ŏ�}϶
+��?���x���ܚ_W�x�s+���7lX�0TU�Y���\y�w (���;�_��@�dZ/�Cm��lԄ�4ƚ��? {r���vf���1��wI�;�Y���T ��7�*�x�1�0 Rэ�'BrF��$f ����2k0.J��V�;���q=� �zg��
��'���ml_k�}�U���p��+d8�,� ���]��+�eQ]�B���ë�f���qJ-$A
+�U�'��H��*�ZL%�H� V��B�Ζ�$ ����T���l��b��.m��܁�V�Ύ�Lan]d�U $��C�Ea��y� ����H1V��+��zc���R��� ڢ{{�"�$�egUQq~�ٮW č��~v� "G}��m��
+��y� ҧ�w����LI���\��~ V�
+{~ҫ5L�KB����(�������ԯ& ߐ^ް�'���l�$</X��wbH��[.,:����T {R`����G�L)I��\Pn��jT$���-��'����m��%��}A�'��b��� � ����?T���d����=qO(��~��"W�����F/�J{�UQL� H֛�3HfdMi��w��5�iU��r����S�w�j�r���hǠ�D5yԪ���9F���T���)sRW//� �O�p_HO�3H����
��-�k��A=g��8l(~e�_�_Ti�� n?nh~lk�$t���ً��u�%�hT�aw�J������ v�e_N� �?Z��\�����zbf`=łe�{A,(
�D�L�g�7ΐ�^8yb�i������B���� ��*�t���ׅ/"��Yx9���E�1$z��⬩�����4��}�^ڲKX�-��e����-;D>�|s3V��=�zK_>�{�F�Ur�[X��z����z�pޤG���Kۜ�^��=�feUa�"�������3g�Z��9ͳ_��E�-$�o�z
���-�O��Hx�Y34&�I���'�ү[���q����rˍa7V�m/��\XA͵�ѷ�¯/�시u��}L�t��孶jLwz��j�_ͤ�y���c��ZF�L�K]���"&��{.u��5��?�9��;��n��ҧ��Ŗ�ëq�I͂�\ķ��{&�)�K���
+h�$�2��[/��!� ܨM$��1�ʧ.�~p���¥���� {x�WMmdm�����#�Bܗ��nB � ��'X�����JP~�4 C��2z3�&}�#vI�V�,L�ez��u���s�)�x�K���&V���W���!��U�2��چ�(����
+-��1sA/�mQ-��'�_�� b ��$I�]��{�;=m��H��'�خ�������g��\���UP����� @�<�{p�xqr�y�8?F�h�j�JX ��������;Y|���\ë��˒$ �1�:<'`�j� ��a�<� �� B `� #Ie_ �H �tP��{�h�q��[e����E��_}E�i�q�v�8��xg �L�qVM��+`Y"�JH"k�{�o�Ǩ ��#�Q���2 �S#d<��,����Gd<��*��r�e��Qt����TzB_�?�v�� ���x �wd<��+2 �32 �̲l���w�l��2�\���u�y�*�U[���G�� 8�˜d>h���pA�=�;� ~���Oy�k��V x�
+ x��H-���f$ˉ�N�Z��0��<[���-�q����n�� r��*d
�ln�*�|���z=\��[�)Xy|!�x%�T ��A�d��7 �x
�O������bw�n��>`�hf�\X�� >��3fΌwu����̒4э�%=�Er�� �s���/a�����O�[J+�W q�R�� � �K�\�_$R"�w�� �k�l��y��#��X^I��<9\�c�.�7��%38 le�G��G����R�uH㒤#�s� c�ݳ�q $� �&�U��i��Rl��=F���F�p�82�=F ��X �q;� ��s ^^ym�2s}}��#�%Q�u7s��π,w��� @��c)���� f���p�٠��f��*���L`{ 1�0OY�L��J[�!��!������,��Ḉu� ��]�b)����x��6�"`,�˞5�hV��b�x�~^
��ǜ#{��{ �,�l|k�ŝ7 ���]:�H̴� ��+��������sO�z����:��}��/��7�
endstream
endobj
-324 0 obj
+323 0 obj
<< /Type /FontDescriptor
/FontName /AAAABX+NotoSerif-Italic
-/FontFile2 323 0 R
+/FontFile2 322 0 R
/FontBBox [-254 -250 1238 1047]
/Flags 70
/StemV 0
@@ -32486,7 +32388,7 @@ endobj
/XHeight 1098
>>
endobj
-325 0 obj
+324 0 obj
<< /Length 1286
/Filter [/FlateDecode]
>>
@@ -32496,10 +32398,10 @@ x
���J���J��특���x��x��x��+�!Êw�� B�x�b�x��+ށ�r�;�� 2��k�Μ�J�Y�e�Y��7+|��x� oS��7+[ƛețךyޢoV��浖 -㭌���"���R�W�*��4Xq��C�^J�[(��^�1�»�y]���k�}�YM-x ����V�z�����[YE�V�Y���_}/7�*�Y%��e�ӫq+��:��.�7�J���E�/�3Y(Y�*A�W R��VJS�����:(u@c��D�]a*��f)�9J���)�o, #�\�Z>M�U��\�jPS�
{HS��M���j����{fk���yG�m[z*E�sa��>�&�ӫ���j%u���; �2^���W�[���®�v�[���2�쯲u�[���P�:���V̡�Յ> �M��Bi2 .Ħ����ԇ!���d�k�`���=o� �qWޕwdJF(�L164�U��)�x0E�~��Z? �=��/����ί ���~:�o?$���������O
endstream
endobj
-326 0 obj
-[259 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 250 1000 1000 559 559 559 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 367 1000 1000 1000 1000 1000 1000 1000 1000 1000 543 612 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 458 1000 579 562 486 579 493 317 556 599 304 1000 1000 304 895 599 574 577 1000 467 463 368 599 538 1000 1000 527 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 10
<TRUNCATED>
[25/39] isis-site git commit: ISIS-1810: updates docs for 2.0.0-M1
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/274edd1d/content/versions/2.0.0-M1/guides/ugbtb/ugbtb.html
----------------------------------------------------------------------
diff --git a/content/versions/2.0.0-M1/guides/ugbtb/ugbtb.html b/content/versions/2.0.0-M1/guides/ugbtb/ugbtb.html
index cb599b2..c2b30bb 100644
--- a/content/versions/2.0.0-M1/guides/ugbtb/ugbtb.html
+++ b/content/versions/2.0.0-M1/guides/ugbtb/ugbtb.html
@@ -580,14 +580,14 @@ msgstr "Ich heisse {firstName} {lastName}."</code></pre>
<p>then the translation would be: "Ich heisse James Bond".</p>
</div>
<div class="paragraph">
- <p>The same class is used in <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_DomainObjectContainer"><code>DomainObjectContainer</code></a> so that you can raise translatable info, warning and error messages; each of the relevant methods are overloaded.</p>
+ <p>The same class is used in <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_MessageService"><code>MessageService</code></a> so that you can raise translatable info, warning and error messages; each of the relevant methods are overloaded.</p>
</div>
<div class="paragraph">
<p>For example:</p>
</div>
<div class="listingblock">
<div class="content">
- <pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">interface</span> <span class="class">DomainObjectContainer</span> {
+ <pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">interface</span> <span class="class">MessageService</span> {
<span class="type">void</span> informUser(<span class="predefined-type">String</span> message);
<span class="type">void</span> informUser(
TranslatableMessage message,
@@ -1497,7 +1497,7 @@ log4j.additivity.org.apache.isis.core.runtime.services.i18n.po.PotWriter=false</
<p>The framework provides default implementations for many of the <a href="../rgsvc/rgsvc.html">domain services</a>. This is convenient, but sometimes you will want to replace the default implementation with your own service implementation.</p>
</div>
<div class="paragraph">
- <p>For example, suppose you wanted to provide your own implementation of <a href="../rgsvc/rgsvc.html#_rgsvc_api_LocaleProvider"><code>LocaleProvider</code></a>. The trick is to use the <a href="../rgant/rgant.html#_rgant-DomainService_menuOrder"><code>@DomainService#menuOrder()</code></a> attribute, specifying a low number (typically <code>"1"</code>).</p>
+ <p>For example, suppose you wanted to provide your own implementation of <a href="../rgsvc/rgsvc.html#_rgsvc_presentation-layer-spi_LocaleProvider"><code>LocaleProvider</code></a>. The trick is to use the <a href="../rgant/rgant.html#_rgant-DomainService_menuOrder"><code>@DomainService#menuOrder()</code></a> attribute, specifying a low number (typically <code>"1"</code>).</p>
</div>
<div class="paragraph">
<p>Here’s how:</p>
@@ -2124,7 +2124,7 @@ serviceRegistry.injectServicesInto(viewModel);</code></pre>
<span class="keyword">if</span>(original != <span class="predefined-constant">null</span>) { <i class="conum" data-value="2"></i><b>(2)</b>
<span class="keyword">return</span> original;
}
- container.flush(); <i class="conum" data-value="3"></i><b>(3)</b>
+ repositoryService.flush(); <i class="conum" data-value="3"></i><b>(3)</b>
<span class="directive">final</span> BreadcrumbModelProvider wicketSession = <i class="conum" data-value="4"></i><b>(4)</b>
(BreadcrumbModelProvider) AuthenticatedWebSession.get();
@@ -2150,7 +2150,7 @@ serviceRegistry.injectServicesInto(viewModel);</code></pre>
<span class="annotation">@Inject</span>
HomePageProviderService homePageProviderService;
<span class="annotation">@Inject</span>
- DomainObjectContainer container;
+ RepositoryService repositoryService;
}</code></pre>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/isis-site/blob/274edd1d/content/versions/2.0.0-M1/guides/ugbtb/ugbtb.pdf
----------------------------------------------------------------------
diff --git a/content/versions/2.0.0-M1/guides/ugbtb/ugbtb.pdf b/content/versions/2.0.0-M1/guides/ugbtb/ugbtb.pdf
index 06567ed..f73aae5 100644
--- a/content/versions/2.0.0-M1/guides/ugbtb/ugbtb.pdf
+++ b/content/versions/2.0.0-M1/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:20180812182557+01'00')
-/ModDate (D:20180812182557+01'00')
+/CreationDate (D:20180814003931+02'00')
+/ModDate (D:20180814003931+02'00')
>>
endobj
2 0 obj
@@ -9941,7 +9941,7 @@ endobj
>>
endobj
73 0 obj
-<< /Length 24000
+<< /Length 23976
>>
stream
q
@@ -10023,7 +10023,7 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-0.117 Tw
+0.580 Tw
BT
48.24 687.9259999999999 Td
@@ -10038,12 +10038,12 @@ ET
0.694 0.129 0.275 scn
0.694 0.129 0.275 SCN
-0.117 Tw
+0.580 Tw
BT
-175.57476406249998 687.9259999999999 Td
+178.34996630859376 687.9259999999999 Td
/F3.0 10.5 Tf
-<446f6d61696e4f626a656374436f6e7461696e6572> Tj
+<4d65737361676553657276696365> Tj
ET
@@ -10053,12 +10053,12 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-0.117 Tw
+0.580 Tw
BT
-285.8247640625 687.9259999999999 Td
+251.84996630859376 687.9259999999999 Td
/F1.0 10.5 Tf
-[<20736f207468617420796f752063616e2072> 20.01953125 <61697365207472> 20.01953125 <616e736c617461626c6520696e666f2c207761726e696e6720616e64>] TJ
+[<20736f207468617420796f752063616e2072> 20.01953125 <61697365207472> 20.01953125 <616e736c617461626c6520696e666f2c207761726e696e6720616e64206572726f72>] TJ
ET
@@ -10071,7 +10071,7 @@ ET
BT
48.24 672.146 Td
/F1.0 10.5 Tf
-<6572726f72206d657373616765733b2065616368206f66207468652072656c6576616e74206d6574686f647320617265206f7665726c6f616465642e> Tj
+<6d657373616765733b2065616368206f66207468652072656c6576616e74206d6574686f647320617265206f7665726c6f616465642e> Tj
ET
0.000 0.000 0.000 SCN
@@ -10164,7 +10164,7 @@ ET
BT
152.74 605.725 Td
/F3.0 11 Tf
-<446f6d61696e4f626a656374436f6e7461696e6572> Tj
+<4d65737361676553657276696365> Tj
ET
0.000 0.000 0.000 SCN
@@ -10173,7 +10173,7 @@ ET
0.200 0.200 0.200 SCN
BT
-268.24 605.725 Td
+229.74 605.725 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -10184,7 +10184,7 @@ ET
0.200 0.200 0.200 SCN
BT
-273.74 605.725 Td
+235.24 605.725 Td
/F3.0 11 Tf
<7b> Tj
ET
@@ -11502,10 +11502,10 @@ endobj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
-/URI (../rgsvc/rgsvc.pdf#_rgsvc_core-domain-api_DomainObjectContainer)
+/URI (../rgsvc/rgsvc.pdf#_rgsvc_core-domain-api_MessageService)
>>
/Subtype /Link
-/Rect [175.57476406249998 686.4559999999999 285.8247640625 696.9559999999999]
+/Rect [178.34996630859376 686.4559999999999 251.84996630859376 696.9559999999999]
/Type /Annot
>>
endobj
@@ -28897,7 +28897,7 @@ endobj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
-/URI (../rgsvc/rgsvc.pdf#_rgsvc_api_LocaleProvider)
+/URI (../rgsvc/rgsvc.pdf#_rgsvc_presentation-layer-spi_LocaleProvider)
>>
/Subtype /Link
/Rect [423.1879753605769 697.8359999999999 496.6879753605769 708.3359999999999]
@@ -46506,7 +46506,7 @@ endobj
>>
endobj
247 0 obj
-<< /Length 50470
+<< /Length 50478
>>
stream
q
@@ -47328,7 +47328,7 @@ ET
BT
103.24000000000001 665.145 Td
/F3.0 11 Tf
-<636f6e7461696e6572> Tj
+<7265706f7369746f727953657276696365> Tj
ET
0.000 0.000 0.000 SCN
@@ -47337,7 +47337,7 @@ ET
0.200 0.200 0.200 SCN
BT
-152.74 665.145 Td
+196.74 665.145 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -47348,7 +47348,7 @@ ET
0.200 0.200 0.200 SCN
BT
-158.24 665.145 Td
+202.24 665.145 Td
/F3.0 11 Tf
<666c757368> Tj
ET
@@ -47359,7 +47359,7 @@ ET
0.200 0.200 0.200 SCN
BT
-185.74 665.145 Td
+229.74 665.145 Td
/F3.0 11 Tf
<28> Tj
ET
@@ -47370,7 +47370,7 @@ ET
0.200 0.200 0.200 SCN
BT
-191.24 665.145 Td
+235.24 665.145 Td
/F3.0 11 Tf
<29> Tj
ET
@@ -47381,7 +47381,7 @@ ET
0.200 0.200 0.200 SCN
BT
-196.74 665.145 Td
+240.74 665.145 Td
/F3.0 11 Tf
<3b> Tj
ET
@@ -47392,9 +47392,9 @@ ET
0.200 0.200 0.200 SCN
BT
-202.24 665.145 Td
+246.24 665.145 Td
/F3.0 11 Tf
-<202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020> Tj
+<20202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020> Tj
ET
0.000 0.000 0.000 SCN
@@ -49748,7 +49748,7 @@ ET
BT
81.24000000000001 281.9049999999998 Td
/F3.0 11 Tf
-<446f6d61696e4f626a656374436f6e7461696e6572> Tj
+<5265706f7369746f727953657276696365> Tj
ET
0.000 0.000 0.000 SCN
@@ -49757,7 +49757,7 @@ ET
0.200 0.200 0.200 SCN
BT
-196.74 281.9049999999998 Td
+174.74 281.9049999999998 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -49768,9 +49768,9 @@ ET
0.200 0.200 0.200 SCN
BT
-202.24 281.9049999999998 Td
+180.24 281.9049999999998 Td
/F3.0 11 Tf
-<636f6e7461696e6572> Tj
+<7265706f7369746f727953657276696365> Tj
ET
0.000 0.000 0.000 SCN
@@ -49779,7 +49779,7 @@ ET
0.200 0.200 0.200 SCN
BT
-251.74 281.9049999999998 Td
+273.74 281.9049999999998 Td
/F3.0 11 Tf
<3b> Tj
ET
@@ -92211,180 +92211,180 @@ xref
0000164737 00000 n
0000164993 00000 n
0000165199 00000 n
-0000189253 00000 n
-0000189536 00000 n
-0000189782 00000 n
-0000189838 00000 n
-0000190089 00000 n
-0000190145 00000 n
-0000190348 00000 n
-0000212172 00000 n
-0000212424 00000 n
-0000212479 00000 n
-0000221882 00000 n
-0000222138 00000 n
-0000222193 00000 n
-0000222416 00000 n
-0000233541 00000 n
-0000233767 00000 n
-0000244315 00000 n
-0000244541 00000 n
-0000255399 00000 n
-0000255662 00000 n
-0000255717 00000 n
-0000255938 00000 n
-0000256146 00000 n
-0000283768 00000 n
-0000284050 00000 n
-0000284306 00000 n
-0000284362 00000 n
-0000302998 00000 n
-0000303312 00000 n
-0000303527 00000 n
-0000303745 00000 n
-0000303974 00000 n
-0000304032 00000 n
-0000304090 00000 n
-0000304136 00000 n
-0000320664 00000 n
-0000320923 00000 n
-0000320980 00000 n
-0000321232 00000 n
-0000321289 00000 n
-0000321347 00000 n
-0000321405 00000 n
-0000321933 00000 n
-0000322531 00000 n
-0000334784 00000 n
-0000335038 00000 n
-0000335084 00000 n
-0000335141 00000 n
-0000369796 00000 n
-0000370129 00000 n
-0000370175 00000 n
-0000370357 00000 n
-0000370552 00000 n
-0000370757 00000 n
-0000371005 00000 n
-0000371062 00000 n
-0000371328 00000 n
-0000371590 00000 n
-0000371851 00000 n
-0000390197 00000 n
-0000390519 00000 n
-0000390565 00000 n
-0000390798 00000 n
-0000391028 00000 n
-0000391256 00000 n
-0000391470 00000 n
-0000409759 00000 n
-0000413716 00000 n
-0000420685 00000 n
-0000421017 00000 n
-0000421223 00000 n
-0000421280 00000 n
-0000421523 00000 n
-0000421736 00000 n
-0000421949 00000 n
-0000422190 00000 n
-0000422434 00000 n
-0000422647 00000 n
-0000450357 00000 n
-0000453926 00000 n
-0000454789 00000 n
-0000455042 00000 n
-0000472124 00000 n
-0000472431 00000 n
-0000472477 00000 n
-0000472683 00000 n
-0000472893 00000 n
-0000473108 00000 n
-0000473323 00000 n
-0000473538 00000 n
-0000473742 00000 n
-0000473799 00000 n
-0000473856 00000 n
-0000474082 00000 n
-0000484829 00000 n
-0000487984 00000 n
-0000488283 00000 n
-0000488479 00000 n
-0000488525 00000 n
-0000496824 00000 n
-0000497025 00000 n
-0000497229 00000 n
-0000506196 00000 n
-0000523248 00000 n
-0000523576 00000 n
-0000523777 00000 n
-0000533262 00000 n
-0000533472 00000 n
-0000533698 00000 n
-0000533912 00000 n
-0000534127 00000 n
-0000553106 00000 n
-0000553381 00000 n
-0000553427 00000 n
-0000553622 00000 n
-0000553852 00000 n
-0000554078 00000 n
-0000583622 00000 n
-0000583936 00000 n
-0000584178 00000 n
-0000584414 00000 n
-0000584645 00000 n
-0000584691 00000 n
-0000603900 00000 n
-0000604212 00000 n
-0000604258 00000 n
-0000604483 00000 n
-0000604540 00000 n
-0000604791 00000 n
-0000605045 00000 n
-0000605103 00000 n
-0000605350 00000 n
-0000605552 00000 n
-0000605743 00000 n
-0000621971 00000 n
-0000622254 00000 n
-0000622311 00000 n
-0000622515 00000 n
-0000622711 00000 n
-0000622969 00000 n
-0000623027 00000 n
-0000623699 00000 n
-0000623937 00000 n
-0000653996 00000 n
-0000654237 00000 n
-0000688989 00000 n
-0000689272 00000 n
-0000689474 00000 n
-0000689663 00000 n
-0000689720 00000 n
-0000689944 00000 n
-0000690189 00000 n
-0000730555 00000 n
-0000730809 00000 n
-0000730866 00000 n
-0000737582 00000 n
-0000767911 00000 n
-0000768202 00000 n
-0000768395 00000 n
-0000775147 00000 n
-0000775368 00000 n
-0000817246 00000 n
-0000817500 00000 n
-0000817558 00000 n
-0000827682 00000 n
-0000828005 00000 n
-0000828051 00000 n
-0000828108 00000 n
-0000828334 00000 n
-0000828391 00000 n
-0000828615 00000 n
-0000828790 00000 n
-0000829040 00000 n
-0000829258 00000 n
+0000189229 00000 n
+0000189512 00000 n
+0000189755 00000 n
+0000189811 00000 n
+0000190062 00000 n
+0000190118 00000 n
+0000190321 00000 n
+0000212145 00000 n
+0000212397 00000 n
+0000212452 00000 n
+0000221855 00000 n
+0000222111 00000 n
+0000222166 00000 n
+0000222389 00000 n
+0000233514 00000 n
+0000233740 00000 n
+0000244288 00000 n
+0000244514 00000 n
+0000255372 00000 n
+0000255635 00000 n
+0000255690 00000 n
+0000255911 00000 n
+0000256119 00000 n
+0000283741 00000 n
+0000284023 00000 n
+0000284279 00000 n
+0000284335 00000 n
+0000302971 00000 n
+0000303285 00000 n
+0000303500 00000 n
+0000303718 00000 n
+0000303947 00000 n
+0000304005 00000 n
+0000304063 00000 n
+0000304109 00000 n
+0000320637 00000 n
+0000320896 00000 n
+0000320953 00000 n
+0000321205 00000 n
+0000321262 00000 n
+0000321320 00000 n
+0000321378 00000 n
+0000321906 00000 n
+0000322504 00000 n
+0000334757 00000 n
+0000335011 00000 n
+0000335057 00000 n
+0000335114 00000 n
+0000369769 00000 n
+0000370102 00000 n
+0000370148 00000 n
+0000370330 00000 n
+0000370525 00000 n
+0000370730 00000 n
+0000370978 00000 n
+0000371035 00000 n
+0000371301 00000 n
+0000371563 00000 n
+0000371824 00000 n
+0000390170 00000 n
+0000390492 00000 n
+0000390538 00000 n
+0000390771 00000 n
+0000391001 00000 n
+0000391229 00000 n
+0000391443 00000 n
+0000409732 00000 n
+0000413689 00000 n
+0000420658 00000 n
+0000420990 00000 n
+0000421196 00000 n
+0000421253 00000 n
+0000421496 00000 n
+0000421709 00000 n
+0000421922 00000 n
+0000422163 00000 n
+0000422407 00000 n
+0000422620 00000 n
+0000450330 00000 n
+0000453899 00000 n
+0000454762 00000 n
+0000455015 00000 n
+0000472097 00000 n
+0000472404 00000 n
+0000472450 00000 n
+0000472656 00000 n
+0000472866 00000 n
+0000473081 00000 n
+0000473296 00000 n
+0000473511 00000 n
+0000473715 00000 n
+0000473772 00000 n
+0000473829 00000 n
+0000474055 00000 n
+0000484802 00000 n
+0000487957 00000 n
+0000488256 00000 n
+0000488452 00000 n
+0000488498 00000 n
+0000496797 00000 n
+0000496998 00000 n
+0000497202 00000 n
+0000506169 00000 n
+0000523221 00000 n
+0000523549 00000 n
+0000523750 00000 n
+0000533235 00000 n
+0000533445 00000 n
+0000533671 00000 n
+0000533885 00000 n
+0000534100 00000 n
+0000553079 00000 n
+0000553354 00000 n
+0000553400 00000 n
+0000553595 00000 n
+0000553844 00000 n
+0000554070 00000 n
+0000583614 00000 n
+0000583928 00000 n
+0000584170 00000 n
+0000584406 00000 n
+0000584637 00000 n
+0000584683 00000 n
+0000603892 00000 n
+0000604204 00000 n
+0000604250 00000 n
+0000604475 00000 n
+0000604532 00000 n
+0000604783 00000 n
+0000605037 00000 n
+0000605095 00000 n
+0000605342 00000 n
+0000605544 00000 n
+0000605735 00000 n
+0000621963 00000 n
+0000622246 00000 n
+0000622303 00000 n
+0000622507 00000 n
+0000622703 00000 n
+0000622961 00000 n
+0000623019 00000 n
+0000623691 00000 n
+0000623929 00000 n
+0000653988 00000 n
+0000654229 00000 n
+0000688981 00000 n
+0000689264 00000 n
+0000689466 00000 n
+0000689655 00000 n
+0000689712 00000 n
+0000689936 00000 n
+0000690181 00000 n
+0000730547 00000 n
+0000730801 00000 n
+0000730858 00000 n
+0000737574 00000 n
+0000767903 00000 n
+0000768194 00000 n
+0000768387 00000 n
+0000775139 00000 n
+0000775360 00000 n
+0000817238 00000 n
+0000817492 00000 n
+0000817550 00000 n
+0000827674 00000 n
+0000827997 00000 n
+0000828043 00000 n
+0000828100 00000 n
+0000828326 00000 n
+0000828383 00000 n
+0000828607 00000 n
+0000828782 00000 n
+0000829032 00000 n
+0000829250 00000 n
0000879783 00000 n
0000880024 00000 n
0000902064 00000 n
http://git-wip-us.apache.org/repos/asf/isis-site/blob/274edd1d/content/versions/2.0.0-M1/guides/ugfun/ugfun.html
----------------------------------------------------------------------
diff --git a/content/versions/2.0.0-M1/guides/ugfun/ugfun.html b/content/versions/2.0.0-M1/guides/ugfun/ugfun.html
index 9b6c6ff..1ce5993 100644
--- a/content/versions/2.0.0-M1/guides/ugfun/ugfun.html
+++ b/content/versions/2.0.0-M1/guides/ugfun/ugfun.html
@@ -1988,31 +1988,19 @@ table.CodeRay td.code>pre{padding:0}
<div class="ulist">
<ul>
<li> <p><strong>hide</strong> phase allows the subscriber to hide the member</p> </li>
- <li> <p><strong>disable</strong> phase allows the subscriber to disable the member.<br></p> </li>
- </ul>
- </div>
- <div class="paragraph">
- <p>For a property this makes it read-only; for an action this makes it "greyed out". (Collections are implicitly read-only).</p>
- </div>
- <div class="ulist">
- <ul>
- <li> <p><strong>validate</strong> phase allows the subscriber to validate the proposed change.</p> </li>
- </ul>
- </div>
- <div class="paragraph">
- <p>For a property this means validating the proposed new value of the property; for an action this means validating the action parameter arguments. For example, a referential integrity restrict could be implemented here.</p>
- </div>
- <div class="ulist">
- <ul>
- <li> <p><strong>executing</strong> phase is prior to the actual property edit/action invocation, allowing the subscriber to perform side-effects.<br></p> </li>
- </ul>
- </div>
- <div class="paragraph">
- <p>For example, a cascade delete could be implemented here.</p>
- </div>
- <div class="ulist">
- <ul>
- <li> <p><strong>executed</strong> phase is after the actual property edit/action invocation.<br></p>
+ <li> <p><strong>disable</strong> phase allows the subscriber to disable the member.</p>
+ <div class="paragraph">
+ <p>For a property this makes it read-only; for an action this makes it "greyed out". (Collections are implicitly read-only).</p>
+ </div> </li>
+ <li> <p><strong>validate</strong> phase allows the subscriber to validate the proposed change.</p>
+ <div class="paragraph">
+ <p>For a property this means validating the proposed new value of the property; for an action this means validating the action parameter arguments. For example, a referential integrity restrict could be implemented here.</p>
+ </div> </li>
+ <li> <p><strong>executing</strong> phase is prior to the actual property edit/action invocation, allowing the subscriber to perform side-effects.</p>
+ <div class="paragraph">
+ <p>For example, a cascade delete could be implemented here.</p>
+ </div> </li>
+ <li> <p><strong>executed</strong> phase is after the actual property edit/action invocation.</p>
<div class="paragraph">
<p>For example, a business audit event could be implemented here.</p>
</div> </li>
@@ -6854,19 +6842,16 @@ public <span class="type">class</span> <span class="class">ToDoItemV1_1</span> <
<p>When a domain object is rendered, the framework will automatically instantiate all required mixins and delegate to them dynamically. If writing integration tests or fixtures, or (sometimes) just regular domain logic, then you may need to instantiate mixins directly.</p>
</div>
<div class="paragraph">
- <p>For this you can use the xref:../rgsvc/rgsvc.adoc#_rgsvc_core-domain-api_DomainObjectContainer_object-creation-api[<code>DomainObjectContainer#mixin(…)</code> method.</p>
+ <p>For this you can use the xref:../rgsvc/rgsvc.adoc#_rgsvc_core-domain-api_FactoryService[<code>FactoryService#mixin(…)</code> method.</p>
</div>
<div class="paragraph">
<p>For example:</p>
</div>
<div class="listingblock">
<div class="content">
- <pre class="CodeRay highlight"><code data-lang="java">DocumentHolder_documents mixin = container.mixin(DocumentHolder_documents.class, customer);</code></pre>
+ <pre class="CodeRay highlight"><code data-lang="java">DocumentHolder_documents mixin = factoryService.mixin(DocumentHolder_documents.class, customer);</code></pre>
</div>
</div>
- <div class="paragraph">
- <p>The <a href="../ugtst/ugtst.html#__ugtst_integ-test-support_bootstrapping_IntegrationTestAbstract"><code>IntegrationTestAbstract</code></a> and <a href="../rgcms/rgcms.html#_rgcms_classes_super_FixtureScript"><code>FixtureScript</code></a> classes both provide a <code>mixin(…)</code> convenience method.</p>
- </div>
<div id="_ugfun_programming-model_mixins_contributed-services" class="paragraph">
<p>= Contributed services (deprecated)</p>
</div>
@@ -7552,14 +7537,17 @@ 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 (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>
+ <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).</p>
+ </div>
+ <div class="paragraph">
+ <p>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>
</table>
</div>
<div class="paragraph">
- <p>The framework also supports i18n: locale-specific names and descriptions. for more information, see the <a href="../ugbtb/ugbtb.html#_ugbtb_i18n">beyond-the-basics</a> guide.</p>
+ <p>The framework also supports i18n: locale-specific names and descriptions. For more information, see the <a href="../ugbtb/ugbtb.html#_ugbtb_i18n">beyond-the-basics</a> guide.</p>
</div>
<div id="_ugfun_ui-hints_eager-rendering" class="paragraph">
<p>= Eager rendering :Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. <a href="http://www.apache.org/licenses/LICENSE-2.0" class="bare">http://www.apache.org/licenses/LICENSE-2.0</a> . Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.</p>
@@ -7634,7 +7622,7 @@ public <span class="type">class</span> <span class="class">ToDoItemV1_1</span> <
<td class="icon"> <i class="fa icon-note" title="Note"></i> </td>
<td class="content">
<div class="paragraph">
- <p>The main domain services used are <a href="../rgsvc/rgsvc.html#_rgsvc_persistence-layer-api_RepositoryService"><code>RepositoryService</code></a> and <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_FactoryService"><code>FactoryService</code></a>. These (and some other services) replace the now deprecated <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_DomainObjectContainer"><code>DomainObjectContainer</code></a>.</p>
+ <p>The main domain services used are <a href="../rgsvc/rgsvc.html#_rgsvc_persistence-layer-api_RepositoryService"><code>RepositoryService</code></a> and <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_FactoryService"><code>FactoryService</code></a>.</p>
</div> </td>
</tr>
</tbody>
@@ -8410,18 +8398,11 @@ repositoryService.remove(customer);</code></pre>
</div>
<div class="ulist">
<ul>
- <li> <p><a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_DomainObjectContainer"><code>DomainObjectContainer</code></a>; mostly deprecated, replaced by:</p>
- <div class="ulist">
- <ul>
- <li> <p><a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_ClockService"><code>ClockService</code></a></p> </li>
- <li> <p><a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_ConfigurationService"><code>ConfigurationService</code></a></p> </li>
- <li> <p><a href="../rgsvc/rgsvc.html#_rgsvc_application-layer-api_MessageService"><code>MessageService</code></a></p> </li>
- <li> <p><a href="../rgsvc/rgsvc.html#_rgsvc_persistence-layer-api_RepositoryService"><code>RepositoryService</code></a></p> </li>
- <li> <p><a href="../rgsvc/rgsvc.html#_rgsvc_metadata-api_ServiceRegistry"><code>ServiceRegistry</code></a></p> </li>
- <li> <p><a href="../rgsvc/rgsvc.html#_rgsvc_application-layer-api_TitleService"><code>TitleService</code></a></p> </li>
- <li> <p><a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_UserService"><code>UserService</code></a></p> </li>
- </ul>
- </div> </li>
+ <li> <p><a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_ClockService"><code>ClockService</code></a></p> </li>
+ <li> <p><a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_ConfigurationService"><code>ConfigurationService</code></a></p> </li>
+ <li> <p><a href="../rgsvc/rgsvc.html#_rgsvc_persistence-layer-api_RepositoryService"><code>RepositoryService</code></a></p> </li>
+ <li> <p><a href="../rgsvc/rgsvc.html#_rgsvc_metadata-api_ServiceRegistry"><code>ServiceRegistry</code></a></p> </li>
+ <li> <p><a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_UserService"><code>UserService</code></a></p> </li>
<li> <p><a href="../rgsvc/rgsvc.html#_rgsvc_persistence-layer-api_IsisJdoSupport"><code>IsisJdoSupport</code></a></p> </li>
<li> <p><a href="../rgsvc/rgsvc.html#_rgsvc_application-layer-api_WrapperFactory"><code>WrapperFactory</code></a></p> </li>
<li> <p><a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_EventBusService"><code>EventBusService</code></a></p> </li>
@@ -8486,7 +8467,9 @@ repositoryService.remove(customer);</code></pre>
<li> <p><a href="../rgsvc/rgsvc.html#_rgsvc_application-layer-spi_HomePageProviderService"><code>HomePageProviderService</code></a></p> </li>
<li> <p><a href="../rgsvc/rgsvc.html#_rgsvc_presentation-layer-spi_HintStore"><code>HintStore</code></a> (SPI)</p> </li>
<li> <p><a href="../rgsvc/rgsvc.html#_rgsvc_metadata-api_LayoutService"><code>LayoutService</code></a></p> </li>
+ <li> <p><a href="../rgsvc/rgsvc.html#_rgsvc_application-layer-api_MessageService"><code>MessageService</code></a></p> </li>
<li> <p><a href="../rgsvc/rgsvc.html#_rgsvc_presentation-layer-spi_RoutingService"><code>RoutingService</code></a> (SPI)</p> </li>
+ <li> <p><a href="../rgsvc/rgsvc.html#_rgsvc_application-layer-api_TitleService"><code>TitleService</code></a></p> </li>
<li> <p><a href="../rgsvc/rgsvc.html#_rgsvc_presentation-layer-spi_UrlEncodingService"><code>UrlEncodingService</code></a> (SPI)</p> </li>
</ul>
</div>
[28/39] isis-site git commit: ISIS-1810: updates docs for 2.0.0-M1
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/274edd1d/content/versions/2.0.0-M1/guides/rgfis/rgfis.pdf
----------------------------------------------------------------------
diff --git a/content/versions/2.0.0-M1/guides/rgfis/rgfis.pdf b/content/versions/2.0.0-M1/guides/rgfis/rgfis.pdf
index 9b5283b..64cc14f 100644
--- a/content/versions/2.0.0-M1/guides/rgfis/rgfis.pdf
+++ b/content/versions/2.0.0-M1/guides/rgfis/rgfis.pdf
@@ -4,16 +4,16 @@
<< /Title (Framework Internal Services)
/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:20180812182503+01'00')
-/ModDate (D:20180812182503+01'00')
+/CreationDate (D:20180814003839+02'00')
+/ModDate (D:20180814003839+02'00')
>>
endobj
2 0 obj
<< /Type /Catalog
/Pages 3 0 R
/Names 14 0 R
-/Outlines 293 0 R
-/PageLabels 310 0 R
+/Outlines 292 0 R
+/PageLabels 309 0 R
/PageMode /UseOutlines
/OpenAction [7 0 R /FitH 842.89]
/ViewerPreferences << /DisplayDocTitle true
@@ -23,7 +23,7 @@ endobj
3 0 obj
<< /Type /Pages
/Count 22
-/Kids [7 0 R 10 0 R 12 0 R 36 0 R 57 0 R 65 0 R 70 0 R 75 0 R 82 0 R 94 0 R 106 0 R 110 0 R 120 0 R 141 0 R 151 0 R 164 0 R 171 0 R 200 0 R 215 0 R 225 0 R 229 0 R 237 0 R]
+/Kids [7 0 R 10 0 R 12 0 R 36 0 R 57 0 R 65 0 R 70 0 R 75 0 R 82 0 R 94 0 R 107 0 R 110 0 R 121 0 R 142 0 R 152 0 R 165 0 R 172 0 R 201 0 R 216 0 R 226 0 R 230 0 R 237 0 R]
>>
endobj
4 0 obj
@@ -80,11 +80,11 @@ endobj
<< /Type /Font
/BaseFont /AAAABU+NotoSerif
/Subtype /TrueType
-/FontDescriptor 312 0 R
+/FontDescriptor 311 0 R
/FirstChar 32
/LastChar 255
-/Widths 314 0 R
-/ToUnicode 313 0 R
+/Widths 313 0 R
+/ToUnicode 312 0 R
>>
endobj
9 0 obj
@@ -779,7 +779,7 @@ endobj
/F5.0 40 0 R
>>
>>
-/Annots [255 0 R 256 0 R 257 0 R 258 0 R 259 0 R 260 0 R 261 0 R 262 0 R 263 0 R 264 0 R 265 0 R 266 0 R 267 0 R 268 0 R 269 0 R 270 0 R 271 0 R 272 0 R 273 0 R 274 0 R 275 0 R 276 0 R 277 0 R 278 0 R 279 0 R 280 0 R 281 0 R 282 0 R 283 0 R 284 0 R 285 0 R 286 0 R 287 0 R 288 0 R 289 0 R 290 0 R 291 0 R]
+/Annots [254 0 R 255 0 R 256 0 R 257 0 R 258 0 R 259 0 R 260 0 R 261 0 R 262 0 R 263 0 R 264 0 R 265 0 R 266 0 R 267 0 R 268 0 R 269 0 R 270 0 R 271 0 R 272 0 R 273 0 R 274 0 R 275 0 R 276 0 R 277 0 R 278 0 R 279 0 R 280 0 R 281 0 R 282 0 R 283 0 R 284 0 R 285 0 R 286 0 R 287 0 R 288 0 R 289 0 R 290 0 R]
>>
endobj
11 0 obj
@@ -1465,7 +1465,7 @@ endobj
/F1.0 8 0 R
/F3.1 17 0 R
>>
-/XObject << /Stamp1 292 0 R
+/XObject << /Stamp1 291 0 R
>>
>>
/Annots [18 0 R 20 0 R 21 0 R 22 0 R 23 0 R 24 0 R 25 0 R 26 0 R 27 0 R 28 0 R 29 0 R 30 0 R 31 0 R 32 0 R 33 0 R 34 0 R]
@@ -1480,29 +1480,29 @@ endobj
>>
endobj
15 0 obj
-<< /Kids [156 0 R 157 0 R 231 0 R]
+<< /Kids [157 0 R 158 0 R 232 0 R]
>>
endobj
16 0 obj
<< /Type /Font
/BaseFont /AAAABV+NotoSerif-Bold
/Subtype /TrueType
-/FontDescriptor 316 0 R
+/FontDescriptor 315 0 R
/FirstChar 32
/LastChar 255
-/Widths 318 0 R
-/ToUnicode 317 0 R
+/Widths 317 0 R
+/ToUnicode 316 0 R
>>
endobj
17 0 obj
<< /Type /Font
/BaseFont /AAAABW+FontAwesome
/Subtype /TrueType
-/FontDescriptor 320 0 R
+/FontDescriptor 319 0 R
/FirstChar 32
/LastChar 255
-/Widths 322 0 R
-/ToUnicode 321 0 R
+/Widths 321 0 R
+/ToUnicode 320 0 R
>>
endobj
18 0 obj
@@ -3140,7 +3140,7 @@ endobj
/F4.0 39 0 R
/F5.0 40 0 R
>>
-/XObject << /Stamp1 292 0 R
+/XObject << /Stamp1 291 0 R
>>
>>
/Annots [38 0 R 41 0 R 42 0 R 43 0 R 44 0 R 45 0 R 46 0 R 47 0 R 48 0 R 49 0 R 50 0 R 51 0 R 52 0 R 54 0 R 55 0 R]
@@ -3164,22 +3164,22 @@ endobj
<< /Type /Font
/BaseFont /AAAABX+NotoSerif-Italic
/Subtype /TrueType
-/FontDescriptor 324 0 R
+/FontDescriptor 323 0 R
/FirstChar 32
/LastChar 255
-/Widths 326 0 R
-/ToUnicode 325 0 R
+/Widths 325 0 R
+/ToUnicode 324 0 R
>>
endobj
40 0 obj
<< /Type /Font
/BaseFont /AAAABY+mplus1mn-regular
/Subtype /TrueType
-/FontDescriptor 328 0 R
+/FontDescriptor 327 0 R
/FirstChar 32
/LastChar 255
-/Widths 330 0 R
-/ToUnicode 329 0 R
+/Widths 329 0 R
+/ToUnicode 328 0 R
>>
endobj
41 0 obj
@@ -4095,7 +4095,7 @@ endobj
/F5.0 40 0 R
>>
/XObject << /I1 62 0 R
-/Stamp1 292 0 R
+/Stamp1 291 0 R
>>
>>
/Annots [58 0 R 59 0 R 60 0 R 61 0 R 63 0 R]
@@ -5998,7 +5998,7 @@ endobj
/F5.0 40 0 R
/F5.1 67 0 R
>>
-/XObject << /Stamp1 292 0 R
+/XObject << /Stamp1 291 0 R
>>
>>
>>
@@ -6010,11 +6010,11 @@ endobj
<< /Type /Font
/BaseFont /AAAABZ+mplus1mn-regular
/Subtype /TrueType
-/FontDescriptor 332 0 R
+/FontDescriptor 331 0 R
/FirstChar 32
/LastChar 255
-/Widths 334 0 R
-/ToUnicode 333 0 R
+/Widths 333 0 R
+/ToUnicode 332 0 R
>>
endobj
68 0 obj
@@ -8250,7 +8250,7 @@ endobj
/F1.0 8 0 R
/F6.0 71 0 R
>>
-/XObject << /Stamp1 292 0 R
+/XObject << /Stamp1 291 0 R
>>
>>
/Annots [72 0 R 73 0 R]
@@ -8260,11 +8260,11 @@ endobj
<< /Type /Font
/BaseFont /AAAACA+mplus-1p-regular
/Subtype /TrueType
-/FontDescriptor 336 0 R
+/FontDescriptor 335 0 R
/FirstChar 32
/LastChar 255
-/Widths 338 0 R
-/ToUnicode 337 0 R
+/Widths 337 0 R
+/ToUnicode 336 0 R
>>
endobj
72 0 obj
@@ -8748,7 +8748,7 @@ endobj
/F2.0 16 0 R
>>
/XObject << /I2 79 0 R
-/Stamp1 292 0 R
+/Stamp1 291 0 R
>>
>>
/Annots [76 0 R 78 0 R 80 0 R]
@@ -9601,7 +9601,7 @@ endobj
/F2.0 16 0 R
>>
/XObject << /I3 83 0 R
-/Stamp1 292 0 R
+/Stamp1 291 0 R
>>
>>
/Annots [84 0 R 86 0 R 87 0 R 88 0 R 90 0 R 91 0 R 92 0 R]
@@ -9907,7 +9907,7 @@ endobj
>>
endobj
93 0 obj
-<< /Length 13089
+<< /Length 12110
>>
stream
q
@@ -10188,12 +10188,12 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-1.425 Tw
+1.216 Tw
BT
48.24 594.6860000000003 Td
/F1.0 10.5 Tf
-[<5468652064656661756c7420696d706c656d656e746174696f6e2067656e6572> 20.01953125 <6174657320726570726573656e746174696f6e73206163636f7264696e6720746f2074686520>] TJ
+[<5468652064656661756c7420696d706c656d656e746174696f6e7320756c74696d6174656c792067656e6572> 20.01953125 <61746520726570726573656e746174696f6e73206163636f7264696e6720746f2074686520>] TJ
ET
@@ -10203,27 +10203,27 @@ ET
0.259 0.545 0.792 scn
0.259 0.545 0.792 SCN
-1.425 Tw
+1.216 Tw
BT
-418.287716796875 594.6860000000003 Td
+471.8098294921875 594.6860000000003 Td
/F1.0 10.5 Tf
-<5265737466756c204f626a656374732073706563> Tj
+<5265737466756c204f626a65637473> 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
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
-1.425 Tw
+0.324 Tw
BT
-519.8270722656249 594.6860000000003 Td
+48.24 578.9060000000003 Td
/F1.0 10.5 Tf
-<2076312e302e> Tj
+<73706563> Tj
ET
@@ -10233,12 +10233,12 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-3.342 Tw
+0.324 Tw
BT
-48.24 578.9060000000003 Td
+70.19550000000001 578.9060000000003 Td
/F1.0 10.5 Tf
-<486f77657665722c20697420616c736f2064656c65676174657320746f2074686520> Tj
+<2076312e302e20486f77657665722c20697420616c736f2064656c65676174657320746f2074686520> Tj
ET
@@ -10248,10 +10248,10 @@ ET
0.694 0.129 0.275 scn
0.694 0.129 0.275 SCN
-3.342 Tw
+0.324 Tw
BT
-232.15281818181813 578.9060000000003 Td
+265.1613333333333 578.9060000000003 Td
/F5.0 10.5 Tf
<436f6e74656e744e65676f74696174696f6e53657276696365> Tj
ET
@@ -10263,12 +10263,12 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-3.342 Tw
+0.324 Tw
BT
-363.40281818181813 578.9060000000003 Td
+396.41133333333335 578.9060000000003 Td
/F1.0 10.5 Tf
-<2077686963682070726f76696465732061206d656368616e69736d20666f72> Tj
+<2077686963682070726f76696465732061206d656368616e69736d> Tj
ET
@@ -10278,45 +10278,42 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
+3.650 Tw
+
BT
48.24 563.1260000000003 Td
/F1.0 10.5 Tf
-<616c746572696e6720726570726573656e746174696f6e73206163636f7264696e6720746f20746865204854545020> Tj
+<666f7220616c746572696e6720726570726573656e746174696f6e73206163636f7264696e6720746f20746865204854545020> 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.650 Tw
+
BT
-285.3195 563.1260000000003 Td
+328.46954166666666 563.1260000000003 Td
/F5.0 10.5 Tf
<416363657074> Tj
ET
-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
-
-BT
-316.81950000000006 563.1260000000003 Td
-/F1.0 10.5 Tf
-<206865616465722e> 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
-0.616 Tw
+3.650 Tw
BT
-48.24 535.3460000000002 Td
+359.96954166666666 563.1260000000003 Td
/F1.0 10.5 Tf
-[<546865207072696e636970616c206d6f7469766174696f6e20697320746f20616c6c6f77206d6f726520666c657869626c6520726570726573656e746174696f6e7320746f2062652067656e6572> 20.01953125 <6174656420666f7220524553> 20.01953125 <5420636c69656e7473>] TJ
+<206865616465722e205468697320616c6c6f7773206d6f726520666c657869626c65> Tj
ET
@@ -10326,12 +10323,12 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-1.344 Tw
+2.856 Tw
BT
-48.24 519.5660000000003 Td
+48.24 547.3460000000003 Td
/F1.0 10.5 Tf
-[<74686174202870657268617073207468726f75676820746865697220757365206f662061206365727461696e204a617661736372697074206c696272> 20.01953125 <617279> 89.84375 <2c207361> 20.01953125 <7929206578706563742c206f72206174206c6561737420776f726b732062657374>] TJ
+[<726570726573656e746174696f6e7320746f2062652067656e6572> 20.01953125 <6174656420666f7220524553> 20.01953125 <5420636c69656e74732074686174202870657268617073207468726f75676820746865697220757365206f662061206365727461696e>] TJ
ET
@@ -10342,9 +10339,9 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24 503.7860000000003 Td
+48.24 531.5660000000003 Td
/F1.0 10.5 Tf
-<776974682c2061206365727461696e207374796c65206f6620726570726573656e746174696f6e2e> Tj
+[<4a617661736372697074206c696272> 20.01953125 <617279> 89.84375 <2c207361> 20.01953125 <7929206578706563742c206f72206174206c6561737420776f726b73206265737420776974682c2061206365727461696e207374796c65206f6620726570726573656e746174696f6e2e>] TJ
ET
0.000 0.000 0.000 SCN
@@ -10355,7 +10352,7 @@ ET
0.009 Tw
BT
-48.24 476.00600000000026 Td
+48.24 503.78600000000034 Td
/F1.0 10.5 Tf
[<496e20616c6c2074686572652061726520746872656520646f6d61696e20736572766963657320746861742063616e20696e666c75656e63652074686520726570726573656e746174696f6e732067656e6572> 20.01953125 <617465643a207468697320736572766963652c>] TJ
ET
@@ -10370,7 +10367,7 @@ ET
2.758 Tw
BT
-48.24 460.2260000000002 Td
+48.24 488.0060000000003 Td
ET
@@ -10383,7 +10380,7 @@ ET
2.758 Tw
BT
-48.24 460.2260000000002 Td
+48.24 488.0060000000003 Td
/F5.0 10.5 Tf
<436f6e74656e744e65676f74696174696f6e53657276696365> Tj
ET
@@ -10398,9 +10395,9 @@ ET
2.758 Tw
BT
-179.49 460.2260000000002 Td
+179.49 488.0060000000003 Td
/F1.0 10.5 Tf
-<616e642074686520> Tj
+<20616e642074686520> Tj
ET
@@ -10413,7 +10410,7 @@ ET
2.758 Tw
BT
-225.52499001736112 460.2260000000002 Td
+231.00223502604166 488.0060000000003 Td
/F5.0 10.5 Tf
<436f6e74656e744d617070696e6753657276696365> Tj
ET
@@ -10428,9 +10425,9 @@ ET
2.758 Tw
BT
-335.7749900173611 460.2260000000002 Td
+341.25223502604166 488.0060000000003 Td
/F1.0 10.5 Tf
-[<2e2020546865206469616772> 20.01953125 <616d2062656c6f772073686f777320686f77207468657365>] TJ
+[<2e20546865206469616772> 20.01953125 <616d2062656c6f772073686f777320686f77207468657365>] TJ
ET
@@ -10441,7 +10438,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24 444.44600000000025 Td
+48.24 472.22600000000034 Td
/F1.0 10.5 Tf
[<636f6c6c61626f72> 20.01953125 <6174653a>] TJ
ET
@@ -10451,10 +10448,10 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-0.946 Tw
+6.229 Tw
BT
-48.24 404.6660000000002 Td
+48.24 432.4460000000003 Td
/F1.0 10.5 Tf
<54686520> Tj
ET
@@ -10466,12 +10463,12 @@ ET
0.694 0.129 0.275 scn
0.694 0.129 0.275 SCN
-0.946 Tw
+6.229 Tw
BT
-70.60591167534722 404.6660000000002 Td
+75.8888125 432.4460000000003 Td
/F5.0 10.5 Tf
-<526570726573656e746174696f6e53657276696365466f725265737466756c4f626a65637473> Tj
+<526570726573656e746174696f6e53657276696365436f6e74656e744e65676f746961746f72> Tj
ET
@@ -10481,12 +10478,12 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-0.946 Tw
+6.229 Tw
BT
-270.1059116753472 404.6660000000002 Td
+275.3888125 432.4460000000003 Td
/F1.0 10.5 Tf
-[<206973207468652064656661756c7420696d706c656d656e746174696f6e206f66207468697320736572766963653b206c696b> 20.01953125 <6577697365>] TJ
+<206973207468652064656661756c7420696d706c656d656e746174696f6e206f662074686520746f702d6c6576656c> Tj
ET
@@ -10496,12 +10493,12 @@ ET
0.694 0.129 0.275 scn
0.694 0.129 0.275 SCN
-19.540 Tw
+0.567 Tw
BT
-48.24 388.8860000000002 Td
+48.24 416.6660000000003 Td
/F5.0 10.5 Tf
-<436f6e74656e744e65676f74696174696f6e5365727669636558526f446f6d61696e54797065> Tj
+<526570726573656e746174696f6e53657276696365> Tj
ET
@@ -10511,12 +10508,12 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-19.540 Tw
+0.567 Tw
BT
-247.74 388.8860000000002 Td
+158.49 416.6660000000003 Td
/F1.0 10.5 Tf
-<206973207468652064656661756c7420696d706c656d656e746174696f6e206f6620746865> Tj
+<2c20616e642069742064656c65676174657320746f206c697374206f6620696e6a656374696e6720> Tj
ET
@@ -10526,10 +10523,10 @@ ET
0.694 0.129 0.275 scn
0.694 0.129 0.275 SCN
-6.885 Tw
+0.567 Tw
BT
-48.24 373.1060000000002 Td
+338.32149999999996 416.6660000000003 Td
/F5.0 10.5 Tf
<436f6e74656e744e65676f74696174696f6e53657276696365> Tj
ET
@@ -10541,27 +10538,12 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-6.885 Tw
-
-BT
-179.49 373.1060000000002 Td
-/F1.0 10.5 Tf
-<2e2020496620796f7520696e73706563742074686520736f7572636520636f646520796f75d56c6c207365652074686174207468652064656661756c74> 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
-
-1.696 Tw
+0.567 Tw
BT
-48.24 357.32600000000025 Td
+469.57149999999996 416.6660000000003 Td
/F1.0 10.5 Tf
-[<696d706c656d656e746174696f6e206f6620746869732073657276696365d573207072696d61727920726573706f6e736962696c69747920697320746f2067656e6572> 20.01953125 <617465207468652064656661756c74205265737466756c204f626a65637473>] TJ
+<2073657276696365732e205573696e67> Tj
ET
@@ -10571,42 +10553,12 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-1.419 Tw
+1.966 Tw
BT
-48.24 341.5460000000002 Td
+48.24 400.8860000000003 Td
/F1.0 10.5 Tf
-[<726570726573656e746174696f6e732e20205468657265666f72652c20696620796f75207768617420796f752077616e7420746f20646f20697320746f2067656e6572> 20.01953125 <617465206120>] 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
-
-1.419 Tw
-
-BT
-424.8915529947916 341.5460000000002 Td
-/F4.0 10.5 Tf
-<646966666572656e74205f726570726573656e746174696f6e> 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
-
-0.398 Tw
-
-BT
-48.24 325.7660000000002 Td
-/F4.0 10.5 Tf
-[<7468656e20696e206d616e> 20.01953125 <79206361736573207265706c6163696e672065697468657220746869732073657276696365205f6f72>] TJ
+[<6120636861696e206f6620726573706f6e736962696c697479207061747465726e2c2069742072657475726e7320746865206669727374206e6f6e2d6e756c6c20726570726573656e746174696f6e2e2046> 40.0390625 <6f7220746865697220706172742c20746865>] TJ
ET
@@ -10616,12 +10568,12 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-0.398 Tw
+2.077 Tw
BT
-299.8959211237981 325.7660000000002 Td
+48.24 385.10600000000034 Td
/F1.0 10.5 Tf
-<2074686520> Tj
+<696d706c656d656e746174696f6e73206f6620> Tj
ET
@@ -10631,10 +10583,10 @@ ET
0.694 0.129 0.275 scn
0.694 0.129 0.275 SCN
-0.398 Tw
+2.077 Tw
BT
-322.10145267427885 325.7660000000002 Td
+152.8472645596591 385.10600000000034 Td
/F5.0 10.5 Tf
<436f6e74656e744e65676f74696174696f6e53657276696365> Tj
ET
@@ -10646,12 +10598,12 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-0.398 Tw
+2.077 Tw
BT
-453.35145267427885 325.7660000000002 Td
+284.0972645596591 385.10600000000034 Td
/F1.0 10.5 Tf
-<2077696c6c206265206571756976616c656e74> Tj
+[<207573652074686520485454502041> 20.01953125 <63636570742068656164657220746f2064657465726d696e652069662074686579>] TJ
ET
@@ -10662,9 +10614,9 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24 309.9860000000002 Td
+48.24 369.3260000000003 Td
/F1.0 10.5 Tf
-<28796f75d56c6c206e6f74696365207468617420746865697220535049732061726520766572792073696d696c6172292e> Tj
+[<73686f756c642072656e64657220616e> 20.01953125 <7920726570726573656e746174696f6e206f72206a7573742072657475726e206e756c6c2e>] TJ
ET
0.000 0.000 0.000 SCN
@@ -10673,7 +10625,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24 275.48600000000016 Td
+48.24 334.8260000000003 Td
/F2.0 13 Tf
<322e322e312e20535049> Tj
ET
@@ -10684,7 +10636,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24 248.92600000000016 Td
+48.24 308.2660000000003 Td
/F1.0 10.5 Tf
[<5468652053504920646566696e65642062> 20.01953125 <79207468697320736572766963652069733a>] TJ
ET
@@ -10724,12 +10676,11 @@ endobj
/Font << /F2.0 16 0 R
/F1.0 8 0 R
/F5.0 40 0 R
-/F4.0 39 0 R
>>
-/XObject << /Stamp1 292 0 R
+/XObject << /Stamp1 291 0 R
>>
>>
-/Annots [96 0 R 97 0 R 99 0 R 100 0 R 101 0 R 102 0 R 103 0 R]
+/Annots [96 0 R 97 0 R 99 0 R 100 0 R 101 0 R 102 0 R 103 0 R 104 0 R]
>>
endobj
95 0 obj
@@ -10778,7 +10729,7 @@ endobj
/URI (http://restfulobjects.org)
>>
/Subtype /Link
-/Rect [418.287716796875 591.6200000000002 519.8270722656249 605.9000000000003]
+/Rect [471.8098294921875 591.6200000000002 547.04 605.9000000000003]
/Type /Annot
>>
endobj
@@ -10786,10 +10737,10 @@ endobj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
-/URI (../rgfis/rgfis.pdf#_rgfis_presentation-layer_ContentNegotiationService)
+/URI (http://restfulobjects.org)
>>
/Subtype /Link
-/Rect [232.15281818181813 577.4360000000003 363.40281818181813 587.9360000000003]
+/Rect [48.24 575.8400000000003 70.19550000000001 590.1200000000003]
/Type /Annot
>>
endobj
@@ -10800,7 +10751,7 @@ endobj
/URI (../rgfis/rgfis.pdf#_rgfis_presentation-layer_ContentNegotiationService)
>>
/Subtype /Link
-/Rect [48.24 458.7560000000002 179.49 469.2560000000002]
+/Rect [265.1613333333333 577.4360000000003 396.41133333333335 587.9360000000003]
/Type /Annot
>>
endobj
@@ -10808,18 +10759,29 @@ endobj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
-/URI (../rgsvc/rgsvc.pdf#_rgsvc_presentation-layer-spi_ContentMappingService)
+/URI (../rgfis/rgfis.pdf#_rgfis_presentation-layer_ContentNegotiationService)
>>
/Subtype /Link
-/Rect [225.52499001736112 458.7560000000002 335.7749900173611 469.2560000000002]
+/Rect [48.24 486.5360000000003 179.49 497.0360000000003]
/Type /Annot
>>
endobj
104 0 obj
-[94 0 R /XYZ 0 294.1700000000002 null]
+<< /Border [0 0 0]
+/A << /Type /Action
+/S /URI
+/URI (../rgsvc/rgsvc.pdf#_rgsvc_presentation-layer-spi_ContentMappingService)
+>>
+/Subtype /Link
+/Rect [231.00223502604166 486.5360000000003 341.25223502604166 497.0360000000003]
+/Type /Annot
+>>
endobj
105 0 obj
-<< /Length 30025
+[94 0 R /XYZ 0 353.51000000000033 null]
+endobj
+106 0 obj
+<< /Length 29646
>>
stream
q
@@ -12389,7 +12351,7 @@ ET
BT
64.809 426.9059999999999 Td
/F1.0 10.5 Tf
-[<726570726573656e746174696f6e206f6620612073696e676c65206f626a6563742c206173207065722073656374696f6e2031342e34206f66207468652052> 20.01953125 <4f20737065632c2076312e30>] TJ
+[<726570726573656e746174696f6e206f6620612073696e676c65206f626a6563742c206567206173207065722073656374696f6e2031342e34206f66207468652052> 20.01953125 <4f20737065632c2076312e30>] TJ
ET
0.000 0.000 0.000 SCN
@@ -12411,7 +12373,7 @@ ET
BT
64.809 405.1259999999999 Td
/F1.0 10.5 Tf
-[<726570726573656e746174696f6e206f6620612073696e676c652070726f7065727479206f6620616e206f626a6563742c206173207065722073656374696f6e2031362e34206f66207468652052> 20.01953125 <4f20737065632076312e30>] TJ
+[<726570726573656e746174696f6e206f6620612073696e676c652070726f7065727479206f6620616e206f626a6563742c206567206173207065722073656374696f6e2031362e34206f66207468652052> 20.01953125 <4f20737065632076312e30>] TJ
ET
0.000 0.000 0.000 SCN
@@ -12433,7 +12395,7 @@ ET
BT
64.809 383.34599999999995 Td
/F1.0 10.5 Tf
-[<726570726573656e746174696f6e206f6620612073696e676c6520636f6c6c656374696f6e206f6620616e206f626a6563742c206173207065722073656374696f6e2031372e35206f66207468652052> 20.01953125 <4f20737065632076312e30>] TJ
+[<726570726573656e746174696f6e206f6620612073696e676c6520636f6c6c656374696f6e206f6620616e206f626a6563742c206567206173207065722073656374696f6e2031372e35206f66207468652052> 20.01953125 <4f20737065632076312e30>] TJ
ET
0.000 0.000 0.000 SCN
@@ -12455,7 +12417,7 @@ ET
BT
64.809 361.566 Td
/F1.0 10.5 Tf
-[<726570726573656e746174696f6e206f6620612073696e676c6520616374696f6e202870726f6d707429206f6620616e206f626a6563742c206173207065722073656374696f6e2031382e32206f66207468652052> 20.01953125 <4f20737065632076312e30>] TJ
+[<726570726573656e746174696f6e206f6620612073696e676c6520616374696f6e202870726f6d707429206f6620616e206f626a6563742c206567206173207065722073656374696f6e2031382e32206f66207468652052> 20.01953125 <4f20737065632076312e30>] TJ
ET
0.000 0.000 0.000 SCN
@@ -12474,10 +12436,25 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
+0.792 Tw
+
BT
64.809 339.786 Td
/F1.0 10.5 Tf
-[<726570726573656e746174696f6e206f662074686520726573756c7473206f6620612073696e676c6520616374696f6e20696e766f636174696f6e2c206173207065722073656374696f6e2031392e35206f66207468652052> 20.01953125 <4f20737065632076312e30>] TJ
+[<726570726573656e746174696f6e206f662074686520726573756c7473206f6620612073696e676c6520616374696f6e20696e766f636174696f6e2c206567206173207065722073656374696f6e2031392e35206f66207468652052> 20.01953125 <4f2073706563>] 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
+
+BT
+64.809 324.006 Td
+/F1.0 10.5 Tf
+<76312e30> Tj
ET
0.000 0.000 0.000 SCN
@@ -12486,7 +12463,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.239999999999995 312.00600000000003 Td
+48.239999999999995 296.226 Td
/F1.0 10.5 Tf
<5468657365206d6574686f64732070726f766964653a> Tj
ET
@@ -12499,7 +12476,7 @@ ET
0.200 0.200 0.200 SCN
BT
-56.8805 284.22600000000006 Td
+56.8805 268.44599999999997 Td
/F1.0 10.5 Tf
<a5> Tj
ET
@@ -12514,7 +12491,7 @@ ET
0.642 Tw
BT
-66.24 284.22600000000006 Td
+66.24 268.44599999999997 Td
/F1.0 10.5 Tf
<6120> Tj
ET
@@ -12529,7 +12506,7 @@ ET
0.642 Tw
BT
-75.50240909090908 284.22600000000006 Td
+75.50240909090908 268.44599999999997 Td
/F5.0 10.5 Tf
<52656e6465726572436f6e74657874> Tj
ET
@@ -12544,7 +12521,7 @@ ET
0.642 Tw
BT
-154.25240909090908 284.22600000000006 Td
+154.25240909090908 268.44599999999997 Td
/F1.0 10.5 Tf
<2077686963682070726f76696465732061636365737320746f20726571756573742d737065636966696320636f6e746578742028656720485454502068656164657273292c2073657373696f6e2d> Tj
ET
@@ -12557,7 +12534,7 @@ ET
0.200 0.200 0.200 SCN
BT
-66.24 268.446 Td
+66.24 252.66599999999997 Td
/F1.0 10.5 Tf
[<737065636966696320636f6e74657874202865672061757468656e7469636174696f6e2920616e6420676c6f62616c20636f6e746578742028656720636f6e6669677572> 20.01953125 <6174696f6e2073657474696e677329>] TJ
ET
@@ -12570,7 +12547,7 @@ ET
0.200 0.200 0.200 SCN
BT
-56.8805 246.66600000000005 Td
+56.8805 230.88599999999997 Td
/F1.0 10.5 Tf
<a5> Tj
ET
@@ -12583,7 +12560,7 @@ ET
0.200 0.200 0.200 SCN
BT
-66.24 246.66600000000005 Td
+66.24 230.88599999999997 Td
/F1.0 10.5 Tf
<616e206f626a65637420726570726573656e74696e672074686520696e666f726d6174696f6e20746f2062652072656e6465726564> Tj
ET
@@ -12594,7 +12571,7 @@ ET
0.200 0.200 0.200 SCN
BT
-66.24 218.88600000000005 Td
+66.24 203.10599999999997 Td
/F1.0 10.5 Tf
<656720> Tj
ET
@@ -12605,7 +12582,7 @@ ET
0.694 0.129 0.275 SCN
BT
-80.226 218.88600000000005 Td
+80.226 203.10599999999997 Td
/F5.0 10.5 Tf
<4f626a65637441646170746572> Tj
ET
@@ -12616,7 +12593,7 @@ ET
0.200 0.200 0.200 SCN
BT
-148.476 218.88600000000005 Td
+148.476 203.10599999999997 Td
/F1.0 10.5 Tf
<2c20> Tj
ET
@@ -12627,7 +12604,7 @@ ET
0.694 0.129 0.275 SCN
BT
-153.82049999999998 218.88600000000005 Td
+153.82049999999998 203.10599999999997 Td
/F5.0 10.5 Tf
<4f626a656374416e6450726f7065727479> Tj
ET
@@ -12638,7 +12615,7 @@ ET
0.200 0.200 0.200 SCN
BT
-243.07049999999998 218.88600000000005 Td
+243.07049999999998 203.10599999999997 Td
/F1.0 10.5 Tf
<2c20> Tj
ET
@@ -12649,7 +12626,7 @@ ET
0.694 0.129 0.275 SCN
BT
-248.41500000000002 218.88600000000005 Td
+248.41500000000002 203.10599999999997 Td
/F5.0 10.5 Tf
<4f626a656374416e64436f6c6c656374696f6e> Tj
ET
@@ -12660,7 +12637,7 @@ ET
0.200 0.200 0.200 SCN
BT
-348.165 218.88600000000005 Td
+348.165 203.10599999999997 Td
/F1.0 10.5 Tf
<20657463> Tj
ET
@@ -12673,7 +12650,7 @@ ET
0.200 0.200 0.200 SCN
BT
-56.8805 191.10600000000005 Td
+56.8805 175.32599999999996 Td
/F1.0 10.5 Tf
<a5> Tj
ET
@@ -12686,7 +12663,7 @@ ET
0.200 0.200 0.200 SCN
BT
-66.24 191.10600000000005 Td
+66.24 175.32599999999996 Td
/F1.0 10.5 Tf
<666f72206d656d626572732c20776865746865722074686520726570726573656e746174696f6e20697320696e20726561642f7772697465206d6f6465> Tj
ET
@@ -12697,7 +12674,7 @@ ET
0.200 0.200 0.200 SCN
BT
-66.24 163.32600000000005 Td
+66.24 147.54599999999996 Td
/F1.0 10.5 Tf
<696520> Tj
ET
@@ -12708,7 +12685,7 @@ ET
0.694 0.129 0.275 SCN
BT
-77.92649999999999 163.32600000000005 Td
+77.92649999999999 147.54599999999996 Td
/F5.0 10.5 Tf
<4d656d626572526570724d6f6465> Tj
ET
@@ -12719,7 +12696,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.239999999999995 122.82600000000004 Td
+48.239999999999995 107.04599999999996 Td
/F2.0 13 Tf
<322e322e322e20496d706c656d656e746174696f6e> Tj
ET
@@ -12732,7 +12709,7 @@ ET
7.977 Tw
BT
-48.239999999999995 96.26600000000003 Td
+48.239999999999995 80.48599999999998 Td
/F1.0 10.5 Tf
[<41732064697363757373656420696e2074686520696e74726f64756374696f6e2c20746865206672> 20.01953125 <616d65776f726b2070726f766964657320612064656661756c7420696d706c656d656e746174696f6e2c>] TJ
ET
@@ -12744,10 +12721,10 @@ ET
0.694 0.129 0.275 scn
0.694 0.129 0.275 SCN
-10.676 Tw
+19.606 Tw
BT
-48.239999999999995 80.48600000000003 Td
+48.239999999999995 64.70599999999997 Td
/F5.0 10.5 Tf
<6f2e612e692e762e726f2e72656e646572696e672e736572766963652e526570726573656e746174696f6e53657276696365436f6e74656e744e65676f746961746f72> Tj
ET
@@ -12759,42 +12736,12 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-10.676 Tw
-
-BT
-399.99 80.48600000000003 Td
-/F1.0 10.5 Tf
-<2e202020546869732064656c65676174657320746f> 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
-
-0.368 Tw
-
-BT
-48.239999999999995 64.70600000000003 Td
-/F5.0 10.5 Tf
-<436f6e74656e744e65676f74696174696f6e53657276696365> 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
-
-0.368 Tw
+19.606 Tw
BT
-179.49 64.70600000000003 Td
+399.99 64.70599999999997 Td
/F1.0 10.5 Tf
-[<20746f2067656e6572> 20.01953125 <61746520616e20616c7465726e617469766520726570726573656e746174696f6e3b20627574206966206e6f6e652069732070726f7669646564207468656e206974>] TJ
+<2e20546869732064656c65676174657320746f> Tj
ET
@@ -12825,49 +12772,67 @@ Q
endstream
endobj
-106 0 obj
+107 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 105 0 R
+/Contents 106 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/Font << /F5.0 40 0 R
/F5.1 67 0 R
/F1.0 8 0 R
/F2.0 16 0 R
>>
-/XObject << /Stamp1 292 0 R
+/XObject << /Stamp1 291 0 R
>>
>>
-/Annots [108 0 R]
>>
endobj
-107 0 obj
-[106 0 R /XYZ 0 141.51000000000005 null]
-endobj
108 0 obj
-<< /Border [0 0 0]
-/A << /Type /Action
-/S /URI
-/URI (../rgfis/rgfis.pdf#_rgfis_presentation-layer_ContentNegotiationService)
->>
-/Subtype /Link
-/Rect [48.239999999999995 63.23600000000003 179.49 73.73600000000003]
-/Type /Annot
->>
+[107 0 R /XYZ 0 125.72999999999996 null]
endobj
109 0 obj
-<< /Length 6264
+<< /Length 6778
>>
stream
q
/DeviceRGB cs
-0.200 0.200 0.200 scn
+0.694 0.129 0.275 scn
/DeviceRGB CS
-0.200 0.200 0.200 SCN
+0.694 0.129 0.275 SCN
+
+0.368 Tw
BT
48.24 794.6759999999999 Td
+/F5.0 10.5 Tf
+<436f6e74656e744e65676f74696174696f6e53657276696365> 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
+
+0.368 Tw
+
+BT
+179.49 794.6759999999999 Td
+/F1.0 10.5 Tf
+[<20746f2067656e6572> 20.01953125 <61746520616e20616c7465726e617469766520726570726573656e746174696f6e3b20627574206966206e6f6e652069732070726f7669646564207468656e206974>] 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
+
+BT
+48.24 778.896 Td
/F1.0 10.5 Tf
[<66616c6c73206261636b206f6e2067656e6572> 20.01953125 <6174696e672074686520726570726573656e746174696f6e7320617320646566696e656420696e2074686520>] TJ
ET
@@ -12878,7 +12843,7 @@ ET
0.259 0.545 0.792 SCN
BT
-356.383294921875 794.6759999999999 Td
+356.383294921875 778.896 Td
/F1.0 10.5 Tf
<5265737466756c204f626a656374732073706563> Tj
ET
@@ -12889,7 +12854,7 @@ ET
0.200 0.200 0.200 SCN
BT
-455.072794921875 794.6759999999999 Td
+455.072794921875 778.896 Td
/F1.0 10.5 Tf
<2076312e302e> Tj
ET
@@ -12902,7 +12867,7 @@ ET
1.712 Tw
BT
-48.24 766.896 Td
+48.24 751.116 Td
/F1.0 10.5 Tf
[<54> 29.78515625 <6f2075736520616e20616c7465726e617469766520696d706c656d656e746174696f6e2c2075736520>] TJ
ET
@@ -12917,7 +12882,7 @@ ET
1.712 Tw
BT
-271.49670234375 766.896 Td
+271.49670234375 751.116 Td
/F5.0 10.5 Tf
<40446f6d61696e536572766963654c61796f7574236d656e754f726465722829> Tj
ET
@@ -12932,7 +12897,7 @@ ET
1.712 Tw
BT
-439.49670234375003 766.896 Td
+439.49670234375003 751.116 Td
/F1.0 10.5 Tf
<20286173206578706c61696e656420696e20746865> Tj
ET
@@ -12945,7 +12910,7 @@ ET
0.259 0.545 0.792 SCN
BT
-48.24 751.116 Td
+48.24 735.336 Td
/F1.0 10.5 Tf
<696e74726f64756374696f6e> Tj
ET
@@ -12956,7 +12921,7 @@ ET
0.200 0.200 0.200 SCN
BT
-111.19800000000001 751.116 Td
+111.19800000000001 735.336 Td
/F1.0 10.5 Tf
<20746f2074686973206775696465292e> Tj
ET
@@ -12967,7 +12932,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24 716.6160000000001 Td
+48.24 700.8360000000001 Td
/F2.0 13 Tf
<322e322e332e205265676973746572696e6720746865205365727669636573> Tj
ET
@@ -12980,7 +12945,7 @@ ET
1.855 Tw
BT
-48.24 690.0560000000002 Td
+48.24 674.2760000000002 Td
/F1.0 10.5 Tf
<417373756d696e6720746861742074686520> Tj
ET
@@ -12995,7 +12960,7 @@ ET
1.855 Tw
BT
-147.09779999999998 690.0560000000002 Td
+147.09779999999998 674.2760000000002 Td
/F5.0 10.5 Tf
<636f6e66696775726174696f6e2d616e642d616e6e6f746174696f6e> Tj
ET
@@ -13010,7 +12975,7 @@ ET
1.855 Tw
BT
-294.0978 690.0560000000002 Td
+294.0978 674.2760000000002 Td
/F1.0 10.5 Tf
<20736572766963657320696e7374616c6c657220697320636f6e666967757265642028696d706c69636974206966207573696e67> Tj
ET
@@ -13025,7 +12990,7 @@ ET
8.605 Tw
BT
-48.24 674.2760000000002 Td
+48.24 658.4960000000002 Td
/F1.0 10.5 Tf
<74686520> Tj
ET
@@ -13040,7 +13005,7 @@ ET
8.605 Tw
BT
-75.5350186434659 674.2760000000002 Td
+75.5350186434659 658.4960000000002 Td
/F5.0 10.5 Tf
<4170704d616e6966657374> Tj
ET
@@ -13055,7 +13020,7 @@ ET
8.605 Tw
BT
-133.28501864346592 674.2760000000002 Td
+133.28501864346592 658.4960000000002 Td
/F1.0 10.5 Tf
<20746f20> Tj
ET
@@ -13070,7 +13035,7 @@ ET
8.605 Tw
BT
-165.6885559303977 674.2760000000002 Td
+165.6885559303977 658.4960000000002 Td
/F1.0 10.5 Tf
[<626f6f74737472> 20.01953125 <61702074686520617070>] TJ
ET
@@ -13085,7 +13050,7 @@ ET
8.605 Tw
BT
-270.83588813920454 674.2760000000002 Td
+270.83588813920454 658.4960000000002 Td
/F1.0 10.5 Tf
<29207468656e204170616368652049736973272064656661756c7420696d706c656d656e746174696f6e206f66> Tj
ET
@@ -13100,7 +13065,7 @@ ET
4.722 Tw
BT
-48.24 658.4960000000002 Td
+48.24 642.7160000000002 Td
/F5.0 10.5 Tf
<526570726573656e746174696f6e53657276696365> Tj
ET
@@ -13115,7 +13080,7 @@ ET
4.722 Tw
BT
-158.49 658.4960000000002 Td
+158.49 642.7160000000002 Td
/F1.0 10.5 Tf
<2073657276696365206973206175746f6d61746963616c6c79207265676973746572656420616e6420696e6a65637465642028697420697320616e6e6f74617465642077697468> Tj
ET
@@ -13128,7 +13093,7 @@ ET
0.694 0.129 0.275 SCN
BT
-48.24 642.7160000000002 Td
+48.24 626.9360000000003 Td
/F5.0 10.5 Tf
<40446f6d61696e53657276696365> Tj
ET
@@ -13139,7 +13104,7 @@ ET
0.200 0.200 0.200 SCN
BT
-121.74000000000001 642.7160000000002 Td
+121.74000000000001 626.9360000000003 Td
/F1.0 10.5 Tf
[<2920736f206e6f206675727468657220636f6e6669677572> 20.01953125 <6174696f6e2069732072657175697265642e>] TJ
ET
@@ -13150,7 +13115,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24 608.2160000000002 Td
+48.24 592.4360000000003 Td
/F2.0 13 Tf
<322e322e342e2052656c61746564205365727669636573> Tj
ET
@@ -13163,7 +13128,7 @@ ET
0.564 Tw
BT
-48.24 581.6560000000003 Td
+48.24 565.8760000000003 Td
/F1.0 10.5 Tf
<5468652064656661756c7420696d706c656d656e746174696f6e2064656c65676174657320746f20> Tj
ET
@@ -13178,7 +13143,7 @@ ET
0.564 Tw
BT
-255.4218125 581.6560000000003 Td
+255.4218125 565.8760000000003 Td
/F5.0 10.5 Tf
<436f6e74656e744e65676f74696174696f6e53657276696365> Tj
ET
@@ -13193,7 +13158,7 @@ ET
0.564 Tw
BT
-386.6718125 581.6560000000003 Td
+386.6718125 565.8760000000003 Td
/F1.0 10.5 Tf
<2c2077686f73652064656661756c7420696d706c656d656e746174696f6e> Tj
ET
@@ -13206,7 +13171,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24 565.8760000000003 Td
+48.24 550.0960000000003 Td
/F1.0 10.5 Tf
[<6d61> 20.01953125 <792064656c656761746520696e207475726e20746f20>] TJ
ET
@@ -13217,7 +13182,7 @@ ET
0.694 0.129 0.275 SCN
BT
-167.099794921875 565.8760000000003 Td
+167.099794921875 550.0960000000003 Td
/F5.0 10.5 Tf
<436f6e74656e744d617070696e6753657276696365> Tj
ET
@@ -13228,7 +13193,7 @@ ET
0.200 0.200 0.200 SCN
BT
-277.349794921875 565.8760000000003 Td
+277.349794921875 550.0960000000003 Td
/F1.0 10.5 Tf
<202869662070726573656e74292e> Tj
ET
@@ -13265,24 +13230,24 @@ endobj
/MediaBox [0 0 595.28 841.89]
/Contents 109 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F1.0 8 0 R
-/F5.0 40 0 R
+/Font << /F5.0 40 0 R
+/F1.0 8 0 R
/F2.0 16 0 R
>>
-/XObject << /Stamp1 292 0 R
+/XObject << /Stamp1 291 0 R
>>
>>
-/Annots [111 0 R 112 0 R 113 0 R 115 0 R 117 0 R 118 0 R]
+/Annots [111 0 R 112 0 R 113 0 R 114 0 R 116 0 R 118 0 R 119 0 R]
>>
endobj
111 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
-/URI (http://restfulobjects.org)
+/URI (../rgfis/rgfis.pdf#_rgfis_presentation-layer_ContentNegotiationService)
>>
/Subtype /Link
-/Rect [356.383294921875 791.6099999999999 455.072794921875 805.89]
+/Rect [48.24 793.2059999999999 179.49 803.7059999999999]
/Type /Annot
>>
endobj
@@ -13290,10 +13255,10 @@ endobj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
-/URI (../rgant/rgant.pdf#_rgant-DomainServiceLayout_menuOrder)
+/URI (http://restfulobjects.org)
>>
/Subtype /Link
-/Rect [271.49670234375 765.4259999999999 439.49670234375003 775.9259999999999]
+/Rect [356.383294921875 775.8299999999999 455.072794921875 790.11]
/Type /Annot
>>
endobj
@@ -13301,53 +13266,64 @@ endobj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
-/URI (../rgsvc/rgsvc.pdf#__rgsvc_intro_overriding-the-services)
+/URI (../rgant/rgant.pdf#_rgant-DomainServiceLayout_menuOrder)
>>
/Subtype /Link
-/Rect [48.24 748.05 111.19800000000001 762.33]
+/Rect [271.49670234375 749.646 439.49670234375003 760.146]
/Type /Annot
>>
endobj
114 0 obj
-[110 0 R /XYZ 0 735.3000000000001 null]
+<< /Border [0 0 0]
+/A << /Type /Action
+/S /URI
+/URI (../rgsvc/rgsvc.pdf#__rgsvc_intro_overriding-the-services)
+>>
+/Subtype /Link
+/Rect [48.24 732.27 111.19800000000001 746.5500000000001]
+/Type /Annot
+>>
endobj
115 0 obj
+[110 0 R /XYZ 0 719.5200000000001 null]
+endobj
+116 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
/URI (../rgcms/rgcms.pdf#_rgcms_classes_AppManifest-bootstrapping)
>>
/Subtype /Link
-/Rect [165.6885559303977 671.2100000000002 270.83588813920454 685.4900000000002]
+/Rect [165.6885559303977 655.4300000000002 270.83588813920454 669.7100000000003]
/Type /Annot
>>
endobj
-116 0 obj
-[110 0 R /XYZ 0 626.9000000000002 null]
-endobj
117 0 obj
+[110 0 R /XYZ 0 611.1200000000002 null]
+endobj
+118 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
/URI (../rgfis/rgfis.pdf#_rgfis_presentation-layer_ContentNegotiationService)
>>
/Subtype /Link
-/Rect [255.4218125 580.1860000000003 386.6718125 590.6860000000003]
+/Rect [255.4218125 564.4060000000003 386.6718125 574.9060000000003]
/Type /Annot
>>
endobj
-118 0 obj
+119 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
/URI (../rgsvc/rgsvc.pdf#_rgsvc_presentation-layer-spi_ContentMappingService)
>>
/Subtype /Link
-/Rect [167.099794921875 564.4060000000003 277.349794921875 574.9060000000003]
+/Rect [167.099794921875 548.6260000000003 277.349794921875 559.1260000000003]
/Type /Annot
>>
endobj
-119 0 obj
+120 0 obj
<< /Length 21579
>>
stream
@@ -14832,27 +14808,27 @@ Q
endstream
endobj
-120 0 obj
+121 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 119 0 R
+/Contents 120 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/Font << /F2.0 16 0 R
/F1.0 8 0 R
/F4.0 39 0 R
/F5.0 40 0 R
>>
-/XObject << /Stamp1 292 0 R
+/XObject << /Stamp1 291 0 R
>>
>>
-/Annots [122 0 R 123 0 R 124 0 R 125 0 R 126 0 R 127 0 R 128 0 R 129 0 R 130 0 R 131 0 R 132 0 R 133 0 R 134 0 R 135 0 R 136 0 R 137 0 R 138 0 R 139 0 R]
+/Annots [123 0 R 124 0 R 125 0 R 126 0 R 127 0 R 128 0 R 129 0 R 130 0 R 131 0 R 132 0 R 133 0 R 134 0 R 135 0 R 136 0 R 137 0 R 138 0 R 139 0 R 140 0 R]
>>
endobj
-121 0 obj
-[120 0 R /XYZ 0 841.89 null]
-endobj
122 0 obj
+[121 0 R /XYZ 0 841.89 null]
+endobj
+123 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -14863,7 +14839,7 @@ endobj
/Type /Annot
>>
endobj
-123 0 obj
+124 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -14874,7 +14850,7 @@ endobj
/Type /Annot
>>
endobj
-124 0 obj
+125 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -14885,7 +14861,7 @@ endobj
/Type /Annot
>>
endobj
-125 0 obj
+126 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -14896,7 +14872,7 @@ endobj
/Type /Annot
>>
endobj
-126 0 obj
+127 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -14907,7 +14883,7 @@ endobj
/Type /Annot
>>
endobj
-127 0 obj
+128 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -14918,7 +14894,7 @@ endobj
/Type /Annot
>>
endobj
-128 0 obj
+129 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -14929,7 +14905,7 @@ endobj
/Type /Annot
>>
endobj
-129 0 obj
+130 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -14940,7 +14916,7 @@ endobj
/Type /Annot
>>
endobj
-130 0 obj
+131 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -14951,7 +14927,7 @@ endobj
/Type /Annot
>>
endobj
-131 0 obj
+132 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -14962,7 +14938,7 @@ endobj
/Type /Annot
>>
endobj
-132 0 obj
+133 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -14973,7 +14949,7 @@ endobj
/Type /Annot
>>
endobj
-133 0 obj
+134 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -14984,7 +14960,7 @@ endobj
/Type /Annot
>>
endobj
-134 0 obj
+135 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -14995,7 +14971,7 @@ endobj
/Type /Annot
>>
endobj
-135 0 obj
+136 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -15006,7 +14982,7 @@ endobj
/Type /Annot
>>
endobj
-136 0 obj
+137 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -15017,7 +14993,7 @@ endobj
/Type /Annot
>>
endobj
-137 0 obj
+138 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -15028,7 +15004,7 @@ endobj
/Type /Annot
>>
endobj
-138 0 obj
+139 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -15039,7 +15015,7 @@ endobj
/Type /Annot
>>
endobj
-139 0 obj
+140 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -15050,7 +15026,7 @@ endobj
/Type /Annot
>>
endobj
-140 0 obj
+141 0 obj
<< /Length 13767
>>
stream
@@ -15948,29 +15924,29 @@ Q
endstream
endobj
-141 0 obj
+142 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 140 0 R
+/Contents 141 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/Font << /F2.0 16 0 R
/F5.0 40 0 R
/F1.0 8 0 R
>>
-/XObject << /Stamp1 292 0 R
+/XObject << /Stamp1 291 0 R
>>
>>
-/Annots [144 0 R 146 0 R 147 0 R 148 0 R]
+/Annots [145 0 R 147 0 R 148 0 R 149 0 R]
>>
endobj
-142 0 obj
-[141 0 R /XYZ 0 841.89 null]
-endobj
143 0 obj
-[141 0 R /XYZ 0 711.27 null]
+[142 0 R /XYZ 0 841.89 null]
endobj
144 0 obj
+[142 0 R /XYZ 0 711.27 null]
+endobj
+145 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -15981,10 +15957,10 @@ endobj
/Type /Annot
>>
endobj
-145 0 obj
-[141 0 R /XYZ 0 420.3500000000001 null]
-endobj
146 0 obj
+[142 0 R /XYZ 0 420.3500000000001 null]
+endobj
+147 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -15995,7 +15971,7 @@ endobj
/Type /Annot
>>
endobj
-147 0 obj
+148 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -16006,7 +15982,7 @@ endobj
/Type /Annot
>>
endobj
-148 0 obj
+149 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -16017,10 +15993,10 @@ endobj
/Type /Annot
>>
endobj
-149 0 obj
-[141 0 R /XYZ 0 305.15000000000003 null]
-endobj
150 0 obj
+[142 0 R /XYZ 0 305.15000000000003 null]
+endobj
+151 0 obj
<< /Length 32239
>>
stream
@@ -18206,11 +18182,11 @@ Q
endstream
endobj
-151 0 obj
+152 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 150 0 R
+/Contents 151 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/Font << /F5.0 40 0 R
/F5.1 67 0 R
@@ -18218,13 +18194,13 @@ endobj
/F4.0 39 0 R
/F2.0 16 0 R
>>
-/XObject << /Stamp1 292 0 R
+/XObject << /Stamp1 291 0 R
>>
>>
-/Annots [152 0 R 153 0 R 154 0 R 158 0 R 159 0 R 161 0 R 162 0 R]
+/Annots [153 0 R 154 0 R 155 0 R 159 0 R 160 0 R 162 0 R 163 0 R]
>>
endobj
-152 0 obj
+153 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -18235,7 +18211,7 @@ endobj
/Type /Annot
>>
endobj
-153 0 obj
+154 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -18246,7 +18222,7 @@ endobj
/Type /Annot
>>
endobj
-154 0 obj
+155 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -18257,20 +18233,20 @@ endobj
/Type /Annot
>>
endobj
-155 0 obj
-[151 0 R /XYZ 0 281.2099999999999 null]
-endobj
156 0 obj
+[152 0 R /XYZ 0 281.2099999999999 null]
+endobj
+157 0 obj
<< /Limits [(__rgfis) (implementation-2)]
-/Names [(__rgfis) 13 0 R (_rgfis_application-layer) 121 0 R (_rgfis_application-layer_AuthenticationSessionProvider) 142 0 R (_rgfis_application-layer_CommandDtoServiceInternal) 145 0 R (_rgfis_application-layer_InteractionDtoServiceInternal) 160 0 R (_rgfis_persistence-layer) 172 0 R (_rgfis_persistence-layer_AuditingServiceInternal) 197 0 R (_rgfis_persistence-layer_ChangedObjectsServiceInternal) 210 0 R (_rgfis_persistence-layer_PersistenceSessionServiceInternal) 226 0 R (_rgfis_persistence-layer_PublishingServiceInternal) 233 0 R (_rgfis_presentation-layer) 37 0 R (_rgfis_presentation-layer_ContentNegotiationService) 53 0 R (_rgfis_presentation-layer_RepresentationService) 98 0 R (configuration) 85 0 R (implementation) 68 0 R (implementation-2) 107 0 R]
+/Names [(__rgfis) 13 0 R (_rgfis_application-layer) 122 0 R (_rgfis_application-layer_AuthenticationSessionProvider) 143 0 R (_rgfis_application-layer_CommandDtoServiceInternal) 146 0 R (_rgfis_application-layer_InteractionDtoServiceInternal) 161 0 R (_rgfis_persistence-layer) 173 0 R (_rgfis_persistence-layer_AuditingServiceInternal) 198 0 R (_rgfis_persistence-layer_ChangedObjectsServiceInternal) 211 0 R (_rgfis_persistence-layer_PersistenceSessionServiceInternal) 227 0 R (_rgfis_persistence-layer_PublishingServiceInternal) 234 0 R (_rgfis_presentation-layer) 37 0 R (_rgfis_presentation-layer_ContentNegotiationService) 53 0 R (_rgfis_presentation-layer_RepresentationService) 98 0 R (configuration) 85 0 R (implementation) 68 0 R (implementation-2) 108 0 R]
>>
endobj
-157 0 obj
+158 0 obj
<< /Limits [(other-guides) (related-services-3)]
-/Names [(other-guides) 19 0 R (registering-the-service) 205 0 R (registering-the-service-2) 219 0 R (registering-the-service-3) 247 0 R (registering-the-services) 89 0 R (registering-the-services-2) 114 0 R (related-classes) 207 0 R (related-classes-2) 221 0 R (related-classes-3) 249 0 R (related-services) 95 0 R (related-services-2) 116 0 R (related-services-3) 155 0 R]
+/Names [(other-guides) 19 0 R (registering-the-service) 206 0 R (registering-the-service-2) 220 0 R (registering-the-service-3) 247 0 R (registering-the-services) 89 0 R (registering-the-services-2) 115 0 R (related-classes) 208 0 R (related-classes-2) 222 0 R (related-classes-3) 249 0 R (related-services) 95 0 R (related-services-2) 117 0 R (related-services-3) 156 0 R]
>>
endobj
-158 0 obj
+159 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -18281,7 +18257,7 @@ endobj
/Type /Annot
>>
endobj
-159 0 obj
+160 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -18292,10 +18268,10 @@ endobj
/Type /Annot
>>
endobj
-160 0 obj
-[151 0 R /XYZ 0 204.3699999999999 null]
-endobj
161 0 obj
+[152 0 R /XYZ 0 204.3699999999999 null]
+endobj
+162 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -18306,7 +18282,7 @@ endobj
/Type /Annot
>>
endobj
-162 0 obj
+163 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -18317,7 +18293,7 @@ endobj
/Type /Annot
>>
endobj
-163 0 obj
+164 0 obj
<< /Length 18672
>>
stream
@@ -19540,27 +19516,27 @@ Q
endstream
endobj
-164 0 obj
+165 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 163 0 R
+/Contents 164 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/Font << /F2.0 16 0 R
/F1.0 8 0 R
/F5.0 40 0 R
/F5.1 67 0 R
>>
-/XObject << /Stamp1 292 0 R
+/XObject << /Stamp1 291 0 R
>>
>>
-/Annots [166 0 R 168 0 R 169 0 R]
+/Annots [167 0 R 169 0 R 170 0 R]
>>
endobj
-165 0 obj
-[164 0 R /XYZ 0 841.89 null]
-endobj
166 0 obj
+[165 0 R /XYZ 0 841.89 null]
+endobj
+167 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -19571,10 +19547,10 @@ endobj
/Type /Annot
>>
endobj
-167 0 obj
-[164 0 R /XYZ 0 368.8100000000001 null]
-endobj
168 0 obj
+[165 0 R /XYZ 0 368.8100000000001 null]
+endobj
+169 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -19585,7 +19561,7 @@ endobj
/Type /Annot
>>
endobj
-169 0 obj
+170 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -19596,7 +19572,7 @@ endobj
/Type /Annot
>>
endobj
-170 0 obj
+171 0 obj
<< /Length 24608
>>
stream
@@ -21249,27 +21225,27 @@ Q
endstream
endobj
-171 0 obj
+172 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 170 0 R
+/Contents 171 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/Font << /F2.0 16 0 R
/F1.0 8 0 R
/F4.0 39 0 R
/F5.0 40 0 R
>>
-/XObject << /Stamp1 292 0 R
+/XObject << /Stamp1 291 0 R
>>
>>
-/Annots [173 0 R 174 0 R 175 0 R 176 0 R 177 0 R 178 0 R 179 0 R 180 0 R 181 0 R 182 0 R 183 0 R 184 0 R 185 0 R 186 0 R 187 0 R 188 0 R 189 0 R 190 0 R 191 0 R 192 0 R 193 0 R 194 0 R 195 0 R 196 0 R 198 0 R]
+/Annots [174 0 R 175 0 R 176 0 R 177 0 R 178 0 R 179 0 R 180 0 R 181 0 R 182 0 R 183 0 R 184 0 R 185 0 R 186 0 R 187 0 R 188 0 R 189 0 R 190 0 R 191 0 R 192 0 R 193 0 R 194 0 R 195 0 R 196 0 R 197 0 R 199 0 R]
>>
endobj
-172 0 obj
-[171 0 R /XYZ 0 841.89 null]
-endobj
173 0 obj
+[172 0 R /XYZ 0 841.89 null]
+endobj
+174 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -21280,7 +21256,7 @@ endobj
/Type /Annot
>>
endobj
-174 0 obj
+175 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -21291,7 +21267,7 @@ endobj
/Type /Annot
>>
endobj
-175 0 obj
+176 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -21302,7 +21278,7 @@ endobj
/Type /Annot
>>
endobj
-176 0 obj
+177 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -21313,7 +21289,7 @@ endobj
/Type /Annot
>>
endobj
-177 0 obj
+178 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -21324,7 +21300,7 @@ endobj
/Type /Annot
>>
endobj
-178 0 obj
+179 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -21335,7 +21311,7 @@ endobj
/Type /Annot
>>
endobj
-179 0 obj
+180 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -21346,7 +21322,7 @@ endobj
/Type /Annot
>>
endobj
-180 0 obj
+181 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -21357,7 +21333,7 @@ endobj
/Type /Annot
>>
endobj
-181 0 obj
+182 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -21368,7 +21344,7 @@ endobj
/Type /Annot
>>
endobj
-182 0 obj
+183 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -21379,7 +21355,7 @@ endobj
/Type /Annot
>>
endobj
-183 0 obj
+184 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -21390,7 +21366,7 @@ endobj
/Type /Annot
>>
endobj
-184 0 obj
+185 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -21401,7 +21377,7 @@ endobj
/Type /Annot
>>
endobj
-185 0 obj
+186 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -21412,7 +21388,7 @@ endobj
/Type /Annot
>>
endobj
-186 0 obj
+187 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -21423,7 +21399,7 @@ endobj
/Type /Annot
>>
endobj
-187 0 obj
+188 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -21434,7 +21410,7 @@ endobj
/Type /Annot
>>
endobj
-188 0 obj
+189 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -21445,7 +21421,7 @@ endobj
/Type /Annot
>>
endobj
-189 0 obj
+190 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -21456,7 +21432,7 @@ endobj
/Type /Annot
>>
endobj
-190 0 obj
+191 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -21467,7 +21443,7 @@ endobj
/Type /Annot
>>
endobj
-191 0 obj
+192 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -21478,7 +21454,7 @@ endobj
/Type /Annot
>>
endobj
-192 0 obj
+193 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -21489,7 +21465,7 @@ endobj
/Type /Annot
>>
endobj
-193 0 obj
+194 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -21500,7 +21476,7 @@ endobj
/Type /Annot
>>
endobj
-194 0 obj
+195 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -21511,7 +21487,7 @@ endobj
/Type /Annot
>>
endobj
-195 0 obj
+196 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -21522,7 +21498,7 @@ endobj
/Type /Annot
>>
endobj
-196 0 obj
+197 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -21533,10 +21509,10 @@ endobj
/Type /Annot
>>
endobj
-197 0 obj
-[171 0 R /XYZ 0 184.6600000000001 null]
-endobj
198 0 obj
+[172 0 R /XYZ 0 184.6600000000001 null]
+endobj
+199 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -21547,8 +21523,8 @@ endobj
/Type /Annot
>>
endobj
-199 0 obj
-<< /Length 18355
+200 0 obj
+<< /Length 18353
>>
stream
q
@@ -22576,12 +22552,12 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-0.443 Tw
+0.654 Tw
BT
48.239999999999995 209.80600000000027 Td
/F1.0 10.5 Tf
-[<726573706f6e7369626c6520666f7220636f6c6c656374696e67207468652064657461696c73206f6620616c6c206368616e67657320746f20646f6d61696e206f626a656374732077697468696e20616e20696e746572> 20.01953125 <616374696f6e2e202054686973206973>] TJ
+[<726573706f6e7369626c6520666f7220636f6c6c656374696e67207468652064657461696c73206f6620616c6c206368616e67657320746f20646f6d61696e206f626a656374732077697468696e20616e20696e746572> 20.01953125 <616374696f6e2e2054686973206973>] TJ
ET
@@ -22701,27 +22677,27 @@ Q
endstream
endobj
-200 0 obj
+201 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 199 0 R
+/Contents 200 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/Font << /F2.0 16 0 R
/F1.0 8 0 R
/F5.0 40 0 R
/F5.1 67 0 R
>>
-/XObject << /Stamp1 292 0 R
+/XObject << /Stamp1 291 0 R
>>
>>
-/Annots [202 0 R 203 0 R 204 0 R 206 0 R 208 0 R 209 0 R 211 0 R 212 0 R]
+/Annots [203 0 R 204 0 R 205 0 R 207 0 R 209 0 R 210 0 R 212 0 R 213 0 R]
>>
endobj
-201 0 obj
-[200 0 R /XYZ 0 841.89 null]
-endobj
202 0 obj
+[201 0 R /XYZ 0 841.89 null]
+endobj
+203 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -22732,7 +22708,7 @@ endobj
/Type /Annot
>>
endobj
-203 0 obj
+204 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -22743,7 +22719,7 @@ endobj
/Type /Annot
>>
endobj
-204 0 obj
+205 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -22754,10 +22730,10 @@ endobj
/Type /Annot
>>
endobj
-205 0 obj
-[200 0 R /XYZ 0 553.7700000000002 null]
-endobj
206 0 obj
+[201 0 R /XYZ 0 553.7700000000002 null]
+endobj
+207 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -22768,10 +22744,10 @@ endobj
/Type /Annot
>>
endobj
-207 0 obj
-[200 0 R /XYZ 0 445.37000000000035 null]
-endobj
208 0 obj
+[201 0 R /XYZ 0 445.37000000000035 null]
+endobj
+209 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -22782,7 +22758,7 @@ endobj
/Type /Annot
>>
endobj
-209 0 obj
+210 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -22793,10 +22769,10 @@ endobj
/Type /Annot
>>
endobj
-210 0 obj
-[200 0 R /XYZ 0 277.6300000000003 null]
-endobj
211 0 obj
+[201 0 R /XYZ 0 277.6300000000003 null]
+endobj
+212 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -22807,7 +22783,7 @@ endobj
/Type /Annot
>>
endobj
-212 0 obj
+213 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -22818,10 +22794,10 @@ endobj
/Type /Annot
>>
endobj
-213 0 obj
-[200 0 R /XYZ 0 162.43000000000026 null]
-endobj
214 0 obj
+[201 0 R /XYZ 0 162.43000000000026 null]
+endobj
+215 0 obj
<< /Length 31521
>>
stream
@@ -25004,24 +24980,24 @@ Q
endstream
endobj
-215 0 obj
+216 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 214 0 R
+/Contents 215 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/Font << /F5.0 40 0 R
/F5.1 67 0 R
/F1.0 8 0 R
/F2.0 16 0 R
>>
-/XObject << /Stamp1 292 0 R
+/XObject << /Stamp1 291 0 R
>>
>>
-/Annots [216 0 R 217 0 R 218 0 R 220 0 R 222 0 R 223 0 R]
+/Annots [217 0 R 218 0 R 219 0 R 221 0 R 223 0 R 224 0 R]
>>
endobj
-216 0 obj
+217 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -25032,7 +25008,7 @@ endobj
/Type /Annot
>>
endobj
-217 0 obj
+218 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -25043,7 +25019,7 @@ endobj
/Type /Annot
>>
endobj
-218 0 obj
+219 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -25054,10 +25030,10 @@ endobj
/Type /Annot
>>
endobj
-219 0 obj
-[215 0 R /XYZ 0 218.98999999999987 null]
-endobj
220 0 obj
+[216 0 R /XYZ 0 218.98999999999987 null]
+endobj
+221 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -25068,10 +25044,10 @@ endobj
/Type /Annot
>>
endobj
-221 0 obj
-[215 0 R /XYZ 0 110.58999999999983 null]
-endobj
222 0 obj
+[216 0 R /XYZ 0 110.58999999999983 null]
+endobj
+223 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -25082,7 +25058,7 @@ endobj
/Type /Annot
>>
endobj
-223 0 obj
+224 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -25093,7 +25069,7 @@ endobj
/Type /Annot
>>
endobj
-224 0 obj
+225 0 obj
<< /Length 28942
>>
stream
@@ -27000,11 +26976,11 @@ Q
endstream
endobj
-225 0 obj
+226 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 224 0 R
+/Contents 225 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/Font << /F1.0 8 0 R
/F2.0 16 0 R
@@ -27012,19 +26988,19 @@ endobj
/F3.1 17 0 R
/F5.1 67 0 R
>>
-/XObject << /Stamp1 292 0 R
+/XObject << /Stamp1 291 0 R
>>
>>
>>
endobj
-226 0 obj
-[225 0 R /XYZ 0 778.86 null]
-endobj
227 0 obj
-[225 0 R /XYZ 0 596.32 null]
+[226 0 R /XYZ 0 778.86 null]
endobj
228 0 obj
-<< /Length 40711
+[226 0 R /XYZ 0 596.32 null]
+endobj
+229 0 obj
+<< /Length 40357
>>
stream
q
@@ -29843,29 +29819,7 @@ ET
BT
189.48600000000002 77.16599999999974 Td
/F1.0 10.5 Tf
-<206f722028646570726563617465642920> Tj
-ET
-
-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
-
-BT
-271.785 77.16599999999974 Td
-/F5.0 10.5 Tf
-<5075626c697368696e6753657276696365> Tj
-ET
-
-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
-
-BT
-361.035 77.16599999999974 Td
-/F1.0 10.5 Tf
-<20646f6d61696e2073657276696365732e> Tj
+<20646f6d61696e20736572766963652873292e> Tj
ET
0.000 0.000 0.000 SCN
@@ -29894,32 +29848,32 @@ Q
endstream
endobj
-229 0 obj
+230 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 228 0 R
+/Contents 229 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/Font << /F5.0 40 0 R
/F2.0 16 0 R
/F1.0 8 0 R
/F6.0 71 0 R
>>
-/XObject << /Stamp1 292 0 R
+/XObject << /Stamp1 291 0 R
>>
>>
-/Annots [232 0 R 234 0 R 235 0 R]
+/Annots [233 0 R 235 0 R]
>>
endobj
-230 0 obj
-[229 0 R /XYZ 0 314.9499999999998 null]
-endobj
231 0 obj
+[230 0 R /XYZ 0 314.9499999999998 null]
+endobj
+232 0 obj
<< /Limits [(related-services-4) (usage)]
-/Names [(related-services-4) 167 0 R (runtime-vs-noop-implementation) 230 0 R (spi) 66 0 R (spi-2) 104 0 R (spi-3) 227 0 R (spi-and-implementation) 143 0 R (spi-and-implementation-2) 201 0 R (spi-and-implementation-3) 213 0 R (spi-and-implementation-4) 239 0 R (spi-implementation) 149 0 R (spi-implementation-2) 165 0 R (usage) 77 0 R]
+/Names [(related-services-4) 168 0 R (runtime-vs-noop-implementation) 231 0 R (spi) 66 0 R (spi-2) 105 0 R (spi-3) 228 0 R (spi-and-implementation) 144 0 R (spi-and-implementation-2) 202 0 R (spi-and-implementation-3) 214 0 R (spi-and-implementation-4) 239 0 R (spi-implementation) 150 0 R (spi-implementation-2) 166 0 R (usage) 77 0 R]
>>
endobj
-232 0 obj
+233 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -29930,33 +29884,22 @@ endobj
/Type /Annot
>>
endobj
-233 0 obj
-[229 0 R /XYZ 0 144.98999999999975 null]
-endobj
234 0 obj
-<< /Border [0 0 0]
-/A << /Type /Action
-/S /URI
-/URI (../rgsvc/rgsvc.pdf#_rgsvc_persistence-layer-spi_PublisherService)
->>
-/Subtype /Link
-/Rect [105.48600000000002 75.69599999999974 189.48600000000002 86.19599999999974]
-/Type /Annot
->>
+[230 0 R /XYZ 0 144.98999999999975 null]
endobj
235 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
-/URI (../rgsvc/rgsvc.pdf#_rgsvc_persistence-layer-spi_PublishingService)
+/URI (../rgsvc/rgsvc.pdf#_rgsvc_persistence-layer-spi_PublisherService)
>>
/Subtype /Link
-/Rect [271.785 75.69599999999974 361.035 86.19599999999974]
+/Rect [105.48600000000002 75.69599999999974 189.48600000000002 86.19599999999974]
/Type /Annot
>>
endobj
236 0 obj
-<< /Length 25500
+<< /Length 25079
>>
stream
q
@@ -30755,7 +30698,7 @@ ET
0.694 0.129 0.275 scn
0.694 0.129 0.275 SCN
-6.405 Tw
+7.317 Tw
BT
64.809 452.19600000000025 Td
@@ -30770,12 +30713,12 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-6.405 Tw
+7.317 Tw
BT
148.809 452.19600000000025 Td
/F1.0 10.5 Tf
-<2e202054686520> Tj
+<2e2054686520> Tj
ET
@@ -30785,10 +30728,10 @@ ET
0.694 0.129 0.275 scn
0.694 0.129 0.275 SCN
-6.405 Tw
+7.317 Tw
BT
-197.50731818181816 452.19600000000025 Td
+190.2079 452.19600000000025 Td
/F5.0 10.5 Tf
<457865637574696f6e> Tj
ET
@@ -30800,10 +30743,10 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-6.405 Tw
+7.317 Tw
BT
-244.75731818181816 452.19600000000025 Td
+237.4579 452.19600000000025 Td
/F1.0 10.5 Tf
<206f626a6563742077696c6c20626520616e20696e7374616e6365206f6620> Tj
ET
@@ -30815,10 +30758,10 @@ ET
0.694 0.129 0.275 scn
0.694 0.129 0.275 SCN
-6.405 Tw
+7.317 Tw
BT
-434.3122272727272 452.19600000000025 Td
+433.3998 452.19600000000025 Td
/F5.0 10.5 Tf
<416374696f6e496e766f636174696f6e> Tj
ET
@@ -30830,10 +30773,10 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-6.405 Tw
+7.317 Tw
BT
-518.3122272727272 452.19600000000025 Td
+517.3998 452.19600000000025 Td
/F1.0 10.5 Tf
<2028736565> Tj
ET
@@ -30968,7 +30911,7 @@ ET
0.694 0.129 0.275 scn
0.694 0.129 0.275 SCN
-8.314 Tw
+9.417 Tw
BT
64.809 383.07600000000025 Td
@@ -30983,12 +30926,12 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-8.314 Tw
+9.417 Tw
BT
148.809 383.07600000000025 Td
/F1.0 10.5 Tf
-<2e202054686520> Tj
+<2e2054686520> Tj
ET
@@ -30998,10 +30941,10 @@ ET
0.694 0.129 0.275 scn
0.694 0.129 0.275 SCN
-8.314 Tw
+9.417 Tw
BT
-203.23459090909088 383.07600000000025 Td
+194.4079 383.07600000000025 Td
/F5.0 10.5 Tf
<457865637574696f6e> Tj
ET
@@ -31013,10 +30956,10 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-8.314 Tw
+9.417 Tw
BT
-250.48459090909088 383.07600000000025 Td
+241.6579 383.07600000000025 Td
/F1.0 10.5 Tf
<206f626a6563742077696c6c20626520616e20696e7374616e6365206f6620> Tj
ET
@@ -31028,10 +30971,10 @@ ET
0.694 0.129 0.275 scn
0.694 0.129 0.275 SCN
-8.314 Tw
+9.417 Tw
BT
-453.40313636363635 383.07600000000025 Td
+452.2998 383.07600000000025 Td
/F5.0 10.5 Tf
<50726f706572747945646974> Tj
ET
@@ -31043,10 +30986,10 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-8.314 Tw
+9.417 Tw
BT
-516.4031363636363 383.07600000000025 Td
+515.2998 383.07600000000025 Td
/F1.0 10.5 Tf
<2028736565> Tj
ET
@@ -31461,28 +31404,6 @@ ET
BT
189.486 116.71600000000015 Td
/F1.0 10.5 Tf
-<20616e642020> Tj
-ET
-
-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
-
-BT
-216.7545 116.71600000000015 Td
-/F5.0 10.5 Tf
-<5075626c697368696e6753657276696365> Tj
-ET
-
-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
-
-BT
-306.0045 116.71600000000015 Td
-/F1.0 10.5 Tf
<2e> Tj
ET
@@ -31631,10 +31552,10 @@ endobj
/F2.0 16 0 R
/F5.1 67 0 R
>>
-/XObject << /Stamp1 292 0 R
+/XObject << /Stamp1 291 0 R
>>
>>
-/Annots [238 0 R 240 0 R 241 0 R 242 0 R 243 0 R 244 0 R 245 0 R 246 0 R 248 0 R 250 0 R 251 0 R 252 0 R 253 0 R 254 0 R]
+/Annots [238 0 R 240 0 R 241 0 R 242 0 R 243 0 R 244 0 R 245 0 R 246 0 R 248 0 R 250 0 R 251 0 R 252 0 R 253 0 R]
>>
endobj
238 0 obj
@@ -31771,17 +31692,6 @@ endobj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
-/URI (../rgsvc/rgsvc.pdf#_rgsvc_persistence-layer-spi_PublishingService)
->>
-/Subtype /Link
-/Rect [216.7545 115.24600000000015 306.0045 125.74600000000015]
-/Type /Annot
->>
-endobj
-253 0 obj
-<< /Border [0 0 0]
-/A << /Type /Action
-/S /URI
/URI (../rgfis/rgfis.pdf#_rgfis_persistence-layer_AuditingServiceInternal)
>>
/Subtype /Link
@@ -31789,7 +31699,7 @@ endobj
/Type /Annot
>>
endobj
-254 0 obj
+253 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -31800,7 +31710,7 @@ endobj
/Type /Annot
>>
endobj
-255 0 obj
+254 0 obj
<< /Border [0 0 0]
/Dest (__rgfis)
/Subtype /Link
@@ -31808,7 +31718,7 @@ endobj
/Type /Annot
>>
endobj
-256 0 obj
+255 0 obj
<< /Border [0 0 0]
/Dest (__rgfis)
/Subtype /Link
@@ -31816,7 +31726,7 @@ endobj
/Type /Annot
>>
endobj
-257 0 obj
+256 0 obj
<< /Border [0 0 0]
/Dest (other-guides)
/Subtype /Link
@@ -31824,7 +31734,7 @@ endobj
/Type /Annot
>>
endobj
-258 0 obj
+257 0 obj
<< /Border [0 0 0]
/Dest (other-guides)
/Subtype /Link
@@ -31832,7 +31742,7 @@ endobj
/Type /Annot
>>
endobj
-259 0 obj
+258 0 obj
<< /Border [0 0 0]
/Dest (_rgfis_presentation-layer)
/Subtype /Link
@@ -31840,7 +31750,7 @@ endobj
/Type /Annot
>>
endobj
-260 0 obj
+259 0 obj
<< /Border [0 0 0]
/Dest (_rgfis_presentation-layer)
/Subtype /Link
@@ -31848,7 +31758,7 @@ endobj
/Type /Annot
>>
endobj
-261 0 obj
+260 0 obj
<< /Border [0 0 0]
/Dest (_rgfis_presentation-layer_ContentNegotiationService)
/Subtype /Link
@@ -31856,7 +31766,7 @@ endobj
/Type /Annot
>>
endobj
-262 0 obj
+261 0 obj
<< /Border [0 0 0]
/Dest (_rgfis_presentation-layer_ContentNegotiationService)
/Subtype /Link
@@ -31864,7 +31774,7 @@ endobj
/Type /Annot
>>
endobj
-263 0 obj
+262 0 obj
<< /Border [0 0 0]
/Dest (_rgfis_presentation-layer_ContentNegotiationService)
/Subtype /Link
@@ -31872,7 +31782,7 @@ endobj
/Type /Annot
>>
endobj
-264 0 obj
+263 0 obj
<< /Border [0 0 0]
/Dest (_rgfis_presentation-layer_RepresentationService)
/Subtype /Link
@@ -31880,7 +31790,7 @@ endobj
/Type /Annot
>>
endobj
-265 0 obj
+264 0 obj
<< /Border [0 0 0]
/Dest (_rgfis_presentation-layer_RepresentationService)
/Subtype /Link
@@ -31888,7 +31798,7 @@ endobj
/Type /Annot
>>
endobj
-266 0 obj
+265 0 obj
<< /Border [0 0 0]
/Dest (_rgfis_presentation-layer_RepresentationService)
/Subtype /Link
@@ -31896,7 +31806,7 @@ endobj
/Type /Annot
>>
endobj
-267 0 obj
+266 0 obj
<< /Border [0 0 0]
/Dest (_rgfis_application-layer)
/Subtype /Link
@@ -31904,7 +31814,7 @@ endobj
/Type /Annot
>>
endobj
-268 0 obj
+267 0 obj
<< /Border [0 0 0]
/Dest (_rgfis_application-layer)
/Subtype /Link
@@ -31912,7 +31822,7 @@ endobj
/Type /Annot
>>
endobj
-269 0 obj
+268 0 obj
<< /Border [0 0 0]
/Dest (_rgfis_application-layer_AuthenticationSessionProvider)
/Subtype /Link
@@ -31920,7 +31830,7 @@ endobj
/Type /Annot
>>
endobj
-270 0 obj
+269 0 obj
<< /Border [0 0 0]
/Dest (_rgfis_application-layer_AuthenticationSessionProvider)
/Subtype /Link
@@ -31928,7 +31838,7 @@ endobj
/Type /Annot
>>
endobj
-271 0 obj
+270 0 obj
<< /Border [0 0 0]
/Dest (_rgfis_application-layer_AuthenticationSessionProvider)
/Subtype /Link
@@ -31936,7 +31846,7 @@ endobj
/Type /Annot
>>
endobj
-272 0 obj
+271 0 obj
<< /Border [0 0 0]
/Dest (_rgfis_application-layer_CommandDtoServiceInternal)
/Subtype /Link
@@ -31944,7 +31854,7 @@ endobj
/Type /Annot
>>
endobj
-273 0 obj
+272 0 obj
<< /Border [0 0 0]
/Dest (_rgfis_application-layer_CommandDtoServiceInternal)
/Subtype /Link
@@ -31952,7 +31862,7 @@ endobj
/Type /Annot
>>
endobj
-274 0 obj
+273 0 obj
<< /Border [0 0 0]
/Dest (_rgfis_application-layer_CommandDtoServiceInternal)
/Subtype /Link
@@ -31960,7 +31870,7 @@ endobj
/Type /Annot
>>
endobj
-275 0 obj
+274 0 obj
<< /Border [0 0 0]
/Dest (_rgfis_application-layer_InteractionDtoServiceInternal)
/Subtype /Link
@@ -31968,7 +31878,7 @@ endobj
/Type /Annot
>>
endobj
-276 0 obj
+275 0 obj
<< /Border [0 0 0]
/Dest (_rgfis_application-layer_InteractionDtoServiceInternal)
/Subtype /Link
@@ -31976,7 +31886,7 @@ endobj
/Type /Annot
>>
endobj
-277 0 obj
+276 0 obj
<< /Border [0 0 0]
/Dest (_rgfis_application-layer_InteractionDtoServiceInternal)
/Subtype /Link
@@ -31984,7 +31894,7 @@ endobj
/Type /Annot
>>
endobj
-278 0 obj
+277 0 obj
<< /Border [0 0 0]
/Dest (_rgfis_persistence-layer)
/Subtype /Link
@@ -31992,7 +31902,7 @@ endobj
/Type /Annot
>>
endobj
-279 0 obj
+278 0 obj
<< /Border [0 0 0]
/Dest (_rgfis_persistence-layer)
/Subtype /Link
@@ -32000,7 +31910,7 @@ endobj
/Type /Annot
>>
endobj
-280 0 obj
+279 0 obj
<< /Border [0 0 0]
/Dest (_rgfis_persistence-layer_AuditingServiceInternal)
/Subtype /Link
@@ -32008,7 +31918,7 @@ endobj
/Type /Annot
>>
endobj
-281 0 obj
+280 0 obj
<< /Border [0 0 0]
/Dest (_rgfis_persistence-layer_AuditingServiceInternal)
/Subtype /Link
@@ -32016,7 +31926,7 @@ endobj
/Type /Annot
>>
endobj
-282 0 obj
+281 0 obj
<< /Border [0 0 0]
/Dest (_rgfis_persistence-layer_AuditingServiceInternal)
/Subtype /Link
@@ -32024,7 +31934,7 @@ endobj
/Type /Annot
>>
endobj
-283 0 obj
+282 0 obj
<< /Border [0 0 0]
/Dest (_rgfis_persistence-layer_ChangedObjectsServiceInternal)
/Subtype /Link
@@ -32032,7 +31942,7 @@ endobj
/Type /Annot
>>
endobj
-284 0 obj
+283 0 obj
<< /Border [0 0 0]
/Dest (_rgfis_persistence-layer_ChangedObjectsServiceInternal)
/Subtype /Link
@@ -32040,7 +31950,7 @@ endobj
/Type /Annot
>>
endobj
-285 0 obj
+284 0 obj
<< /Border [0 0 0]
/Dest (_rgfis_persistence-layer_ChangedObjectsServiceInternal)
/Subtype /Link
@@ -32048,7 +31958,7 @@ endobj
/Type /Annot
>>
endobj
-286 0 obj
+285 0 obj
<< /Border [0 0 0]
/Dest (_rgfis_persistence-layer_PersistenceSessionServiceInternal)
/Subtype /Link
@@ -32056,7 +31966,7 @@ endobj
/Type /Annot
>>
endobj
-287 0 obj
+286 0 obj
<< /Border [0 0 0]
/Dest (_rgfis_persistence-layer_PersistenceSessionServiceInternal)
/Subtype /Link
@@ -32064,7 +31974,7 @@ endobj
/Type /Annot
>>
endobj
-288 0 obj
+287 0 obj
<< /Border [0 0 0]
/Dest (_rgfis_persistence-layer_PersistenceSessionServiceInternal)
/Subtype /Link
@@ -32072,7 +31982,7 @@ endobj
/Type /Annot
>>
endobj
-289 0 obj
+288 0 obj
<< /Border [0 0 0]
/Dest (_rgfis_persistence-layer_PublishingServiceInternal)
/Subtype /Link
@@ -32080,7 +31990,7 @@ endobj
/Type /Annot
>>
endobj
-290 0 obj
+289 0 obj
<< /Border [0 0 0]
/Dest (_rgfis_persistence-layer_PublishingServiceInternal)
/Subtype /Link
@@ -32088,7 +31998,7 @@ endobj
/Type /Annot
>>
endobj
-291 0 obj
+290 0 obj
<< /Border [0 0 0]
/Dest (_rgfis_persistence-layer_PublishingServiceInternal)
/Subtype /Link
@@ -32096,7 +32006,7 @@ endobj
/Type /Annot
>>
endobj
-292 0 obj
+291 0 obj
<< /Type /XObject
/Subtype /Form
/BBox [0 0 595.28 841.89]
@@ -32124,156 +32034,156 @@ Q
endstream
endobj
-293 0 obj
+292 0 obj
<< /Type /Outlines
/Count 16
-/First 294 0 R
-/Last 305 0 R
+/First 293 0 R
+/Last 304 0 R
>>
endobj
-294 0 obj
+293 0 obj
<< /Title <feff004600720061006d00650077006f0072006b00200049006e007400650072006e0061006c002000530065007200760069006300650073>
-/Parent 293 0 R
+/Parent 292 0 R
/Count 0
-/Next 295 0 R
+/Next 294 0 R
/Dest [7 0 R /XYZ 0 841.89 null]
>>
endobj
-295 0 obj
+294 0 obj
<< /Title <feff005400610062006c00650020006f006600200043006f006e00740065006e00740073>
-/Parent 293 0 R
+/Parent 292 0 R
/Count 0
-/Next 296 0 R
-/Prev 294 0 R
+/Next 295 0 R
+/Prev 293 0 R
/Dest [10 0 R /XYZ 0 841.89 null]
>>
endobj
-296 0 obj
+295 0 obj
<< /Title <feff004300680061007000740065007200200031002e0020004600720061006d00650077006f0072006b00200049006e007400650072006e0061006c002000530065007200760069006300650073>
-/Parent 293 0 R
+/Parent 292 0 R
/Count 1
-/First 297 0 R
-/Last 297 0 R
-/Next 298 0 R
-/Prev 295 0 R
+/First 296 0 R
+/Last 296 0 R
+/Next 297 0 R
+/Prev 294 0 R
/Dest [12 0 R /XYZ 0 841.89 null]
>>
endobj
-297 0 obj
+296 0 obj
<< /Title <feff0031002e0031002e0020004f00740068006500720020004700750069006400650073>
-/Parent 296 0 R
+/Parent 295 0 R
/Count 0
/Dest [12 0 R /XYZ 0 654.2700000000001 null]
>>
endobj
-298 0 obj
+297 0 obj
<< /Title <feff004300680061007000740065007200200032002e002000500072006500730065006e0074006100740069006f006e0020004c0061007900650072>
-/Parent 293 0 R
+/Parent 292 0 R
/Count 2
-/First 299 0 R
-/Last 300 0 R
-/Next 301 0 R
-/Prev 296 0 R
+/First 298 0 R
+/Last 299 0 R
+/Next 300 0 R
+/Prev 295 0 R
/Dest [36 0 R /XYZ 0 841.89 null]
>>
endobj
-299 0 obj
+298 0 obj
<< /Title <feff0032002e0031002e00200043006f006e00740065006e0074004e00650067006f00740069006100740069006f006e0053006500720076006900630065>
-/Parent 298 0 R
+/Parent 297 0 R
/Count 0
-/Next 300 0 R
+/Next 299 0 R
/Dest [36 0 R /XYZ 0 249.34000000000026 null]
>>
endobj
-300 0 obj
+299 0 obj
<< /Title <feff0032002e0032002e00200052006500700072006500730065006e0074006100740069006f006e0053006500720076006900630065>
-/Parent 298 0 R
+/Parent 297 0 R
/Count 0
-/Prev 299 0 R
+/Prev 298 0 R
/Dest [94 0 R /XYZ 0 690.2900000000002 null]
>>
endobj
-301 0 obj
+300 0 obj
<< /Title <feff004300680061007000740065007200200033002e0020004100700070006c00690063006100740069006f006e0020004c0061007900650072>
-/Parent 293 0 R
+/Parent 292 0 R
/Count 3
-/First 302 0 R
-/Last 304 0 R
-/Next 305 0 R
-/Prev 298 0 R
-/Dest [120 0 R /XYZ 0 841.89 null]
+/First 301 0 R
+/Last 303 0 R
+/Next 304 0 R
+/Prev 297 0 R
+/Dest [121 0 R /XYZ 0 841.89 null]
>>
endobj
-302 0 obj
+301 0 obj
<< /Title <feff0033002e0031002e002000410075007400680065006e007400690063006100740069006f006e00530065007300730069006f006e00500072006f00760069006400650072>
-/Parent 301 0 R
+/Parent 300 0 R
/Count 0
-/Next 303 0 R
-/Dest [141 0 R /XYZ 0 841.89 null]
+/Next 302 0 R
+/Dest [142 0 R /XYZ 0 841.89 null]
>>
endobj
-303 0 obj
+302 0 obj
<< /Title <feff0033002e0032002e00200043006f006d006d0061006e006400440074006f00530065007200760069006300650049006e007400650072006e0061006c>
-/Parent 301 0 R
+/Parent 300 0 R
/Count 0
-/Next 304 0 R
-/Prev 302 0 R
-/Dest [141 0 R /XYZ 0 420.3500000000001 null]
+/Next 303 0 R
+/Prev 301 0 R
+/Dest [142 0 R /XYZ 0 420.3500000000001 null]
>>
endobj
-304 0 obj
+303 0 obj
<< /Title <feff0033002e0033002e00200049006e0074006500720061006300740069006f006e00440074006f00530065007200760069006300650049006e007400650072006e0061006c>
-/Parent 301 0 R
+/Parent 300 0 R
/Count 0
-/Prev 303 0 R
-/Dest [151 0 R /XYZ 0 204.3699999999999 null]
+/Prev 302 0 R
+/Dest [152 0 R /XYZ 0 204.3699999999999 null]
>>
endobj
-305 0 obj
+304 0 obj
<< /Title <feff004300680061007000740065007200200034002e002000500065007200730069007300740065006e006300650020004c006100790065007200200069006e007400650072006e0061006c0020005300500049>
-/Parent 293 0 R
+/Parent 292 0 R
/Count 4
-/First 306 0 R
-/Last 309 0 R
-/Prev 301 0 R
-/Dest [171 0 R /XYZ 0 841.89 null]
+/First 305 0 R
+/Last 308 0 R
+/Prev 300 0 R
+/Dest [172 0 R /XYZ 0 841.89 null]
>>
endobj
-306 0 obj
+305 0 obj
<< /Title <feff0034002e0031002e0020004100750064006900740069006e006700530065007200760069006300650049006e007400650072006e0061006c>
-/Parent 305 0 R
+/Parent 304 0 R
+/Count 0
+/Next 306 0 R
+/Dest [172 0 R /XYZ 0 184.6600000000001 null]
+>>
+endobj
+306 0 obj
+<< /Title <feff0034002e0032002e0020004300680061006e006700650064004f0062006a006500630074007300530065007200760069006300650049006e007400650072006e0061006c>
+/Parent 304 0 R
/Count 0
/Next 307 0 R
-/Dest [171 0 R /XYZ 0 184.6600000000001 null]
+/Prev 305 0 R
+/Dest [201 0 R /XYZ 0 277.6300000000003 null]
>>
endobj
307 0 obj
-<< /Title <feff0034002e0032002e0020004300680061006e006700650064004f0062006a006500630074007300530065007200760069006300650049006e007400650072006e0061006c>
-/Parent 305 0 R
+<< /Title <feff0034002e0033002e002000500065007200730069007300740065006e0063006500530065007300730069006f006e00530065007200760069006300650049006e007400650072006e0061006c>
+/Parent 304 0 R
/Count 0
/Next 308 0 R
/Prev 306 0 R
-/Dest [200 0 R /XYZ 0 277.6300000000003 null]
+/Dest [226 0 R /XYZ 0 778.86 null]
>>
endobj
308 0 obj
-<< /Title <feff0034002e0033002e002000500065007200730069007300740065006e0063006500530065007300730069006f006e00530065007200760069006300650049006e007400650072006e0061006c>
-/Parent 305 0 R
+<< /Title <feff0034002e0034002e0020005000750062006c0069007300680069006e006700530065007200760069006300650049006e007400650072006e0061006c>
+/Parent 304 0 R
/Count 0
-/Next 309 0 R
/Prev 307 0 R
-/Dest [225 0 R /XYZ 0 778.86 null]
+/Dest [230 0 R /XYZ 0 144.98999999999975 null]
>>
endobj
309 0 obj
-<< /Title <feff0034002e0034002e0020005000750062006c0069007300680069006e006700530065007200760069006300650049006e007400650072006e0061006c>
-/Parent 305 0 R
-/Count 0
-/Prev 308 0 R
-/Dest [229 0 R /XYZ 0 144.98999999999975 null]
->>
-endobj
-310 0 obj
<< /Nums [0 << /P (i)
>> 1 << /P (ii)
>> 2 << /P (1)
@@ -32289,7 +32199,7 @@ endobj
>>]
>>
endobj
-311 0 obj
+310 0 obj
<< /Length1 13080
/Length 8247
/Filter [/FlateDecode]
@@ -32321,10 +32231,10 @@ RA
���v6�C㻷�Q����1<6��������0���ׇ��
����$�
endstream
endobj
-312 0 obj
+311 0 obj
<< /Type /FontDescriptor
/FontName /AAAABU+NotoSerif
-/FontFile2 311 0 R
+/FontFile2 310 0 R
/FontBBox [-212 -250 1246 1047]
/Flags 6
/StemV 0
@@ -32335,7 +32245,7 @@ endobj
/XHeight 1098
>>
endobj
-313 0 obj
+312 0 obj
<< /Length 1286
/Filter [/FlateDecode]
>>
@@ -32345,10 +32255,10 @@ x
���J���J��특���x��x��x��+�!Êw�� B�x�b�x��+ށ�r�;�� 2��k�Μ�J�Y�e�Y��7+|��x� oS��7+[ƛețךyޢoV��浖 -㭌���"���R�W�*��4Xq��C�^J�[(��^�1�»�y]���k�}�YM-x ����V�z�����[YE�V�Y���_}/7�*�Y%��e�ӫq+��:��.�7�J���E�/�3Y(Y�*A�W R��VJS�����:(u@c��D�]a*��f)�9J���)�o, #�\�Z>M�U��\�jPS�
{HS��M���j����{fk���yG�m[z*E�sa��>�&�ӫ���j%u���; �2^���W�[���®�v�[���2�쯲u�[���P�:���V̡�Յ> �M��Bi2 .Ħ����ԇ!���d�k�`���=o� �qWޕwdJF(�L164�U��)�x0E�~��Z? �=��/����ί ���~:�o?$���������O
endstream
endobj
-314 0 obj
+313 0 obj
[259 1000 408 559 1000 1000 1000 220 346 346 1000 1000 250 310 250 288 559 559 559 559 559 559 559 559 559 559 286 286 559 559 559 1000 1000 705 653 613 727 623 589 713 792 367 356 700 623 937 763 742 604 742 655 543 612 716 1000 1046 660 625 1000 1000 1000 1000 1000 458 1000 562 613 492 613 535 369 538 634 319 299 584 310 944 645 577 613 613 471 451 352 634 579 861 578 564 511 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 361 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 259 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 250 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
1000 1000 1000 1000 1000 1000 1000 1000 1000]
endobj
-315 0 obj
+314 0 obj
<< /Length1 9636
/Length 6389
/Filter [/FlateDecode]
@@ -32380,10 +32290,10 @@ fu33
�axh��q ،1P�ҡ�FMS�m ^}0÷3677]i�M
�m���mCSI�� �Lٙ ���+���A�)��
x,���Гp�Ɍo�λv�%3j1�g��ǧ�p�����ը�y�m �C ���'g�b�����X\]; �S�N�z) �6T�q��� �v f���c�Z��y���gʀ�6��t ��1� �M͌�i�����H[w�J�����Rm�ylj���> ��zX5� �"���t��a^p���ܚW��a�c�ە� /�amE�Y.]��K����/�*
endstream
endobj
-316 0 obj
+315 0 obj
<< /Type /FontDescriptor
/FontName /AAAABV+NotoSerif-Bold
-/FontFile2 315 0 R
+/FontFile2 314 0 R
/FontBBox [-212 -250 1306 1058]
/Flags 6
/StemV 0
@@ -32394,7 +32304,7 @@ endobj
/XHeight 1098
>>
endobj
-317 0 obj
+316 0 obj
<< /Length 1286
/Filter [/FlateDecode]
>>
@@ -32404,10 +32314,10 @@ x
���J���J��특���x��x��x��+�!Êw�� B�x�b�x��+ށ�r�;�� 2��k�Μ�J�Y�e�Y��7+|��x� oS��7+[ƛețךyޢoV��浖 -㭌���"���R�W�*��4Xq��C�^J�[(��^�1�»�y]���k�}�YM-x ����V�z�����[YE�V�Y���_}/7�*�Y%��e�ӫq+��:��.�7�J���E�/�3Y(Y�*A�W R��VJS�����:(u@c��D�]a*��f)�9J���)�o, #�\�Z>M�U��\�jPS�
{HS��M���j����{fk���yG�m[z*E�sa��>�&�ӫ���j%u���; �2^���W�[���®�v�[���2�쯲u�[���P�:���V̡�Յ> �M��Bi2 .Ħ����ԇ!���d�k�`���=o� �qWޕwdJF(�L164�U��)�x0E�~��Z? �=��/����ί ���~:�o?$���������O
endstream
endobj
-318 0 obj
+317 0 obj
[259 1000 1000 1000 1000 1000 800 1000 399 399 1000 1000 1000 1000 293 1000 1000 559 559 559 559 559 559 1000 1000 1000 304 1000 1000 1000 1000 1000 1000 752 1000 667 1000 1000 621 769 1000 400 1000 1000 653 952 788 787 638 1000 707 585 652 747 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 599 648 526 648 570 407 560 666 352 1000 636 352 985 666 612 645 1000 522 487 404 666 605 855 1000 579 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 279 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000]
endobj
-319 0 obj
+318 0 obj
<< /Length1 2044
/Length 1027
/Filter [/FlateDecode]
@@ -32421,10 +32331,10 @@ x
5�Uƃ8��ܞ�U��d�� u"��/��a��x\��nO��u� J�2�̃��p�Q��"Od�� �w������ �k���'�5��v��p�v)�6��? �(�
endstream
endobj
-320 0 obj
+319 0 obj
<< /Type /FontDescriptor
/FontName /AAAABW+FontAwesome
-/FontFile2 319 0 R
+/FontFile2 318 0 R
/FontBBox [-10 -155 1290 867]
/Flags 4
/StemV 0
@@ -32435,7 +32345,7 @@ endobj
/XHeight 0
>>
endobj
-321 0 obj
+320 0 obj
<< /Length 233
/Filter [/FlateDecode]
>>
@@ -32444,38 +32354,30 @@ x
�Fɇ_��� � J�=Xt ��E/��N�e���Ğ?��ڊ�k-�I$ f�R}�\/0����09�It- ���k� �Ԕ�-룮7i�*��W4����J! �~�Sq�� ��r�
endstream
endobj
-322 0 obj
+321 0 obj
[250 1000 857 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500]
endobj
-323 0 obj
-<< /Length1 5484
-/Length 3534
+322 0 obj
+<< /Length1 4588
+/Length 2925
/Filter [/FlateDecode]
>>
stream
-x��X}\S��?�{o�ݼ�J��H�DIBZ|+�/�0��' � $1 "ʔ)SA��Ծ�8�Z���Vm��&릭�=�~��vs~*s־hu�Yg��s��Ѳ�ߒ�ͽ�s�s��{��� �l�����[v�� �H�Zj#f'~�Ͽ�jpV[�O%�[�}��k[7������Z��j���x@8�����.0��؞�m��m��]:l`{������h��mvX���O< ���jB��|@����x���G1<�C�kQ 4#���=]��{�I 9Y
- �+��a��i1� L���Ї����%��-D���4�\|��pA{ad[���`E���o �����D�2��ҍ�t�:���
� mco�tH}��FKYD�:9h�3��]��':��:QVl2Q#/�i79�[�Q�� #��8Q�b�'���'Q
-9%!�4Ԭ��)dx���'�����w�.�'�+��M�������U:�3 ���{ֱ�a�j~�������ʨ�F268�
���� �$�(�:>�3*��;$�I�"���.| �'��0��Ǿ{��)Sަu;~�k3����
�g;������Y|���+w��rJ\��ڻ8�CșY�6L��D /����C� �b��Ҙ*S�G�vN���#c�
��mSQ�]yJ8R�K_� �! �4"��\N �&i�(5G Z�� ����W-?y���^>��[n��%�����᭧H�� n[g����Sϼy�ղmmWך'۫��g.�Ҟ/�7�ȃXb � �:>��e*Z�㡶���| 2mݲ��1wz��Y�U ���0 ��,f��2R˾�,�9�c/�q~�hDeT��ݬi� {� � �>Ϙa$�[5š�UZ�Q�1�$F�1��2�Lqm����{�m+�$�VkyVWlvFyBﶾ�چׯ���8��c'�$��_��>W��f���`&5\�fu�h�p�nD�Ib9D�NF��B��������OB�\&Q���,!�,# U
-C�붰},۫X`9��z�P�a.s�t�J���' �|���N���w�:{�=�/b�/�X�pI9���� #ui�A���#&�$�{OuIiQ���a��=9IBɠ�tAq�F���/9� �xH��C,�1X��c����{"����C� ��*7z��ۗ' ���>��r�>��I!�Ib$JT<� v�?�R3�:�)�f$r �V�[�#��wotm�'v��ӗ�ɠ�P���d�
-$�BJ�
-�
-ڈ :��gC���"c�L�R�N�x �dT�߱��{%Sb.�Cwc��<� ~�,}�(�E�%�[7t`y��a��i���2�?�r�%h� $y a�J9Y�n����)�T�eI��X�*N@o��ֵ<>s~*���V��~�,`/��`3��T�|u������ӽ�{����Du�W�����"��~v���� V�98DB /�����eٯ����:��r� `U�dw�፫7qyW.�ǣܚ�� A���g ����2 ��|�!�`nA�&�
-k�6�����1H�e�rY�lF*]@�2�F������:��c �f������dFʥX
?:���h��*U,��5����*tj�/���&g<ُyr�g�Ĺ5.gnY¶�Ef�RI�(ڕ�tu^!{��s�.�2�QZ�Y�R�8�ϡ���s�ĺ�JI�5AgQe���gE�1�w,�t5�,ôt~�J�7IS Tj�t M�Q�t<�ݿ����o��Q�C�*{�(�w�<#���<- Yް��6I�Ri���
-�h���16i��j��e��S�7� �臘��{o�c� ����������*�d�}n=����<�n����<�k?�0�r�/�Y4��ި��α��??G�/}��� 0�?}�^g�/�O��ط#d�M2�u�b?���?����:�shpA"����8 ��7[��R��DJ9@�����ɾ��l*��G���k��?Q��&��������G�k�L��j[1��J*$�W���1�'N�чh��; ��p��qŕC����Oq��OQ�� �
{�-W٭u<����\|t8G�c|9}�k��T)�OF�|a�t��dŪ�U�>��K�
- {�y����z��]��1u�ՋsVj �v
��g�w /�����j�k��v> ��&��8�+ ΐ�4�N���%B��[�|*o�-;��l�=�v��ƒU]_\I-)&qw�|��pֱ&��A��ߟ%&5�t[`Ǩ6A���3�����U�u��d&lذ�28����|�2�S�{i`~�����^lK��v�r�m�t#u˓-�j��L0S��d�\dQѺt)�� L)ANNn�G]�� � _6w+{��;tg�ɷ��^�������� vE�:٣����xĢN
�J�u0Y/� "*~eQ��� �+"IJ_Q��(��ҷ�>a��7V���2��7�������+�v��sw=����h�4�#���C� f�d �BN�T:�@��@g�k���mFϘ�>�D3E��gEx��N ��?��X´�/�u��� b��Puv���<f/�1�`�/� ��(�����Ü�r� �x='I�r��<����G��PN�
:j�Q��,5�8{�;&u�� ���;8� ��j|�'�?J�� �x����6�\"���(�
�
��sPKF(�BD#b&Q�E,�'`� �%s��.�����?�CP7U���O?�sE�W����M�j�v�sP,��dd_���,<-! r �
-���{���2X�P+�OB<���j �6���3��E��V0t r��v r
-Ϗ� r
-Ϧo
-rf��9�> r&�dA�@<��"��
-A.�X�J��!�l�%ؿO�#� �A
-J,ȃ�Q*F�O9�+�'�L�)A Zj� 3�� �X:\���<z�؉;�� �P�o�a��#�à��!���Qf� �RfM�����ټʴ�sҔ�Ng]�UY��(3���+���걺�Xk4�
NpA �� ��^L�4�
s�W�!u��ъ�Bp@5h�)%
x/ ��[V�[Q�����ש,���x,vb/'�*�{ء��ki�W�V/XP� �; No� �m��� u�T�=J��b��൵���QC jp�7�ʉ��=�l}W�C���n���P����+�l��\7��<R"gdN�OM`��OVY
-g�����{���m��6Zܫ����q燝�Ղ�
Y�R+�
�P����0D�!�W�p� �c��� J���8�� >�\8x���1��(� 6�Ë�%h��(�Z�cjkƩ��A^ c���x�� N��*4��������y�� ���Yc���k���Z� qj����� �{���kѠ�{�jxy#�w��b�4777kX�j�����|@s3�ՠ�����ۃ�&�����^mux��&G�խ�ڬ�L��oY��DL��ƹ3u9�ҫx��S���Ƴ���,�/к�,�<��i\*��h�=�8�uچ� ����%%���㵌��A�n�T��1� �,����5d V^.�/o���H��v��R1� TH�?�Ͽ���n�0鋠*\��P�1VJ�
+x��X{Tg���$�!� �D�I,I��YE8�#�HY8�@�$� b�Y�+���Uk�K�V����Vmٮ����]kϩ��u=�Z���Z� {g2 Z����3���|�������� A�*�3uB%" D]S�P�9�����S�Wq��IcpB�����WlQ|��$��\.'���R��f��x��>d� ���f�3n �`B����@�ܢ�b����Y�q�����t�A���>�ċ��`�*� r�EЌb����TQ���X���'$Pk��!�v�����\!SH D$�X̙� �V�Z(oz(/�1��8��ȸ��Kq�aXD��N!�d�)#Ӫɴ��>Œ9��.�F�f�:�L�p% ���Q� ˴mxw�������ݞ�O]}ng��MY�y{�0j�) �����b �O�#J�贔�$g ��֧���۫v[7���7>�K0�s������@ǭ-�p�ɿgG�
+!�%TN+KvI�{n�t3z�1
Q�� q1Fr�T�":-�O+:���Փź����>c� ���Ѷv��k�O�g�Y�䟶���v���N�æ��;�w|���'��ͺʜ"�������Y�Y�� EC�OQ��ۉüY�i�J��GT�>��<\ �H �o��(�U ����Ҧ�c���n1u�u��X<�} �^�� �7��>�2$�_P �7���=�\� �t��~~Ŏ�}϶
+��?���x���ܚ_W�x�s+���7lX�0TU�Y���\y�w (���;�_��@�dZ/�Cm��lԄ�4ƚ��? {r���vf���1��wI�;�Y���T ��7�*�x�1�0 Rэ�'BrF��$f ����2k0.J��V�;���q=� �zg��
��'���ml_k�}�U���p��+d8�,� ���]��+�eQ]�B���ë�f���qJ-$A
+�U�'��H��*�ZL%�H� V��B�Ζ�$ ����T���l��b��.m��܁�V�Ύ�Lan]d�U $��C�Ea��y� ����H1V��+��zc���R��� ڢ{{�"�$�egUQq~�ٮW č��~v� "G}��m��
+��y� ҧ�w����LI���\��~ V�
+{~ҫ5L�KB����(�������ԯ& ߐ^ް�'���l�$</X��wbH��[.,:����T {R`����G�L)I��\Pn��jT$���-��'����m��%��}A�'��b��� � ����?T���d����=qO(��~��"W�����F/�J{�UQL� H֛�3HfdMi��w��5�iU��r����S�w�j�r���hǠ�D5yԪ���9F���T���)sRW//� �O�p_HO�3H����
��-�k��A=g��8l(~e�_�_Ti�� n?nh~lk�$t���ً��u�%�hT�aw�J������ v�e_N� �?Z��\�����zbf`=łe�{A,(
�D�L�g�7ΐ�^8yb�i������B���� ��*�t���ׅ/"��Yx9���E�1$z��⬩�����4��}�^ڲKX�-��e����-;D>�|s3V��=�zK_>�{�F�Ur�[X��z����z�pޤG���Kۜ�^��=�feUa�"�������3g�Z��9ͳ_��E�-$�o�z
���-�O��Hx�Y34&�I���'�ү[���q����rˍa7V�m/��\XA͵�ѷ�¯/�시u��}L�t��孶jLwz��j�_ͤ�y���c��ZF�L�K]���"&��{.u��5��?�9��;��n��ҧ��Ŗ�ëq�I͂�\ķ��{&�)�K���
+h�$�2��[/��!� ܨM$��1�ʧ.�~p���¥���� {x�WMmdm�����#�Bܗ��nB � ��'X�����JP~�4 C��2z3�&}�#vI�V�,L�ez��u���s�)�x�K���&V���W���!��U�2��چ�(����
+-��1sA/�mQ-��'�_�� b ��$I�]��{�;=m��H��'�خ�������g��\���UP����� @�<�{p�xqr�y�8?F�h�j�JX ��������;Y|���\ë��˒$ �1�:<'`�j� ��a�<� �� B `� #Ie_ �H �tP��{�h�q��[e����E��_}E�i�q�v�8��xg �L�qVM��+`Y"�JH"k�{�o�Ǩ ��#�Q���2 �S#d<��,����Gd<��*��r�e��Qt����TzB_�?�v�� ���x �wd<��+2 �32 �̲l���w�l��2�\���u�y�*�U[���G�� 8�˜d>h���pA�=�;� ~���Oy�k��V x�
+ x��H-���f$ˉ�N�Z��0��<[���-�q����n�� r��*d
�ln�*�|���z=\��[�)Xy|!�x%�T ��A�d��7 �x
�O������bw�n��>`�hf�\X�� >��3fΌwu����̒4э�%=�Er�� �s���/a�����O�[J+�W q�R�� � �K�\�_$R"�w�� �k�l��y��#��X^I��<9\�c�.�7��%38 le�G��G����R�uH㒤#�s� c�ݳ�q $� �&�U��i��Rl��=F���F�p�82�=F ��X �q;� ��s ^^ym�2s}}��#�%Q�u7s��π,w��� @��c)���� f���p�٠��f��*���L`{ 1�0OY�L��J[�!��!������,��Ḉu� ��]�b)����x��6�"`,�˞5�hV��b�x�~^
��ǜ#{��{ �,�l|k�ŝ7 ���]:�H̴� ��+��������sO�z����:��}��/��7�
endstream
endobj
-324 0 obj
+323 0 obj
<< /Type /FontDescriptor
/FontName /AAAABX+NotoSerif-Italic
-/FontFile2 323 0 R
+/FontFile2 322 0 R
/FontBBox [-254 -250 1238 1047]
/Flags 70
/StemV 0
@@ -32486,7 +32388,7 @@ endobj
/XHeight 1098
>>
endobj
-325 0 obj
+324 0 obj
<< /Length 1286
/Filter [/FlateDecode]
>>
@@ -32496,10 +32398,10 @@ x
���J���J��특���x��x��x��+�!Êw�� B�x�b�x��+ށ�r�;�� 2��k�Μ�J�Y�e�Y��7+|��x� oS��7+[ƛețךyޢoV��浖 -㭌���"���R�W�*��4Xq��C�^J�[(��^�1�»�y]���k�}�YM-x ����V�z�����[YE�V�Y���_}/7�*�Y%��e�ӫq+��:��.�7�J���E�/�3Y(Y�*A�W R��VJS�����:(u@c��D�]a*��f)�9J���)�o, #�\�Z>M�U��\�jPS�
{HS��M���j����{fk���yG�m[z*E�sa��>�&�ӫ���j%u���; �2^���W�[���®�v�[���2�쯲u�[���P�:���V̡�Յ> �M��Bi2 .Ħ����ԇ!���d�k�`���=o� �qWޕwdJF(�L164�U��)�x0E�~��Z? �=��/����ί ���~:�o?$���������O
endstream
endobj
-326 0 obj
-[259 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 250 1000 1000 559 559 559 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 367 1000 1000 1000 1000 1000 1000 1000 1000 1000 543 612 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 458 1000 579 562 486 579 493 317 556 599 304 1000 1000 304 895 599 574 577 1000 467 463 368 599 538 1000 1000 527 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 10
<TRUNCATED>
[07/39] isis-site git commit: ISIS-1810: updates docs for 2.0.0-M1
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/274edd1d/content/versions/SNAPSHOT/guides/ugfun/ugfun.pdf
----------------------------------------------------------------------
diff --git a/content/versions/SNAPSHOT/guides/ugfun/ugfun.pdf b/content/versions/SNAPSHOT/guides/ugfun/ugfun.pdf
index 210ccc5..fb272be 100644
--- a/content/versions/SNAPSHOT/guides/ugfun/ugfun.pdf
+++ b/content/versions/SNAPSHOT/guides/ugfun/ugfun.pdf
@@ -4,16 +4,16 @@
<< /Title (Fundamentals)
/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:20180812182615+01'00')
-/ModDate (D:20180812182615+01'00')
+/CreationDate (D:20180814003949+02'00')
+/ModDate (D:20180814003949+02'00')
>>
endobj
2 0 obj
<< /Type /Catalog
/Pages 3 0 R
/Names 14 0 R
-/Outlines 1254 0 R
-/PageLabels 1295 0 R
+/Outlines 1248 0 R
+/PageLabels 1289 0 R
/PageMode /UseOutlines
/OpenAction [7 0 R /FitH 842.89]
/ViewerPreferences << /DisplayDocTitle true
@@ -22,8 +22,8 @@ endobj
endobj
3 0 obj
<< /Type /Pages
-/Count 163
-/Kids [7 0 R 10 0 R 12 0 R 40 0 R 48 0 R 51 0 R 54 0 R 58 0 R 68 0 R 83 0 R 87 0 R 94 0 R 105 0 R 110 0 R 119 0 R 124 0 R 129 0 R 136 0 R 153 0 R 163 0 R 177 0 R 191 0 R 200 0 R 208 0 R 215 0 R 220 0 R 229 0 R 238 0 R 244 0 R 249 0 R 259 0 R 272 0 R 285 0 R 295 0 R 309 0 R 318 0 R 325 0 R 335 0 R 348 0 R 351 0 R 359 0 R 363 0 R 365 0 R 367 0 R 369 0 R 371 0 R 377 0 R 389 0 R 398 0 R 404 0 R 408 0 R 412 0 R 416 0 R 421 0 R 426 0 R 430 0 R 434 0 R 441 0 R 445 0 R 449 0 R 453 0 R 457 0 R 461 0 R 474 0 R 484 0 R 490 0 R 494 0 R 496 0 R 498 0 R 500 0 R 504 0 R 507 0 R 514 0 R 516 0 R 518 0 R 527 0 R 538 0 R 549 0 R 559 0 R 563 0 R 567 0 R 571 0 R 575 0 R 584 0 R 589 0 R 596 0 R 600 0 R 605 0 R 607 0 R 609 0 R 612 0 R 626 0 R 629 0 R 633 0 R 650 0 R 655 0 R 666 0 R 673 0 R 686 0 R 697 0 R 706 0 R 710 0 R 718 0 R 727 0 R 732 0 R 742 0 R 746 0 R 758 0 R 763 0 R 771 0 R 774 0 R 788 0 R 797 0 R 808 0 R 810 0 R 814 0 R 821 0 R 824 0 R 833 0 R 837 0 R 843 0 R 853 0 R 857 0 R 859 0 R 866 0 R 870
0 R 872 0 R 875 0 R 889 0 R 899 0 R 902 0 R 906 0 R 913 0 R 917 0 R 924 0 R 929 0 R 937 0 R 940 0 R 944 0 R 947 0 R 951 0 R 957 0 R 962 0 R 971 0 R 981 0 R 1005 0 R 1013 0 R 1023 0 R 1030 0 R 1036 0 R 1040 0 R 1053 0 R 1060 0 R 1069 0 R 1077 0 R 1086 0 R 1098 0 R 1100 0 R 1104 0 R 1108 0 R 1125 0 R 1156 0 R 1176 0 R]
+/Count 162
+/Kids [7 0 R 10 0 R 12 0 R 40 0 R 48 0 R 51 0 R 54 0 R 58 0 R 68 0 R 83 0 R 87 0 R 94 0 R 105 0 R 110 0 R 119 0 R 124 0 R 129 0 R 136 0 R 153 0 R 163 0 R 177 0 R 191 0 R 200 0 R 208 0 R 215 0 R 220 0 R 229 0 R 238 0 R 244 0 R 249 0 R 259 0 R 272 0 R 285 0 R 295 0 R 309 0 R 318 0 R 325 0 R 335 0 R 348 0 R 351 0 R 359 0 R 363 0 R 365 0 R 367 0 R 369 0 R 371 0 R 377 0 R 389 0 R 398 0 R 404 0 R 408 0 R 412 0 R 416 0 R 421 0 R 426 0 R 430 0 R 434 0 R 441 0 R 445 0 R 449 0 R 453 0 R 457 0 R 461 0 R 474 0 R 484 0 R 490 0 R 494 0 R 496 0 R 498 0 R 500 0 R 504 0 R 507 0 R 514 0 R 516 0 R 518 0 R 527 0 R 538 0 R 549 0 R 559 0 R 563 0 R 567 0 R 571 0 R 575 0 R 584 0 R 589 0 R 596 0 R 600 0 R 605 0 R 607 0 R 609 0 R 612 0 R 626 0 R 629 0 R 633 0 R 650 0 R 655 0 R 666 0 R 673 0 R 686 0 R 697 0 R 706 0 R 710 0 R 718 0 R 727 0 R 732 0 R 742 0 R 746 0 R 758 0 R 763 0 R 771 0 R 774 0 R 788 0 R 797 0 R 808 0 R 810 0 R 814 0 R 821 0 R 824 0 R 833 0 R 837 0 R 843 0 R 853 0 R 857 0 R 859 0 R 866 0 R 870
0 R 872 0 R 875 0 R 889 0 R 899 0 R 902 0 R 906 0 R 913 0 R 917 0 R 922 0 R 928 0 R 935 0 R 938 0 R 942 0 R 945 0 R 949 0 R 955 0 R 960 0 R 969 0 R 979 0 R 1003 0 R 1011 0 R 1020 0 R 1027 0 R 1033 0 R 1041 0 R 1053 0 R 1057 0 R 1067 0 R 1074 0 R 1084 0 R 1095 0 R 1097 0 R 1101 0 R 1106 0 R 1129 0 R 1158 0 R]
>>
endobj
4 0 obj
@@ -80,11 +80,11 @@ endobj
<< /Type /Font
/BaseFont /AAAACZ+NotoSerif
/Subtype /TrueType
-/FontDescriptor 1297 0 R
+/FontDescriptor 1291 0 R
/FirstChar 32
/LastChar 255
-/Widths 1299 0 R
-/ToUnicode 1298 0 R
+/Widths 1293 0 R
+/ToUnicode 1292 0 R
>>
endobj
9 0 obj
@@ -1639,7 +1639,7 @@ endobj
/F1.0 8 0 R
>>
>>
-/Annots [1177 0 R 1178 0 R 1179 0 R 1180 0 R 1181 0 R 1182 0 R 1183 0 R 1184 0 R 1185 0 R 1186 0 R 1187 0 R 1188 0 R 1189 0 R 1190 0 R 1191 0 R 1192 0 R 1193 0 R 1194 0 R 1195 0 R 1196 0 R 1197 0 R 1198 0 R 1199 0 R 1200 0 R 1201 0 R 1202 0 R 1203 0 R 1204 0 R 1205 0 R 1206 0 R 1207 0 R 1208 0 R 1209 0 R 1210 0 R 1211 0 R 1212 0 R 1213 0 R 1214 0 R 1215 0 R 1216 0 R 1217 0 R 1218 0 R 1219 0 R 1220 0 R 1221 0 R 1222 0 R 1223 0 R 1224 0 R 1225 0 R 1226 0 R 1227 0 R 1228 0 R 1229 0 R 1230 0 R 1231 0 R 1232 0 R 1233 0 R 1234 0 R 1235 0 R 1236 0 R 1237 0 R 1238 0 R 1239 0 R 1240 0 R 1241 0 R 1242 0 R 1243 0 R 1244 0 R 1245 0 R 1246 0 R 1247 0 R 1248 0 R 1249 0 R 1250 0 R 1251 0 R 1252 0 R]
+/Annots [1171 0 R 1172 0 R 1173 0 R 1174 0 R 1175 0 R 1176 0 R 1177 0 R 1178 0 R 1179 0 R 1180 0 R 1181 0 R 1182 0 R 1183 0 R 1184 0 R 1185 0 R 1186 0 R 1187 0 R 1188 0 R 1189 0 R 1190 0 R 1191 0 R 1192 0 R 1193 0 R 1194 0 R 1195 0 R 1196 0 R 1197 0 R 1198 0 R 1199 0 R 1200 0 R 1201 0 R 1202 0 R 1203 0 R 1204 0 R 1205 0 R 1206 0 R 1207 0 R 1208 0 R 1209 0 R 1210 0 R 1211 0 R 1212 0 R 1213 0 R 1214 0 R 1215 0 R 1216 0 R 1217 0 R 1218 0 R 1219 0 R 1220 0 R 1221 0 R 1222 0 R 1223 0 R 1224 0 R 1225 0 R 1226 0 R 1227 0 R 1228 0 R 1229 0 R 1230 0 R 1231 0 R 1232 0 R 1233 0 R 1234 0 R 1235 0 R 1236 0 R 1237 0 R 1238 0 R 1239 0 R 1240 0 R 1241 0 R 1242 0 R 1243 0 R 1244 0 R 1245 0 R 1246 0 R]
>>
endobj
11 0 obj
@@ -2395,7 +2395,7 @@ endobj
/Font << /F2.0 16 0 R
/F1.0 8 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [17 0 R 18 0 R 19 0 R 20 0 R 21 0 R 22 0 R 24 0 R 25 0 R 26 0 R 27 0 R 28 0 R 29 0 R 30 0 R 31 0 R 32 0 R 33 0 R 34 0 R 35 0 R 36 0 R 37 0 R 38 0 R]
@@ -2410,18 +2410,18 @@ endobj
>>
endobj
15 0 obj
-<< /Kids [113 0 R 471 0 R 765 0 R 704 0 R 314 0 R 223 0 R 114 0 R 1043 0 R 623 0 R 922 0 R 840 0 R 297 0 R 529 0 R]
+<< /Kids [113 0 R 471 0 R 765 0 R 704 0 R 314 0 R 223 0 R 114 0 R 1038 0 R 623 0 R 920 0 R 840 0 R 297 0 R 529 0 R]
>>
endobj
16 0 obj
<< /Type /Font
/BaseFont /AAAADA+NotoSerif-Bold
/Subtype /TrueType
-/FontDescriptor 1301 0 R
+/FontDescriptor 1295 0 R
/FirstChar 32
/LastChar 255
-/Widths 1303 0 R
-/ToUnicode 1302 0 R
+/Widths 1297 0 R
+/ToUnicode 1296 0 R
>>
endobj
17 0 obj
@@ -3318,7 +3318,7 @@ endobj
/F1.0 8 0 R
/F3.0 45 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [44 0 R]
@@ -3348,11 +3348,11 @@ endobj
<< /Type /Font
/BaseFont /AAAADB+NotoSerif-BoldItalic
/Subtype /TrueType
-/FontDescriptor 1305 0 R
+/FontDescriptor 1299 0 R
/FirstChar 32
/LastChar 255
-/Widths 1307 0 R
-/ToUnicode 1306 0 R
+/Widths 1301 0 R
+/ToUnicode 1300 0 R
>>
endobj
46 0 obj
@@ -4075,7 +4075,7 @@ endobj
/F3.0 45 0 R
/F2.0 16 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
>>
@@ -4084,11 +4084,11 @@ endobj
<< /Type /Font
/BaseFont /AAAADC+NotoSerif-Italic
/Subtype /TrueType
-/FontDescriptor 1309 0 R
+/FontDescriptor 1303 0 R
/FirstChar 32
/LastChar 255
-/Widths 1311 0 R
-/ToUnicode 1310 0 R
+/Widths 1305 0 R
+/ToUnicode 1304 0 R
>>
endobj
50 0 obj
@@ -4879,7 +4879,7 @@ endobj
/F2.0 16 0 R
/F4.0 49 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
>>
@@ -5745,7 +5745,7 @@ endobj
/F4.0 49 0 R
/F1.1 56 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
>>
@@ -5757,11 +5757,11 @@ endobj
<< /Type /Font
/BaseFont /AAAADD+NotoSerif
/Subtype /TrueType
-/FontDescriptor 1313 0 R
+/FontDescriptor 1307 0 R
/FirstChar 32
/LastChar 255
-/Widths 1315 0 R
-/ToUnicode 1314 0 R
+/Widths 1309 0 R
+/ToUnicode 1308 0 R
>>
endobj
57 0 obj
@@ -6684,7 +6684,7 @@ endobj
/F4.0 49 0 R
/F5.1 63 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [59 0 R 60 0 R 61 0 R 62 0 R 64 0 R 65 0 R 66 0 R]
@@ -6738,11 +6738,11 @@ endobj
<< /Type /Font
/BaseFont /AAAADE+FontAwesome
/Subtype /TrueType
-/FontDescriptor 1317 0 R
+/FontDescriptor 1311 0 R
/FirstChar 32
/LastChar 255
-/Widths 1319 0 R
-/ToUnicode 1318 0 R
+/Widths 1313 0 R
+/ToUnicode 1312 0 R
>>
endobj
64 0 obj
@@ -7624,7 +7624,7 @@ endobj
/F5.1 63 0 R
/F3.0 45 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [71 0 R 72 0 R 73 0 R 74 0 R 75 0 R 77 0 R 79 0 R 80 0 R]
@@ -7637,11 +7637,11 @@ endobj
<< /Type /Font
/BaseFont /AAAADF+mplus1mn-regular
/Subtype /TrueType
-/FontDescriptor 1321 0 R
+/FontDescriptor 1315 0 R
/FirstChar 32
/LastChar 255
-/Widths 1323 0 R
-/ToUnicode 1322 0 R
+/Widths 1317 0 R
+/ToUnicode 1316 0 R
>>
endobj
71 0 obj
@@ -8597,7 +8597,7 @@ endobj
/Contents 82 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/XObject << /I1 81 0 R
-/Stamp1 1253 0 R
+/Stamp1 1247 0 R
>>
/Font << /F4.0 49 0 R
/F1.0 8 0 R
@@ -9436,7 +9436,7 @@ endobj
/F4.0 49 0 R
/F6.0 70 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [90 0 R 91 0 R 92 0 R]
@@ -10310,7 +10310,7 @@ endobj
/F2.0 16 0 R
/F4.0 49 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [95 0 R 96 0 R 97 0 R 98 0 R 99 0 R 100 0 R]
@@ -11029,7 +11029,7 @@ endobj
/F2.0 16 0 R
/F4.0 49 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [107 0 R]
@@ -11830,7 +11830,7 @@ endobj
/F4.0 49 0 R
/F1.1 56 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [115 0 R 116 0 R]
@@ -11849,7 +11849,7 @@ endobj
endobj
114 0 obj
<< /Limits [(_ugfun_core-concepts_principles) (_ugfun_getting-started_prerequisites.adoc)]
-/Names [(_ugfun_core-concepts_principles) 112 0 R (_ugfun_core-concepts_principles_build-not-buy) 117 0 R (_ugfun_core-concepts_principles_for-the-long-term) 125 0 R (_ugfun_crud) 1006 0 R (_ugfun_crud_deleting) 1048 0 R (_ugfun_crud_finding) 1032 0 R (_ugfun_crud_instantiating) 1017 0 R (_ugfun_crud_persisting) 1024 0 R (_ugfun_crud_updating) 1042 0 R (_ugfun_drop-downs-and-defaults) 1084 0 R (_ugfun_getting-started_helloworld-archetype) 352 0 R (_ugfun_getting-started_prerequisites.adoc) 354 0 R]
+/Names [(_ugfun_core-concepts_principles) 112 0 R (_ugfun_core-concepts_principles_build-not-buy) 117 0 R (_ugfun_core-concepts_principles_for-the-long-term) 125 0 R (_ugfun_crud) 1004 0 R (_ugfun_crud_deleting) 1045 0 R (_ugfun_crud_finding) 1029 0 R (_ugfun_crud_instantiating) 1014 0 R (_ugfun_crud_persisting) 1021 0 R (_ugfun_crud_updating) 1037 0 R (_ugfun_drop-downs-and-defaults) 1081 0 R (_ugfun_getting-started_helloworld-archetype) 352 0 R (_ugfun_getting-started_prerequisites.adoc) 354 0 R]
>>
endobj
115 0 obj
@@ -12201,7 +12201,7 @@ endobj
/F1.1 56 0 R
>>
/XObject << /I2 120 0 R
-/Stamp1 1253 0 R
+/Stamp1 1247 0 R
>>
>>
/Annots [122 0 R]
@@ -12917,7 +12917,7 @@ endobj
/F1.1 56 0 R
/F2.0 16 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
>>
@@ -13693,7 +13693,7 @@ endobj
/Contents 128 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/XObject << /I3 126 0 R
-/Stamp1 1253 0 R
+/Stamp1 1247 0 R
>>
/Font << /F4.0 49 0 R
/F1.0 8 0 R
@@ -15115,7 +15115,7 @@ endobj
/F5.1 63 0 R
/F2.0 16 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [137 0 R 138 0 R 139 0 R 140 0 R 141 0 R 142 0 R 143 0 R 144 0 R 147 0 R 148 0 R 149 0 R 150 0 R 151 0 R]
@@ -16123,7 +16123,7 @@ endobj
/F4.0 49 0 R
/F6.0 70 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [154 0 R 155 0 R 156 0 R 157 0 R 158 0 R 159 0 R 160 0 R]
@@ -17306,7 +17306,7 @@ endobj
/F2.0 16 0 R
/F4.0 49 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [164 0 R 165 0 R 166 0 R 167 0 R 168 0 R 170 0 R 171 0 R 172 0 R 173 0 R 175 0 R]
@@ -17371,11 +17371,11 @@ endobj
<< /Type /Font
/BaseFont /AAAADG+mplus-1p-regular
/Subtype /TrueType
-/FontDescriptor 1325 0 R
+/FontDescriptor 1319 0 R
/FirstChar 32
/LastChar 255
-/Widths 1327 0 R
-/ToUnicode 1326 0 R
+/Widths 1321 0 R
+/ToUnicode 1320 0 R
>>
endobj
170 0 obj
@@ -18361,7 +18361,7 @@ endobj
/F1.1 56 0 R
/F2.0 16 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [178 0 R 179 0 R 180 0 R 181 0 R 182 0 R 183 0 R 184 0 R 186 0 R 187 0 R 188 0 R]
@@ -19203,7 +19203,7 @@ endobj
/F2.0 16 0 R
/F6.0 70 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [193 0 R 194 0 R 195 0 R 196 0 R]
@@ -19820,7 +19820,7 @@ endobj
/F6.0 70 0 R
/F2.0 16 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [201 0 R 203 0 R 204 0 R 206 0 R]
@@ -20891,7 +20891,7 @@ endobj
/F7.0 169 0 R
/F5.1 63 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [211 0 R 212 0 R]
@@ -22047,7 +22047,7 @@ endobj
/F2.0 16 0 R
/F4.0 49 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [216 0 R 218 0 R]
@@ -22969,7 +22969,7 @@ endobj
/F4.0 49 0 R
/F6.0 70 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [221 0 R 224 0 R 225 0 R 226 0 R 227 0 R]
@@ -23405,7 +23405,7 @@ endobj
/F4.0 49 0 R
>>
/XObject << /I4 233 0 R
-/Stamp1 1253 0 R
+/Stamp1 1247 0 R
>>
>>
/Annots [230 0 R 232 0 R 235 0 R]
@@ -24463,7 +24463,7 @@ endobj
/F2.0 16 0 R
/F1.1 56 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [239 0 R 240 0 R 241 0 R]
@@ -25215,7 +25215,7 @@ endobj
/F2.0 16 0 R
/F4.0 49 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [245 0 R]
@@ -26154,7 +26154,7 @@ endobj
/F5.1 63 0 R
/F1.1 56 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [250 0 R 251 0 R 252 0 R 253 0 R 255 0 R 256 0 R 257 0 R]
@@ -27052,7 +27052,7 @@ endobj
/F5.1 63 0 R
/F2.0 16 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [260 0 R 261 0 R 262 0 R 263 0 R 264 0 R 265 0 R 266 0 R 268 0 R 269 0 R 270 0 R]
@@ -28117,7 +28117,7 @@ endobj
/F2.0 16 0 R
/F6.0 70 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [273 0 R 274 0 R 275 0 R 276 0 R 277 0 R 278 0 R 279 0 R 281 0 R 282 0 R 283 0 R]
@@ -28907,7 +28907,7 @@ endobj
/F5.1 63 0 R
/F2.0 16 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [286 0 R 287 0 R 288 0 R 289 0 R 290 0 R]
@@ -29888,7 +29888,7 @@ endobj
/F6.0 70 0 R
/F5.1 63 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [299 0 R 300 0 R 302 0 R 303 0 R 304 0 R 305 0 R 306 0 R 307 0 R]
@@ -31410,7 +31410,7 @@ endobj
/F1.1 56 0 R
/F4.0 49 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [310 0 R 311 0 R 312 0 R]
@@ -31454,7 +31454,7 @@ endobj
endobj
314 0 obj
<< /Limits [(_ugfun_building-blocks_identifiers_title-and-icon) (_ugfun_core-concepts_apache-isis-vs_cqrs)]
-/Names [(_ugfun_building-blocks_identifiers_title-and-icon) 292 0 R (_ugfun_building-blocks_metamodel) 210 0 R (_ugfun_building-blocks_modules) 345 0 R (_ugfun_building-blocks_object-members) 313 0 R (_ugfun_building-blocks_types-of-domain-objects) 213 0 R (_ugfun_building-blocks_types-of-domain-objects_domain-entities) 217 0 R (_ugfun_building-blocks_types-of-domain-objects_domain-services) 222 0 R (_ugfun_building-blocks_types-of-domain-objects_mixins) 280 0 R (_ugfun_building-blocks_types-of-domain-objects_view-models) 236 0 R (_ugfun_business-rules) 1056 0 R (_ugfun_core-concepts) 41 0 R (_ugfun_core-concepts_apache-isis-vs) 145 0 R (_ugfun_core-concepts_apache-isis-vs_cqrs) 161 0 R]
+/Names [(_ugfun_building-blocks_identifiers_title-and-icon) 292 0 R (_ugfun_building-blocks_metamodel) 210 0 R (_ugfun_building-blocks_modules) 345 0 R (_ugfun_building-blocks_object-members) 313 0 R (_ugfun_building-blocks_types-of-domain-objects) 213 0 R (_ugfun_building-blocks_types-of-domain-objects_domain-entities) 217 0 R (_ugfun_building-blocks_types-of-domain-objects_domain-services) 222 0 R (_ugfun_building-blocks_types-of-domain-objects_mixins) 280 0 R (_ugfun_building-blocks_types-of-domain-objects_view-models) 236 0 R (_ugfun_business-rules) 1051 0 R (_ugfun_core-concepts) 41 0 R (_ugfun_core-concepts_apache-isis-vs) 145 0 R (_ugfun_core-concepts_apache-isis-vs_cqrs) 161 0 R]
>>
endobj
315 0 obj
@@ -33496,7 +33496,7 @@ endobj
/F5.1 63 0 R
/F2.0 16 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [321 0 R 322 0 R 323 0 R]
@@ -33939,10 +33939,10 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-1.743 Tw
+0.618 Tw
BT
-48.24000000000001 505.28600000000034 Td
+66.24000000000001 505.28600000000034 Td
/F1.0 10.5 Tf
[<46> 40.0390625 <6f7220612070726f70657274792074686973206d616b> 20.01953125 <657320697420726561642d6f6e6c793b20666f7220616e20616374696f6e2074686973206d616b> 20.01953125 <65732069742022> 40.0390625 <677265796564206f7574222e2028436f6c6c656374696f6e7320617265>] TJ
ET
@@ -33955,7 +33955,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24000000000001 489.5060000000003 Td
+66.24000000000001 489.5060000000003 Td
/F1.0 10.5 Tf
<696d706c696369746c7920726561642d6f6e6c79292e> Tj
ET
@@ -34002,10 +34002,10 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-1.579 Tw
+0.454 Tw
BT
-48.24000000000001 433.9460000000003 Td
+66.24000000000001 433.9460000000003 Td
/F1.0 10.5 Tf
[<46> 40.0390625 <6f7220612070726f70657274792074686973206d65616e732076616c69646174696e67207468652070726f706f736564206e65772076616c7565206f66207468652070726f70657274793b20666f7220616e20616374696f6e2074686973>] TJ
ET
@@ -34017,10 +34017,10 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-2.593 Tw
+0.957 Tw
BT
-48.24000000000001 418.1660000000003 Td
+66.24000000000001 418.1660000000003 Td
/F1.0 10.5 Tf
[<6d65616e732076616c69646174696e672074686520616374696f6e20706172> 20.01953125 <616d6574657220617267756d656e74732e2046> 40.0390625 <6f72206578616d706c652c2061207265666572656e7469616c20696e74656772697479207265737472696374>] TJ
ET
@@ -34033,7 +34033,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24000000000001 402.3860000000003 Td
+66.24000000000001 402.3860000000003 Td
/F1.0 10.5 Tf
<636f756c6420626520696d706c656d656e74656420686572652e> Tj
ET
@@ -34100,7 +34100,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24000000000001 331.0460000000003 Td
+66.24000000000001 331.0460000000003 Td
/F1.0 10.5 Tf
[<46> 40.0390625 <6f72206578616d706c652c206120636173636164652064656c65746520636f756c6420626520696d706c656d656e74656420686572652e>] TJ
ET
@@ -34442,7 +34442,7 @@ endobj
/F1.1 56 0 R
/F6.0 70 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [327 0 R 328 0 R 329 0 R 331 0 R 332 0 R 333 0 R]
@@ -35399,7 +35399,7 @@ endobj
/F5.1 63 0 R
/F4.0 49 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [336 0 R 337 0 R 338 0 R 339 0 R 341 0 R 342 0 R 343 0 R 344 0 R 346 0 R]
@@ -35880,7 +35880,7 @@ endobj
/F6.0 70 0 R
/F4.0 49 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [349 0 R]
@@ -36593,7 +36593,7 @@ endobj
/F6.0 70 0 R
/F5.1 63 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [353 0 R 355 0 R 356 0 R]
@@ -37453,7 +37453,7 @@ endobj
/F6.1 361 0 R
/F5.1 63 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
>>
@@ -37465,11 +37465,11 @@ endobj
<< /Type /Font
/BaseFont /AAAADH+mplus1mn-regular
/Subtype /TrueType
-/FontDescriptor 1329 0 R
+/FontDescriptor 1323 0 R
/FirstChar 32
/LastChar 255
-/Widths 1331 0 R
-/ToUnicode 1330 0 R
+/Widths 1325 0 R
+/ToUnicode 1324 0 R
>>
endobj
362 0 obj
@@ -39008,7 +39008,7 @@ endobj
/Font << /F6.0 70 0 R
/F1.0 8 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
>>
@@ -40227,7 +40227,7 @@ endobj
/F6.0 70 0 R
/F5.1 63 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
>>
@@ -42315,7 +42315,7 @@ endobj
/Font << /F1.0 8 0 R
/F6.0 70 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
>>
@@ -43347,7 +43347,7 @@ endobj
/F6.0 70 0 R
/F6.1 361 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
>>
@@ -44134,7 +44134,7 @@ endobj
/F6.1 361 0 R
/F2.0 16 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [374 0 R 375 0 R]
@@ -44719,7 +44719,7 @@ endobj
/F6.0 70 0 R
>>
/XObject << /I5 384 0 R
-/Stamp1 1253 0 R
+/Stamp1 1247 0 R
>>
>>
/Annots [380 0 R 382 0 R 383 0 R 385 0 R 386 0 R]
@@ -45161,7 +45161,7 @@ endobj
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/XObject << /I6 387 0 R
/I7 394 0 R
-/Stamp1 1253 0 R
+/Stamp1 1247 0 R
>>
/Font << /F2.0 16 0 R
/F1.0 8 0 R
@@ -45595,7 +45595,7 @@ endobj
/Contents 397 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/XObject << /I8 399 0 R
-/Stamp1 1253 0 R
+/Stamp1 1247 0 R
>>
/Font << /F1.0 8 0 R
/F6.0 70 0 R
@@ -45847,7 +45847,7 @@ endobj
/Contents 403 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/XObject << /I9 402 0 R
-/Stamp1 1253 0 R
+/Stamp1 1247 0 R
>>
/Font << /F1.0 8 0 R
>>
@@ -45999,7 +45999,7 @@ endobj
/Contents 407 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/XObject << /I10 406 0 R
-/Stamp1 1253 0 R
+/Stamp1 1247 0 R
>>
/Font << /F1.0 8 0 R
>>
@@ -46154,7 +46154,7 @@ endobj
/Contents 411 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/XObject << /I11 410 0 R
-/Stamp1 1253 0 R
+/Stamp1 1247 0 R
>>
/Font << /F1.0 8 0 R
>>
@@ -47486,7 +47486,7 @@ endobj
/Contents 415 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/XObject << /I12 414 0 R
-/Stamp1 1253 0 R
+/Stamp1 1247 0 R
>>
/Font << /F1.0 8 0 R
/F6.0 70 0 R
@@ -48579,7 +48579,7 @@ endobj
/Contents 420 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/XObject << /I13 419 0 R
-/Stamp1 1253 0 R
+/Stamp1 1247 0 R
>>
/Font << /F1.0 8 0 R
/F6.0 70 0 R
@@ -48746,7 +48746,7 @@ endobj
/Contents 425 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/XObject << /I14 424 0 R
-/Stamp1 1253 0 R
+/Stamp1 1247 0 R
>>
/Font << /F1.0 8 0 R
>>
@@ -48878,7 +48878,7 @@ endobj
/Contents 429 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/XObject << /I15 428 0 R
-/Stamp1 1253 0 R
+/Stamp1 1247 0 R
>>
/Font << /F1.0 8 0 R
>>
@@ -49836,7 +49836,7 @@ endobj
/Contents 433 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/XObject << /I16 432 0 R
-/Stamp1 1253 0 R
+/Stamp1 1247 0 R
>>
/Font << /F1.0 8 0 R
/F6.0 70 0 R
@@ -50013,7 +50013,7 @@ endobj
/Contents 440 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/XObject << /I17 439 0 R
-/Stamp1 1253 0 R
+/Stamp1 1247 0 R
>>
/Font << /F1.0 8 0 R
>>
@@ -50243,7 +50243,7 @@ endobj
/Contents 444 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/XObject << /I18 443 0 R
-/Stamp1 1253 0 R
+/Stamp1 1247 0 R
>>
/Font << /F1.0 8 0 R
/F6.0 70 0 R
@@ -50407,7 +50407,7 @@ endobj
/Contents 448 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/XObject << /I19 447 0 R
-/Stamp1 1253 0 R
+/Stamp1 1247 0 R
>>
/Font << /F1.0 8 0 R
>>
@@ -50609,7 +50609,7 @@ endobj
/Contents 452 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/XObject << /I20 451 0 R
-/Stamp1 1253 0 R
+/Stamp1 1247 0 R
>>
/Font << /F1.0 8 0 R
>>
@@ -50871,7 +50871,7 @@ endobj
/Contents 456 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/XObject << /I21 455 0 R
-/Stamp1 1253 0 R
+/Stamp1 1247 0 R
>>
/Font << /F1.0 8 0 R
/F6.0 70 0 R
@@ -51452,7 +51452,7 @@ endobj
/Contents 460 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/XObject << /I22 459 0 R
-/Stamp1 1253 0 R
+/Stamp1 1247 0 R
>>
/Font << /F1.0 8 0 R
/F2.0 16 0 R
@@ -52275,7 +52275,7 @@ endobj
/F6.0 70 0 R
/F5.1 63 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [476 0 R 477 0 R 478 0 R]
@@ -52927,7 +52927,7 @@ endobj
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/XObject << /I23 481 0 R
/I24 486 0 R
-/Stamp1 1253 0 R
+/Stamp1 1247 0 R
>>
/Font << /F1.0 8 0 R
/F6.0 70 0 R
@@ -53761,7 +53761,7 @@ endobj
/F4.0 49 0 R
/F2.0 16 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
>>
@@ -54351,7 +54351,7 @@ endobj
/F6.1 361 0 R
/F1.0 8 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
>>
@@ -56457,7 +56457,7 @@ endobj
/Font << /F6.0 70 0 R
/F1.0 8 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
>>
@@ -57779,7 +57779,7 @@ endobj
/F1.0 8 0 R
/F6.1 361 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
>>
@@ -58497,7 +58497,7 @@ endobj
/F2.0 16 0 R
/F5.1 63 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [501 0 R]
@@ -60067,7 +60067,7 @@ endobj
/F6.1 361 0 R
/F1.0 8 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [505 0 R]
@@ -60962,7 +60962,7 @@ endobj
/F1.0 8 0 R
/F2.0 16 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [508 0 R 509 0 R 510 0 R 511 0 R]
@@ -62511,7 +62511,7 @@ endobj
/F1.0 8 0 R
/F6.1 361 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
>>
@@ -63702,7 +63702,7 @@ endobj
/F6.0 70 0 R
/F1.0 8 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
>>
@@ -64644,7 +64644,7 @@ endobj
/F6.0 70 0 R
/F2.0 16 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [519 0 R 520 0 R 523 0 R 524 0 R]
@@ -65509,7 +65509,7 @@ endobj
/F2.0 16 0 R
/F4.0 49 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [530 0 R 532 0 R 533 0 R 534 0 R 535 0 R]
@@ -65875,7 +65875,7 @@ endobj
>>
/XObject << /I25 541 0 R
/I26 544 0 R
-/Stamp1 1253 0 R
+/Stamp1 1247 0 R
>>
>>
/Annots [539 0 R 540 0 R 542 0 R 543 0 R 545 0 R 547 0 R]
@@ -66635,7 +66635,7 @@ endobj
/F2.0 16 0 R
>>
/XObject << /I27 550 0 R
-/Stamp1 1253 0 R
+/Stamp1 1247 0 R
>>
>>
/Annots [551 0 R 552 0 R 554 0 R 555 0 R 556 0 R]
@@ -66911,7 +66911,7 @@ endobj
/Contents 558 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/XObject << /I28 557 0 R
-/Stamp1 1253 0 R
+/Stamp1 1247 0 R
>>
/Font << /F1.0 8 0 R
>>
@@ -67104,7 +67104,7 @@ endobj
/Contents 562 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/XObject << /I29 561 0 R
-/Stamp1 1253 0 R
+/Stamp1 1247 0 R
>>
/Font << /F1.0 8 0 R
>>
@@ -67255,7 +67255,7 @@ endobj
/Contents 566 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/XObject << /I30 565 0 R
-/Stamp1 1253 0 R
+/Stamp1 1247 0 R
>>
/Font << /F1.0 8 0 R
>>
@@ -67419,7 +67419,7 @@ endobj
/Contents 570 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/XObject << /I31 569 0 R
-/Stamp1 1253 0 R
+/Stamp1 1247 0 R
>>
/Font << /F1.0 8 0 R
>>
@@ -67860,7 +67860,7 @@ endobj
/Contents 574 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/XObject << /I32 573 0 R
-/Stamp1 1253 0 R
+/Stamp1 1247 0 R
>>
/Font << /F2.0 16 0 R
/F1.0 8 0 R
@@ -68447,7 +68447,7 @@ endobj
/F2.0 16 0 R
>>
/XObject << /I33 585 0 R
-/Stamp1 1253 0 R
+/Stamp1 1247 0 R
>>
>>
/Annots [586 0 R]
@@ -68820,7 +68820,7 @@ endobj
/F2.0 16 0 R
/F1.0 8 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [591 0 R 592 0 R 593 0 R 594 0 R]
@@ -69812,7 +69812,7 @@ endobj
/F6.0 70 0 R
/F5.1 63 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [598 0 R]
@@ -70872,7 +70872,7 @@ endobj
/F2.0 16 0 R
/F7.0 169 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [601 0 R 602 0 R]
@@ -72920,7 +72920,7 @@ endobj
/F1.0 8 0 R
/F1.1 56 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
>>
@@ -75573,7 +75573,7 @@ endobj
/F6.1 361 0 R
/F1.0 8 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
>>
@@ -77763,7 +77763,7 @@ endobj
/F1.0 8 0 R
/F5.1 63 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [610 0 R]
@@ -78711,7 +78711,7 @@ endobj
/F6.0 70 0 R
/F7.0 169 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [615 0 R 616 0 R 617 0 R 618 0 R 619 0 R 620 0 R 621 0 R 624 0 R]
@@ -78805,7 +78805,7 @@ endobj
endobj
623 0 obj
<< /Limits [(_ugfun_programming-model_domain-services_registering) (_ugfun_programming-model_mixins_inferred-name)]
-/Names [(_ugfun_programming-model_domain-services_registering) 667 0 R (_ugfun_programming-model_domain-services_repository-and-factory) 622 0 R (_ugfun_programming-model_domain-services_scoped-services) 659 0 R (_ugfun_programming-model_inject-services) 803 0 R (_ugfun_programming-model_mixins) 894 0 R (_ugfun_programming-model_mixins_contributed-action) 904 0 R (_ugfun_programming-model_mixins_contributed-collection) 900 0 R (_ugfun_programming-model_mixins_contributed-property) 903 0 R (_ugfun_programming-model_mixins_contributed-services) 921 0 R (_ugfun_programming-model_mixins_inferred-name) 907 0 R]
+/Names [(_ugfun_programming-model_domain-services_registering) 667 0 R (_ugfun_programming-model_domain-services_repository-and-factory) 622 0 R (_ugfun_programming-model_domain-services_scoped-services) 659 0 R (_ugfun_programming-model_inject-services) 803 0 R (_ugfun_programming-model_mixins) 894 0 R (_ugfun_programming-model_mixins_contributed-action) 904 0 R (_ugfun_programming-model_mixins_contributed-collection) 900 0 R (_ugfun_programming-model_mixins_contributed-property) 903 0 R (_ugfun_programming-model_mixins_contributed-services) 919 0 R (_ugfun_programming-model_mixins_inferred-name) 907 0 R]
>>
endobj
624 0 obj
@@ -80887,7 +80887,7 @@ endobj
/F1.0 8 0 R
/F2.0 16 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
>>
@@ -84037,7 +84037,7 @@ endobj
/F6.1 361 0 R
/F1.0 8 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [630 0 R 631 0 R]
@@ -84970,7 +84970,7 @@ endobj
/F5.1 63 0 R
/F2.0 16 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [634 0 R 635 0 R 636 0 R 637 0 R 638 0 R 639 0 R 640 0 R 641 0 R 642 0 R 643 0 R 645 0 R 646 0 R 647 0 R 648 0 R]
@@ -86817,7 +86817,7 @@ endobj
/F2.0 16 0 R
/F5.1 63 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [651 0 R 653 0 R]
@@ -88769,7 +88769,7 @@ endobj
/F1.0 8 0 R
/F2.0 16 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [656 0 R 657 0 R 658 0 R 660 0 R 661 0 R 662 0 R 663 0 R 664 0 R]
@@ -89544,7 +89544,7 @@ endobj
/F1.0 8 0 R
/F6.0 70 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [668 0 R 669 0 R 670 0 R]
@@ -90767,7 +90767,7 @@ endobj
/F6.0 70 0 R
/F2.0 16 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [674 0 R 675 0 R 677 0 R 678 0 R 679 0 R 680 0 R 681 0 R 682 0 R 683 0 R]
@@ -92295,7 +92295,7 @@ endobj
/F2.0 16 0 R
/F7.0 169 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [687 0 R 688 0 R 689 0 R 690 0 R 691 0 R 692 0 R 693 0 R 694 0 R]
@@ -93964,7 +93964,7 @@ endobj
/F2.0 16 0 R
/F7.0 169 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [699 0 R 701 0 R 702 0 R]
@@ -94011,7 +94011,7 @@ endobj
endobj
704 0 obj
<< /Limits [(__ugfun_programming-model_properties_editable-properties) (_ugfun_building-blocks_identifiers_oid)]
-/Names [(__ugfun_programming-model_properties_editable-properties) 698 0 R (__ugfun_programming-model_properties_ignoring-properties) 700 0 R (__ugfun_programming-model_properties_optional-properties) 695 0 R (__ugfun_programming-model_properties_value-vs-reference-types) 684 0 R (_ugfun_available-domain-services) 1105 0 R (_ugfun_available-domain-services_framework-provided) 1109 0 R (_ugfun_available-domain-services_incode-platform) 1172 0 R (_ugfun_building-blocks) 209 0 R (_ugfun_building-blocks_events) 320 0 R (_ugfun_building-blocks_events_domain-events) 326 0 R (_ugfun_building-blocks_events_lifecycle-events) 340 0 R (_ugfun_building-blocks_events_ui-events) 330 0 R (_ugfun_building-blocks_identifiers) 291 0 R (_ugfun_building-blocks_identifiers_oid) 301 0 R]
+/Names [(__ugfun_programming-model_properties_editable-properties) 698 0 R (__ugfun_programming-model_properties_ignoring-properties) 700 0 R (__ugfun_programming-model_properties_optional-properties) 695 0 R (__ugfun_programming-model_properties_value-vs-reference-types) 684 0 R (_ugfun_available-domain-services) 1102 0 R (_ugfun_available-domain-services_framework-provided) 1104 0 R (_ugfun_available-domain-services_incode-platform) 1168 0 R (_ugfun_building-blocks) 209 0 R (_ugfun_building-blocks_events) 320 0 R (_ugfun_building-blocks_events_domain-events) 326 0 R (_ugfun_building-blocks_events_lifecycle-events) 340 0 R (_ugfun_building-blocks_events_ui-events) 330 0 R (_ugfun_building-blocks_identifiers) 291 0 R (_ugfun_building-blocks_identifiers_oid) 301 0 R]
>>
endobj
705 0 obj
@@ -96211,7 +96211,7 @@ endobj
/F2.0 16 0 R
/F7.0 169 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
>>
@@ -97910,7 +97910,7 @@ endobj
/F6.0 70 0 R
/F4.0 49 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [712 0 R 713 0 R 714 0 R 716 0 R]
@@ -100284,7 +100284,7 @@ endobj
/F1.0 8 0 R
/F2.0 16 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [719 0 R 720 0 R 722 0 R 723 0 R 724 0 R 725 0 R]
@@ -104072,7 +104072,7 @@ endobj
/F1.0 8 0 R
/F2.0 16 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [729 0 R]
@@ -105953,7 +105953,7 @@ endobj
/F2.0 16 0 R
/F7.0 169 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [734 0 R 735 0 R 736 0 R 737 0 R 738 0 R 739 0 R 740 0 R]
@@ -108300,7 +108300,7 @@ endobj
/F2.0 16 0 R
/F6.1 361 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [743 0 R]
@@ -109480,7 +109480,7 @@ endobj
/F6.0 70 0 R
/F2.0 16 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [747 0 R 748 0 R 749 0 R 750 0 R 752 0 R 755 0 R 756 0 R]
@@ -110983,7 +110983,7 @@ endobj
/F6.1 361 0 R
/F5.1 63 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [760 0 R 761 0 R]
@@ -112758,7 +112758,7 @@ endobj
/F7.0 169 0 R
/F6.1 361 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [766 0 R 767 0 R 768 0 R]
@@ -114188,7 +114188,7 @@ endobj
/F1.0 8 0 R
/F2.0 16 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
>>
@@ -116443,7 +116443,7 @@ endobj
/F2.0 16 0 R
/F6.1 361 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [775 0 R 776 0 R 778 0 R 779 0 R 780 0 R 781 0 R 782 0 R 784 0 R 785 0 R 786 0 R]
@@ -118354,7 +118354,7 @@ endobj
/F5.1 63 0 R
/F2.0 16 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [789 0 R 790 0 R 791 0 R 793 0 R 794 0 R 795 0 R]
@@ -119385,10 +119385,10 @@ q
52.240 566.190 m
543.040 566.190 l
545.249 566.190 547.040 564.399 547.040 562.190 c
-547.040 -37448.990 l
-547.040 -37451.199 545.249 -37452.990 543.040 -37452.990 c
-52.240 -37452.990 l
-50.031 -37452.990 48.240 -37451.199 48.240 -37448.990 c
+547.040 -37245.400 l
+547.040 -37247.609 545.249 -37249.400 543.040 -37249.400 c
+52.240 -37249.400 l
+50.031 -37249.400 48.240 -37247.609 48.240 -37245.400 c
48.240 562.190 l
48.240 564.399 50.031 566.190 52.240 566.190 c
h
@@ -119972,7 +119972,7 @@ endobj
/F6.1 361 0 R
/F1.0 8 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [798 0 R 799 0 R 800 0 R 801 0 R 802 0 R 804 0 R 805 0 R 806 0 R]
@@ -121655,7 +121655,7 @@ endobj
/F4.0 49 0 R
/F6.0 70 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
>>
@@ -123081,7 +123081,7 @@ endobj
/F4.0 49 0 R
/F2.0 16 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [812 0 R]
@@ -124076,7 +124076,7 @@ endobj
/F6.0 70 0 R
/F1.1 56 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [816 0 R 817 0 R 819 0 R]
@@ -126329,7 +126329,7 @@ endobj
/F6.0 70 0 R
/F6.1 361 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [822 0 R]
@@ -127789,7 +127789,7 @@ endobj
/F1.0 8 0 R
/F6.0 70 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [825 0 R 826 0 R 828 0 R 829 0 R 830 0 R 831 0 R]
@@ -129725,7 +129725,7 @@ endobj
/F4.0 49 0 R
/F2.0 16 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [834 0 R]
@@ -130486,7 +130486,7 @@ endobj
/F5.1 63 0 R
/F1.0 8 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [838 0 R 841 0 R]
@@ -130508,7 +130508,7 @@ endobj
endobj
840 0 obj
<< /Limits [(_ugfun_programming-model_view-models_jaxb_referencing-domain-entities) (deploy-to-production)]
-/Names [(_ugfun_programming-model_view-models_jaxb_referencing-domain-entities) 827 0 R (_ugfun_programming-model_view-models_non-jaxb) 886 0 R (_ugfun_ui-hints) 925 0 R (_ugfun_ui-hints_action-icons-and-css) 959 0 R (_ugfun_ui-hints_eager-rendering) 998 0 R (_ugfun_ui-hints_layout) 927 0 R (_ugfun_ui-hints_names-and-descriptions) 978 0 R (_ugfun_ui-hints_object-titles-and-icons) 932 0 R (actions) 319 0 R (aop-concepts) 88 0 R (architecture-must-be-robust) 108 0 R (collections) 316 0 R (css-class) 298 0 R (ddd-must-be-grounded) 103 0 R (ddd-takes-a-conscious-effort) 102 0 R (deploy-on-your-own-platform) 198 0 R (deploy-the-rest-api) 202 0 R (deploy-to-production) 192 0 R]
+/Names [(_ugfun_programming-model_view-models_jaxb_referencing-domain-entities) 827 0 R (_ugfun_programming-model_view-models_non-jaxb) 886 0 R (_ugfun_ui-hints) 923 0 R (_ugfun_ui-hints_action-icons-and-css) 957 0 R (_ugfun_ui-hints_eager-rendering) 996 0 R (_ugfun_ui-hints_layout) 925 0 R (_ugfun_ui-hints_names-and-descriptions) 976 0 R (_ugfun_ui-hints_object-titles-and-icons) 930 0 R (actions) 319 0 R (aop-concepts) 88 0 R (architecture-must-be-robust) 108 0 R (collections) 316 0 R (css-class) 298 0 R (ddd-must-be-grounded) 103 0 R (ddd-takes-a-conscious-effort) 102 0 R (deploy-on-your-own-platform) 198 0 R (deploy-the-rest-api) 202 0 R (deploy-to-production) 192 0 R]
>>
endobj
841 0 obj
@@ -133885,7 +133885,7 @@ endobj
/F6.1 361 0 R
/F1.0 8 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [844 0 R 845 0 R 846 0 R 847 0 R 848 0 R 849 0 R 850 0 R]
@@ -135443,7 +135443,7 @@ endobj
/F6.0 70 0 R
/F6.1 361 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [854 0 R 855 0 R]
@@ -138238,7 +138238,7 @@ endobj
/F6.1 361 0 R
/F1.0 8 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
>>
@@ -138996,7 +138996,7 @@ endobj
/F6.0 70 0 R
/F4.0 49 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [861 0 R 862 0 R 863 0 R 864 0 R]
@@ -140529,7 +140529,7 @@ endobj
/Font << /F6.0 70 0 R
/F1.0 8 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [867 0 R 868 0 R]
@@ -142164,7 +142164,7 @@ endobj
/Font << /F6.0 70 0 R
/F1.0 8 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
>>
@@ -143617,7 +143617,7 @@ endobj
/Font << /F6.0 70 0 R
/F1.0 8 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
>>
@@ -144614,7 +144614,7 @@ endobj
/F6.0 70 0 R
/F5.1 63 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [876 0 R 877 0 R 878 0 R 879 0 R 880 0 R 881 0 R 882 0 R 883 0 R 884 0 R 885 0 R 887 0 R]
@@ -146040,7 +146040,7 @@ endobj
/F2.0 16 0 R
/F6.0 70 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [890 0 R 891 0 R 892 0 R 893 0 R 895 0 R 896 0 R 897 0 R]
@@ -149041,7 +149041,7 @@ endobj
/F6.1 361 0 R
/F1.0 8 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
>>
@@ -150650,7 +150650,7 @@ endobj
/F1.0 8 0 R
/F6.0 70 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
>>
@@ -153378,7 +153378,7 @@ endobj
/F6.1 361 0 R
/F1.0 8 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [908 0 R 909 0 R 910 0 R 911 0 R]
@@ -155383,7 +155383,7 @@ endobj
/F6.0 70 0 R
/F6.1 361 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
/Annots [914 0 R]
@@ -155404,7 +155404,7 @@ endobj
[913 0 R /XYZ 60.24 763.08 null]
endobj
916 0 obj
-<< /Length 32653
+<< /Length 32041
>>
stream
q
@@ -157200,7 +157200,7 @@ ET
BT
60.24000000000001 315.40599999999995 Td
/F1.0 10.5 Tf
-<6170695f446f6d61696e4f626a656374436f6e7461696e65725f6f626a6563742d6372656174696f6e2d6170695b> Tj
+[<6170695f46> 40.0390625 <6163746f7279536572766963655b>] TJ
ET
0.000 0.000 0.000 SCN
@@ -157209,9 +157209,9 @@ ET
0.694 0.129 0.275 SCN
BT
-304.15500000000003 315.40599999999995 Td
+158.43558984375 315.40599999999995 Td
/F6.0 10.5 Tf
-<446f6d61696e4f626a656374436f6e7461696e6572236d6978696e28> Tj
+<466163746f727953657276696365236d6978696e28> Tj
ET
0.000 0.000 0.000 SCN
@@ -157220,7 +157220,7 @@ ET
0.694 0.129 0.275 SCN
BT
-451.15500000000003 315.40599999999995 Td
+268.68558984375 315.40599999999995 Td
/F7.0 10.5 Tf
<c9> Tj
ET
@@ -157231,7 +157231,7 @@ ET
0.694 0.129 0.275 SCN
BT
-461.65500000000003 315.40599999999995 Td
+279.18558984375 315.40599999999995 Td
/F6.0 10.5 Tf
<29> Tj
ET
@@ -157242,7 +157242,7 @@ ET
0.200 0.200 0.200 SCN
BT
-466.90500000000003 315.40599999999995 Td
+284.43558984375 315.40599999999995 Td
/F1.0 10.5 Tf
<206d6574686f642e> Tj
ET
@@ -157359,7 +157359,7 @@ ET
BT
252.74 248.98499999999993 Td
/F6.0 11 Tf
-<636f6e7461696e6572> Tj
+<666163746f727953657276696365> Tj
ET
0.000 0.000 0.000 SCN
@@ -157368,7 +157368,7 @@ ET
0.200 0.200 0.200 SCN
BT
-302.24 248.98499999999993 Td
+329.74 248.98499999999993 Td
/F6.0 11 Tf
<2e> Tj
ET
@@ -157379,7 +157379,7 @@ ET
0.200 0.200 0.200 SCN
BT
-307.74 248.98499999999993 Td
+335.24 248.98499999999993 Td
/F6.0 11 Tf
<6d6978696e> Tj
ET
@@ -157390,7 +157390,7 @@ ET
0.200 0.200 0.200 SCN
BT
-335.24 248.98499999999993 Td
+362.74 248.98499999999993 Td
/F6.0 11 Tf
<28> Tj
ET
@@ -157401,7 +157401,7 @@ ET
0.200 0.200 0.200 SCN
BT
-340.74 248.98499999999993 Td
+368.24 248.98499999999993 Td
/F6.0 11 Tf
<446f63756d656e74486f6c6465725f646f63756d656e7473> Tj
ET
@@ -157412,7 +157412,7 @@ ET
0.200 0.200 0.200 SCN
BT
-472.74 248.98499999999993 Td
+71.24000000000001 234.24499999999995 Td
/F6.0 11 Tf
<2e> Tj
ET
@@ -157423,7 +157423,7 @@ ET
0.200 0.200 0.200 SCN
BT
-478.24 248.98499999999993 Td
+76.74000000000001 234.24499999999995 Td
/F6.0 11 Tf
<636c617373> Tj
ET
@@ -157434,7 +157434,7 @@ ET
0.200 0.200 0.200 SCN
BT
-505.74 248.98499999999993 Td
+104.24000000000001 234.24499999999995 Td
/F6.0 11 Tf
<2c> Tj
ET
@@ -157445,7 +157445,9 @@ ET
0.200 0.200 0.200 SCN
BT
-511.24 248.98499999999993 Td
+109.74000000000001 234.24499999999995 Td
+/F6.0 11 Tf
+<20> Tj
ET
0.000 0.000 0.000 SCN
@@ -157454,7 +157456,7 @@ ET
0.200 0.200 0.200 SCN
BT
-71.24000000000001 234.24499999999995 Td
+115.24000000000001 234.24499999999995 Td
/F6.0 11 Tf
<637573746f6d6572> Tj
ET
@@ -157465,7 +157467,7 @@ ET
0.200 0.200 0.200 SCN
BT
-115.24000000000001 234.24499999999995 Td
+159.24 234.24499999999995 Td
/F6.0 11 Tf
<29> Tj
ET
@@ -157476,7 +157478,7 @@ ET
0.200 0.200 0.200 SCN
BT
-120.74000000000001 234.24499999999995 Td
+164.74 234.24499999999995 Td
/F6.0 11 Tf
<3b> Tj
ET
@@ -157486,57 +157488,23 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-1.273 Tw
-
BT
60.24000000000001 196.36599999999993 Td
/F1.0 10.5 Tf
-<54686520> 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
-
-1.273 Tw
-
-BT
-82.9328888888889 196.36599999999993 Td
-/F6.0 10.5 Tf
-<496e746567726174696f6e546573744162737472616374> Tj
+<3d20436f6e747269627574656420736572766963657320286465707265636174656429> 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
-1.273 Tw
+4.682 Tw
BT
-203.6828888888889 196.36599999999993 Td
+60.24000000000001 168.58599999999993 Td
/F1.0 10.5 Tf
-<20616e6420> 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
-
-1.273 Tw
-
-BT
-230.77766666666665 196.36599999999993 Td
-/F6.0 10.5 Tf
-<46697874757265536372697074> Tj
+<436f6e74726962757465642073657276696365732061726520766572792073696d696c617220746f206d6978696e733b20696e64656564206d6978696e732061726520616e2065766f6c7574696f6e20616e64> Tj
ET
@@ -157546,57 +157514,12 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-1.273 Tw
+3.298 Tw
BT
-299.0276666666666 196.36599999999993 Td
+60.24000000000001 152.80599999999993 Td
/F1.0 10.5 Tf
-<20636c617373657320626f74682070726f76696465206120> 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
-
-1.273 Tw
-
-BT
-420.80811111111103 196.36599999999993 Td
-/F6.0 10.5 Tf
-<6d6978696e28> 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
-
-1.273 Tw
-
-BT
-452.30811111111103 196.36599999999993 Td
-/F7.0 10.5 Tf
-<c9> 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
-
-1.273 Tw
-
-BT
-462.80811111111103 196.36599999999993 Td
-/F6.0 10.5 Tf
-<29> Tj
+<726566696e656d656e74206f662074686520636f6e747269627574696f6e7320636f6e636570742e20417320737563682c20636f6e747269627574696f6e732073686f756c6420626520636f6e73696465726564206173> Tj
ET
@@ -157606,12 +157529,12 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-1.273 Tw
+2.265 Tw
BT
-468.05811111111103 196.36599999999993 Td
+60.24000000000001 137.02599999999993 Td
/F1.0 10.5 Tf
-<20636f6e76656e69656e6365> Tj
+[<646570726563617465642c20616e64206576656e7475616c6c792072656d6f76656420696e2061206675747572652076657273696f6e206f6620746865206672> 20.01953125 <616d65776f726b2c20746f206265207265706c61636564>] TJ
ET
@@ -157622,9 +157545,9 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24000000000001 180.58599999999993 Td
+60.24000000000001 121.24599999999992 Td
/F1.0 10.5 Tf
-<6d6574686f642e> Tj
+[<656e746972656c792062> 20.01953125 <79206d6978696e732e>] TJ
ET
0.000 0.000 0.000 SCN
@@ -157632,23 +157555,27 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
+4.065 Tw
+
BT
-60.24000000000001 152.80599999999993 Td
+60.24000000000001 93.46599999999992 Td
/F1.0 10.5 Tf
-<3d20436f6e747269627574656420736572766963657320286465707265636174656429> Tj
+<546865206d61696e20646966666572656e6365206265747765656e20636f6e747269627574656420736572766963657320616e64206d6978696e7320697320746861742074686520616374696f6e73206f662061> 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
-4.682 Tw
+1.108 Tw
BT
-60.24000000000001 125.02599999999993 Td
+60.24000000000001 77.68599999999992 Td
/F1.0 10.5 Tf
-<436f6e74726962757465642073657276696365732061726520766572792073696d696c617220746f206d6978696e733b20696e64656564206d6978696e732061726520616e2065766f6c7574696f6e20616e64> Tj
+<636f6e747269627574656420736572766963652077696c6c20636f6e7472696275746520746f20> Tj
ET
@@ -157658,12 +157585,12 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-3.298 Tw
+1.108 Tw
BT
-60.24000000000001 109.24599999999992 Td
-/F1.0 10.5 Tf
-<726566696e656d656e74206f662074686520636f6e747269627574696f6e7320636f6e636570742e20417320737563682c20636f6e747269627574696f6e732073686f756c6420626520636f6e73696465726564206173> Tj
+254.76850181361607 77.68599999999992 Td
+/F4.0 10.5 Tf
+<616c6c> Tj
ET
@@ -157673,12 +157600,12 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-2.265 Tw
+1.108 Tw
BT
-60.24000000000001 93.46599999999992 Td
+267.2320018136161 77.68599999999992 Td
/F1.0 10.5 Tf
-[<646570726563617465642c20616e64206576656e7475616c6c792072656d6f76656420696e2061206675747572652076657273696f6e206f6620746865206672> 20.01953125 <616d65776f726b2c20746f206265207265706c61636564>] TJ
+[<2074686520706172> 20.01953125 <616d6574657273206f662069747320616374696f6e732c20776865726561732061206d6978696e206f6e6c79>] TJ
ET
@@ -157689,9 +157616,9 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24000000000001 77.68599999999992 Td
+60.24000000000001 61.90599999999992 Td
/F1.0 10.5 Tf
-[<656e746972656c792062> 20.01953125 <79206d6978696e732e>] TJ
+<636f6e747269627574657320746f20746865207479706520616363657074656420696e2069747320636f6e7374727563746f722e> Tj
ET
0.000 0.000 0.000 SCN
@@ -157729,48 +157656,26 @@ endobj
/Font << /F6.0 70 0 R
/F1.0 8 0 R
/F7.0 169 0 R
+/F4.0 49 0 R
>>
-/XObject << /Stamp1 1253 0 R
+/XObject << /Stamp1 1247 0 R
>>
>>
-/Annots [919 0 R 920 0 R]
>>
endobj
918 0 obj
[917 0 R /XYZ 60.24 430.27 null]
endobj
919 0 obj
-<< /Border [0 0 0]
-/A << /Type /Action
-/S /URI
-/URI (../ugtst/ugtst.pdf#__ugtst_integ-test-support_bootstrapping_IntegrationTestAbstract)
->>
-/Subtype /Link
-/Rect [82.9328888888889 194.89599999999993 203.6828888888889 205.39599999999993]
-/Type /Annot
->>
+[917 0 R /XYZ 60.24 208.32999999999993 null]
endobj
920 0 obj
-<< /Border [0 0 0]
-/A << /Type /Action
-/S /URI
-/URI (../rgcms/rgcms.pdf#_rgcms_classes_super_FixtureScript)
->>
-/Subtype /Link
-/Rect [230.77766666666665 194.89599999999993 299.0276666666666 205.39599999999993]
-/Type /Annot
->>
-endobj
-921 0 obj
-[917 0 R /XYZ 60.24 164.76999999999992 null]
-endobj
-922 0 obj
<< /Limits [(_ugfun_programming-model_mixins_nested-static-classes) (_ugfun_programming-model_view-models_jaxb_joda-datatypes)]
/Names [(_ugfun_programming-model_mixins_nested-static-classes) 915 0 R (_ugfun_programming-model_mixins_programmatic-usage) 918 0 R (_ugfun_programming-model_properties) 676 0 R (_ugfun_programming-model_properties-vs-parameters) 811 0 R (_ugfun_programming-model_view-models) 815 0 R (_ugfun_programming-model_view-models_dto) 839 0 R (_ugfun_programming-model_view-models_dto_dto-consumers) 873 0 R (_ugfun_programming-model_view-models_dto_generating-xsds) 860 0 R (_ugfun_programming-model_view-models_dto_versioning) 851 0 R (_ugfun_programming-model_view-models_jaxb) 818 0 R (_ugfun_programming-model_view-models_jaxb_joda-datatypes) 835 0 R]
>>
endobj
-923 0 obj
-<< /Length 22264
+921 0 obj
+<< /Length 22502
>>
stream
q
@@ -157779,81 +157684,10 @@ q
/DeviceRGB CS
0.200 0.200 0.200 SCN
-4.065 Tw
-
-BT
-60.24 794.6759999999999 Td
-/F1.0 10.5 Tf
-<546865206d61696e20646966666572656e6365206265747765656e20636f6e747269627574656420736572766963657320616e64206d6978696e7320697320746861742074686520616374696f6e73206f662061> 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
-
-1.108 Tw
-
-BT
-60.24 778.896 Td
-/F1.0 10.5 Tf
-<636f6e747269627574656420736572766963652077696c6c20636f6e7472696275746520746f20> 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
-
-1.108 Tw
-
-BT
-254.76850181361607 778.896 Td
-/F4.0 10.5 Tf
-<616c6c> 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
-
-1.108 Tw
-
-BT
-267.2320018136161 778.896 Td
-/F1.0 10.5 Tf
-[<2074686520706172> 20.01953125 <616d6574657273206f662069747320616374696f6e732c20776865726561732061206d6978696e206f6e6c79>] 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
-
-BT
-60.24 763.116 Td
-/F1.0 10.5 Tf
-<636f6e747269627574657320746f20746865207479706520616363657074656420696e2069747320636f6e7374727563746f722e> Tj
-ET
-
-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
-
4.127 Tw
BT
-60.24 735.3359999999999 Td
+60.24 793.9259999999999 Td
/F1.0 10.5 Tf
<416c736f2c20636f6e747269627574656420736572766963657320617265206c6f6e672d6c697665642073696e676c65746f6e732c2077686572656173206d6978696e732061726520696e7374616e746961746564206173> Tj
ET
@@ -157866,7 +157700,7 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 719.5559999999999 Td
+60.24 778.146 Td
/F1.0 10.5 Tf
[<7265717569726564202862> 20.01953125 <7920746865206672> 20.01953125 <616d65776f726b2920616e64207468656e2064697363617264656420616c6d6f737420696d6d6564696174656c79> 89.84375 <2e>] TJ
ET
@@ -157877,7 +157711,7 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 691.776 Td
+60.24 750.366 Td
/F1.0 10.5 Tf
[<3d3d2053> 20.01953125 <796e746178>] TJ
ET
@@ -157890,7 +157724,7 @@ ET
1.074 Tw
BT
-60.24 663.996 Td
+60.24 722.586 Td
/F1.0 10.5 Tf
[<416e> 20.01953125 <79206e2d706172> 20.01953125 <616d6574657220616374696f6e2070726f76696465642062> 20.01953125 <79206120736572766963652077696c6c206175746f6d61746963616c6c7920626520636f6e747269627574656420746f20746865206c697374206f66>] TJ
ET
@@ -157905,7 +157739,7 @@ ET
0.386 Tw
BT
-60.24 648.216 Td
+60.24 706.806 Td
/F1.0 10.5 Tf
[<616374696f6e7320666f722065616368206f66206974732028656e746974792920706172> 20.01953125 <616d65746572732e2046726f6d207468652076696577706f696e74206f662074686520656e746974792074686520616374696f6e2069732063616c6c6564>] TJ
ET
@@ -157918,7 +157752,7 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 632.436 Td
+60.24 691.0260000000001 Td
/F1.0 10.5 Tf
<6120636f6e747269627574656420616374696f6e2e> Tj
ET
@@ -157929,7 +157763,7 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 604.656 Td
+60.24 663.246 Td
/F1.0 10.5 Tf
[<46> 40.0390625 <6f72206578616d706c652c20676976656e206120736572766963653a>] TJ
ET
@@ -157938,28 +157772,28 @@ ET
0.000 0.000 0.000 scn
q
0.961 0.961 0.961 scn
-64.240 588.840 m
-531.040 588.840 l
-533.249 588.840 535.040 587.049 535.040 584.840 c
-535.040 526.620 l
-535.040 524.411 533.249 522.620 531.040 522.620 c
-64.240 522.620 l
-62.031 522.620 60.240 524.411 60.240 526.620 c
-60.240 584.840 l
-60.240 587.049 62.031 588.840 64.240 588.840 c
+64.240 647.430 m
+531.040 647.430 l
+533.249 647.430 535.040 645.639 535.040 643.430 c
+535.040 585.210 l
+535.040 583.001 533.249 581.210 531.040 581.210 c
+64.240 581.210 l
+62.031 581.210 60.240 583.001 60.240 585.210 c
+60.240 643.430 l
+60.240 645.639 62.031 647.430 64.240 647.430 c
h
f
0.800 0.800 0.800 SCN
0.75 w
-64.240 588.840 m
-531.040 588.840 l
-533.249 588.840 535.040 587.049 535.040 584.840 c
-535.040 526.620 l
-535.040 524.411 533.249 522.620 531.040 522.620 c
-64.240 522.620 l
-62.031 522.620 60.240 524.411 60.240 526.620 c
-60.240 584.840 l
-60.240 587.049 62.031 588.840 64.240 588.840 c
+64.240 647.430 m
+531.040 647.430 l
+533.249 647.430 535.040 645.639 535.040 643.430 c
+535.040 585.210 l
+535.040 583.001 533.249 581.210 531.040 581.210 c
+64.240 581.210 l
+62.031 581.210 60.240 583.001 60.240 585.210 c
+60.240 643.430 l
+60.240 645.639 62.031 647.430 64.240 647.430 c
h
S
Q
@@ -157967,7 +157801,7 @@ Q
0.000 0.400 0.600 SCN
BT
-71.24000000000001 566.015 Td
+71.24000000000001 624.605 Td
/F6.0 11 Tf
<7075626c6963> Tj
ET
@@ -157978,7 +157812,7 @@ ET
0.200 0.200 0.200 SCN
BT
-104.24000000000001 566.015 Td
+104.24000000000001 624.605 Td
/F6.0 11 Tf
<20> Tj
ET
@@ -157989,7 +157823,7 @@ ET
0.000 0.467 0.533 SCN
BT
-109.74000000000001 566.015 Td
+109.74000000000001 624.605 Td
/F6.0 11 Tf
<696e74657266616365> Tj
ET
@@ -158000,7 +157834,7 @@ ET
0.200 0.200 0.200 SCN
BT
-159.24 566.015 Td
+159.24 624.605 Td
/F6.0 11 Tf
<20> Tj
ET
@@ -158011,7 +157845,7 @@ ET
0.000 0.667 0.533 SCN
BT
-164.74 566.015 Td
+164.74 624.605 Td
/F6.0 11 Tf
<4c696272617279> Tj
ET
@@ -158022,7 +157856,7 @@ ET
0.200 0.200 0.200 SCN
BT
-203.24 566.015 Td
+203.24 624.605 Td
/F6.0 11 Tf
<20> Tj
ET
@@ -158033,7 +157867,7 @@ ET
0.200 0.200 0.200 SCN
BT
-208.74 566.015 Td
+208.74 624.605 Td
/F6.0 11 Tf
<7b> Tj
ET
@@ -158044,7 +157878,7 @@ ET
0.200 0.200 0.200 SCN
BT
-71.24000000000001 551.2750000000001 Td
+71.24000000000001 609.865 Td
/F6.0 11 Tf
<ca202020> Tj
ET
@@ -158055,7 +157889,7 @@ ET
0.000 0.400 0.600 SCN
BT
-93.24000000000001 551.2750000000001 Td
+93.24000000000001 609.865 Td
/F6.0 11 Tf
<7075626c6963> Tj
ET
@@ -158066,7 +157900,7 @@ ET
0.200 0.200 0.200 SCN
BT
-126.24000000000001 551.2750000000001 Td
+126.24000000000001 609.865 Td
/F6.0 11 Tf
<20> Tj
ET
@@ -158077,7 +157911,7 @@ ET
0.200 0.200 0.200 SCN
BT
-131.74 551.2750000000001 Td
+131.74 609.865 Td
/F6.0 11 Tf
<4c6f616e> Tj
ET
@@ -158088,7 +157922,7 @@ ET
0.200 0.200 0.200 SCN
BT
-153.74 551.2750000000001 Td
+153.74 609.865 Td
/F6.0 11 Tf
<20> Tj
ET
@@ -158099,7 +157933,7 @@ ET
0.200 0.200 0.200 SCN
BT
-159.24 551.2750000000001 Td
+159.24 609.865 Td
/F6.0 11 Tf
<626f72726f77> Tj
ET
@@ -158110,7 +157944,7 @@ ET
0.200 0.200 0.200 SCN
BT
-192.24 551.2750000000001 Td
+192.24 609.865 Td
/F6.0 11 Tf
<28> Tj
ET
@@ -158121,7 +157955,7 @@ ET
0.200 0.200 0.200 SCN
BT
-197.74 551.2750000000001 Td
+197.74 609.865 Td
/F6.0 11 Tf
<4c6f616e61626c65> Tj
ET
@@ -158132,7 +157966,7 @@ ET
0.200 0.200 0.200 SCN
BT
-241.74 551.2750000000001 Td
+241.74 609.865 Td
/F6.0 11 Tf
<20> Tj
ET
@@ -158143,7 +157977,7 @@ ET
0.200 0.200 0.200 SCN
BT
-247.24 551.2750000000001 Td
+247.24 609.865 Td
/F6.0 11 Tf
<6c> Tj
ET
@@ -158154,7 +157988,7 @@ ET
0.200 0.200 0.200 SCN
BT
-252.74 551.2750000000001 Td
+252.74 609.865 Td
/F6.0 11 Tf
<2c> Tj
ET
@@ -158165,7 +157999,7 @@ ET
0.200 0.200 0.200 SCN
BT
-258.24 551.2750000000001 Td
+258.24 609.865 Td
/F6.0 11 Tf
<20> Tj
ET
@@ -158176,7 +158010,7 @@ ET
0.200 0.200 0.200 SCN
BT
-263.74 551.2750000000001 Td
+263.74 609.865 Td
/F6.0 11 Tf
<426f72726f776572> Tj
ET
@@ -158187,7 +158021,7 @@ ET
0.200 0.200 0.200 SCN
BT
-307.74 551.2750000000001 Td
+307.74 609.865 Td
/F6.0 11 Tf
<20> Tj
ET
@@ -158198,7 +158032,7 @@ ET
0.200 0.200 0.200 SCN
BT
-313.24 551.2750000000001 Td
+313.24 609.865 Td
/F6.0 11 Tf
<62> Tj
ET
@@ -158209,7 +158043,7 @@ ET
0.200 0.200 0.200 SCN
BT
-318.74 551.2750000000001 Td
+318.74 609.865 Td
/F6.0 11 Tf
<29> Tj
ET
@@ -158220,7 +158054,7 @@ ET
0.200 0.200 0.200 SCN
BT
-324.24 551.2750000000001 Td
+324.24 609.865 Td
/F6.0 11 Tf
<3b> Tj
ET
@@ -158231,7 +158065,7 @@ ET
0.200 0.200 0.200 SCN
BT
-71.24000000000001 536.5350000000001 Td
+71.24000000000001 595.125 Td
/F6.0 11 Tf
<7d> Tj
ET
@@ -158242,7 +158076,7 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24000000000001 498.656 Td
+60.24000000000001 557.2460000000001 Td
/F1.0 10.5 Tf
<616e642074686520656e7469746965733a> Tj
ET
@@ -158251,28 +158085,28 @@ ET
0.000 0.000 0.000 scn
q
0.961 0.961 0.961 scn
-64.240 482.840 m
-531.040 482.840 l
-533.249 482.840 535.040 481.049 535.040 478.840 c
-535.040 450.100 l
-535.040 447.891 533.249 446.100 531.040 446.100 c
-64.240 446.100 l
-62.031 446.100 60.240 447.891 60.240 450.100 c
-60.240 478.840 l
-60.240 481.049 62.031 482.840 64.240 482.840 c
+64.240 541.430 m
+531.040 541.430 l
+533.249 541.430 535.040 539.639 535.040 537.430 c
+535.040 508.690 l
+535.040 506.481 533.249 504.690 531.040 504.690 c
+64.240 504.690 l
+62.031 504.690 60.240 506.481 60.240 508.690 c
+60.240 537.430 l
+60.240 539.639 62.031 541.430 64.240 541.430 c
h
f
0.800 0.800 0.800 SCN
0.75 w
-64.240 482.840 m
-531.040 482.840 l
-533.249 482.840 535.040 481.049 535.040 478.840 c
-535.040 450.100 l
-535.040 447.891 533.249 446.100 531.040 446.100 c
-64.240 446.100 l
-62.031 446.100 60.240 447.891 60.240 450.100 c
-60.240 478.840 l
-60.240 481.049 62.031 482.840 64.240 482.840 c
+64.240 541.430 m
+531.040 541.430 l
+533.249 541.430 535.040 539.639 535.040 537.430 c
+535.040 508.690 l
+535.040 506.481 533.249 504.690 531.040 504.690 c
+64.240 504.690 l
+62.031 504.690 60.240 506.481 60.240 508.690 c
+60.240 537.430 l
+60.240 539.639 62.031 541.430 64.240 541.430 c
h
S
Q
@@ -158280,7 +158114,7 @@ Q
0.000 0.400 0.600 SCN
BT
-71.24000000000001 460.01500000000004 Td
+71.24000000000001 518.605 Td
/F6.0 11 Tf
<7075626c6963> Tj
ET
@@ -158291,7 +158125,7 @@ ET
0.200 0.200 0.200 SCN
BT
-104.24000000000001 460.01500000000004 Td
+104.24000000000001 518.605 Td
/F6.0 11 Tf
<20> Tj
ET
@@ -158302,7 +158136,7 @@ ET
0.000 0.467 0.533 SCN
BT
-109.74000000000001 460.01500000000004 Td
+109.74000000000001 518.605 Td
/F6.0 11 Tf
<636c617373> Tj
ET
@@ -158313,7 +158147,7 @@ ET
0.200 0.200 0.200 SCN
BT
-137.24 460.01500000000004 Td
+137.24 518.605 Td
/F6.0 11 Tf
<20> Tj
ET
@@ -158324,7 +158158,7 @@ ET
0.000 0.667 0.533 SCN
BT
-142.74 460.01500000000004 Td
+142.74 518.605 Td
/F6.0 11 Tf
<426f6f6b> Tj
ET
@@ -158335,7 +158169,7 @@ ET
0.200 0.200 0.200 SCN
BT
-164.74 460.01500000000004 Td
+164.74 518.605 Td
/F6.0 11 Tf
<20> Tj
ET
@@ -158346,7 +158180,7 @@ ET
0.000 0.400 0.600 SCN
BT
-170.24 460.01500000000004 Td
+170.24 518.605 Td
/F6.0 11 Tf
<696d706c656d656e7473> Tj
ET
@@ -158357,7 +158191,7 @@ ET
0.200 0.200 0.200 SCN
BT
-225.24 460.01500000000004 Td
+225.24 518.605 Td
/F6.0 11 Tf
<20> Tj
ET
@@ -158368,7 +158202,7 @@ ET
0.200 0.200 0.200 SCN
BT
-230.74 460.01500000000004 Td
+230.74 518.605 Td
/F6.0 11 Tf
<4c6f616e61626c65> Tj
ET
@@ -158379,7 +158213,7 @@ ET
0.200 0.200 0.200 SCN
BT
-274.74 460.01500000000004 Td
+274.74 518.605 Td
/F6.0 11 Tf
<20> Tj
ET
@@ -158390,7 +158224,7 @@ ET
0.200 0.200 0.200 SCN
BT
-280.24 460.01500000000004 Td
+280.24 518.605 Td
/F6.0 11 Tf
<7b> Tj
ET
@@ -158401,7 +158235,7 @@ ET
0.200 0.200 0.200 SCN
BT
-285.74 460.01500000000004 Td
+285.74 518.605 Td
/F6.0 11 Tf
<20> Tj
ET
@@ -158412,7 +158246,7 @@ ET
0.200 0.200 0.200 SCN
BT
-291.24 460.01500000000004 Td
+291.24 518.605 Td
/F6.0 11 Tf
<2e> Tj
ET
@@ -158423,7 +158257,7 @@ ET
0.200 0.200 0.200 SCN
BT
-296.74 460.01500000000004 Td
+296.74 518.605 Td
/F6.0 11 Tf
<2e> Tj
ET
@@ -158434,7 +158268,7 @@ ET
0.200 0.200 0.200 SCN
BT
-302.24 460.01500000000004 Td
+302.24 518.605 Td
/F6.0 11 Tf
<2e> Tj
ET
@@ -158445,7 +158279,7 @@ ET
0.200 0.200 0.200 SCN
BT
-307.74 460.01500000000004 Td
+307.74 518.605 Td
/F6.0 11 Tf
<20> Tj
ET
@@ -158456,7 +158290,7 @@ ET
0.200 0.200 0.200 SCN
BT
-313.24 460.01500000000004 Td
+313.24 518.605 Td
/F6.0 11 Tf
<7d> Tj
ET
@@ -158467,7 +158301,7 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24000000000001 422.136 Td
+60.24000000000001 480.72600000000006 Td
/F1.0 10.5 Tf
<616e64> Tj
ET
@@ -158476,28 +158310,28 @@ ET
0.000 0.000 0.000 scn
q
0.961 0.961 0.961 scn
-64.240 406.320 m
-531.040 406.320 l
-533.249 406.320 535.040 404.529 535.040 402.320 c
-535.040 373.580 l
-535.040 371.371 533.249 369.580 531.040 369.580 c
-64.240 369.580 l
-62.031 369.580 60.240 371.371 60.240 373.580 c
-60.240 402.320 l
-60.240 404.529 62.031 406.320 64.240 406.320 c
+64.240 464.910 m
+531.040 464.910 l
+533.249 464.910 535.040 463.119 535.040 460.910 c
+535.040 432.170 l
+535.040 429.961 533.249 428.170 531.040 428.170 c
+64.240 428.170 l
+62.031 428.170 60.240 429.961 60.240 432.170 c
+60.240 460.910 l
+60.240 463.119 62.031 464.910 64.240 464.910 c
h
f
0.800 0.800 0.800 SCN
0.75 w
-64.240 406.320 m
-531.040 406.320 l
-533.249 406.320 535.040 404.529 535.040 402.320 c
-535.040 373.580 l
-535.040 371.371 533.249 369.580 531.040 369.580 c
-64.240 369.580 l
-62.031 369.580 60.240 371.371 60.240 373.580 c
-60.240 402.320 l
-60.240 404.529 62.031 406.320 64.240 406.320 c
+64.240 464.910 m
+531.040 464.910 l
+533.249 464.910 535.040 463.119 535.040 460.910 c
+535.040 432.170 l
+535.040 429.961 533.249 428.170 531.040 428.170 c
+64.240 428.170 l
+62.031 428.170 60.240 429.961 60.240 432.170 c
+60.240 460.910 l
+60.240 463.119 62.031 464.910 64.240 464.910 c
h
S
Q
@@ -158505,7 +158339,7 @@ Q
0.000 0.400 0.600 SCN
BT
-71.24000000000001 383.49500000000006 Td
+71.24000000000001 442.0850000000001 Td
/F6.0 11 Tf
<7075626c6963> Tj
ET
@@ -158516,7 +158350,7 @@ ET
0.200 0.200 0.200 SCN
BT
-104.24000000000001 383.49500000000006 Td
+104.24000000000001 442.0850000000001 Td
/F6.0 11 Tf
<20> Tj
ET
@@ -158527,7 +158361,7 @@ ET
0.000 0.467 0.533 SCN
BT
-109.74000000000001 383.49500000000006 Td
+109.74000000000001 442.0850000000001 Td
/F6.0 11 Tf
<636c617373> Tj
ET
@@ -158538,7 +158372,7 @@ ET
0.200 0.200 0.200 SCN
BT
-137.24 383.49500000000006 Td
+137.24 442.0850000000001 Td
/F6.0 11 Tf
<20> Tj
ET
@@ -158549,7 +158383,7 @@ ET
0.000 0.667 0.533 SCN
BT
-142.74 383.49500000000006 Td
+142.74 442.0850000000001 Td
/F6.0 11 Tf
<4c6962726172794d656d626572> Tj
ET
@@ -158560,7 +158394,7 @@ ET
0.200 0.200 0.200 SCN
BT
-214.24 383.49500000000006 Td
+214.24 442.0850000000001 Td
/F6.0 11 Tf
<20> Tj
ET
@@ -158571,7 +158405,7 @@ ET
0.000 0.400 0.600 SCN
BT
-219.74 383.49500000000006 Td
+219.74 442.0850000000001 Td
/F6.0 11 Tf
<696d706c656d656e7473> Tj
ET
@@ -158582,7 +158416,7 @@ ET
0.200 0.200 0.200 SCN
BT
-274.74 383.49500000000006 Td
+274.74 442.0850000000001 Td
/F6.0 11 Tf
<20> Tj
ET
@@ -158593,7 +158427,7 @@ ET
0.200 0.200 0.200 SCN
BT
-280.24 383.49500000000006 Td
+280.24 442.0850000000001 Td
/F6.0 11 Tf
<426f72726f776572> Tj
ET
@@ -158604,7 +158438,7 @@ ET
0.200 0.200 0.200 SCN
BT
-324.24 383.49500000000006 Td
+324.24 442.0850000000001 Td
/F6.0 11 Tf
<20> Tj
ET
@@ -158615,7 +158449,7 @@ ET
0.200 0.200 0.200 SCN
BT
-329.74 383.49500000000006 Td
+329.74 442.0850000000001 Td
/F6.0 11 Tf
<7b> Tj
ET
@@ -158626,7 +158460,7 @@ ET
0.200 0.200 0.200 SCN
BT
-335.24 383.49500000000006 Td
+335.24 442.0850000000001 Td
/F6.0 11 Tf
<20> Tj
ET
@@ -158637,7 +158471,7 @@ ET
0.200 0.200 0.200 SCN
BT
-340.74 383.49500000000006 Td
+340.74 442.0850000000001 Td
/F6.0 11 Tf
<2e> Tj
ET
@@ -158648,7 +158482,7 @@ ET
0.200 0.200 0.200 SCN
BT
-346.24 383.49500000000006 Td
+346.24 442.0850000000001 Td
/F6.0 11 Tf
<2e> Tj
ET
@@ -158659,7 +158493,7 @@ ET
0.200 0.200 0.200 SCN
BT
-351.74 383.49500000000006 Td
+351.74 442.0850000000001 Td
/F6.0 11 Tf
<2e> Tj
ET
@@ -158670,7 +158504,7 @@ ET
0.200 0.200 0.200 SCN
BT
-357.24 383.49500000000006 Td
+357.24 442.0850000000001 Td
/F6.0 11 Tf
<20> Tj
ET
@@ -158681,7 +158515,7 @@ ET
0.200 0.200 0.200 SCN
BT
-362.74 383.49500000000006 Td
+362.74 442.0850000000001 Td
/F6.0 11 Tf
<7d> Tj
ET
@@ -158692,7 +158526,7 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24000000000001 345.61600000000004 Td
+60.24000000000001 404.2060000000001 Td
/F1.0 10.5 Tf
<7468656e2074686520> Tj
ET
@@ -158703,7 +158537,7 @@ ET
0.694 0.129 0.275 SCN
BT
-104.39250000000001 345.61600000000004 Td
+104.39250000000001 404.2060000000001 Td
/F6.0 10.5 Tf
<626f72726f7728> Tj
ET
@@ -158714,7 +158548,7 @@ ET
0.694 0.129 0.275 SCN
BT
-141.1425 345.61600000000004 Td
+141.1425 404.2060000000001 Td
/F7.0 10.5 Tf
<c9> Tj
ET
@@ -158725,7 +158559,7 @@ ET
0.694 0.129 0.275 SCN
BT
-151.6425 345.61600000000004 Td
+151.6425 404.2060000000001 Td
/F6.0 10.5 Tf
<29> Tj
ET
@@ -158736,7 +158570,7 @@ ET
0.200 0.200 0.200 SCN
BT
-156.8925 345.61600000000004 Td
+156.8925 404.2060000000001 Td
/F1.0 10.5 Tf
<20616374696f6e2077696c6c20626520636f6e747269627574656420746f20626f746820> Tj
ET
@@ -158747,7 +158581,7 @@ ET
0.694 0.129 0.275 SCN
BT
-329.26050000000004 345.61600000000004 Td
+329.26050000000004 404.2060000000001 Td
/F6.0 10.5 Tf
<426f6f6b> Tj
ET
@@ -158758,7 +158592,7 @@ ET
0.200 0.200 0.200 SCN
BT
-350.26050000000004 345.61600000000004 Td
+350.26050000000004 404.2060000000001 Td
/F1.0 10.5 Tf
<20616e6420746f20> Tj
ET
@@ -158769,7 +158603,7 @@ ET
0.694 0.129 0.275 SCN
BT
-387.28350000000006 345.61600000000004 Td
+387.28350000000006 404.2060000000001 Td
/F6.0 10.5 Tf
<4c6962726172794d656d626572> Tj
ET
@@ -158780,7 +158614,7 @@ ET
0.200 0.200 0.200 SCN
BT
-455.53350000000006 345.61600000000004 Td
+455.53350000000006 404.2060000000001 Td
/F1.0 10.5 Tf
<2e> Tj
ET
@@ -158793,7 +158627,7 @@ ET
2.307 Tw
BT
-60.24000000000001 317.83600000000007 Td
+60.24000000000001 376.4260000000001 Td
/F1.0 10.5 Tf
[<3d2055492048696e7473203a4e6f746963653a204c6963656e73656420746f207468652041706163686520536f6674776172652046> 40.0390625 <6f756e646174696f6e20284153462920756e646572206f6e65206f72206d6f7265>] TJ
ET
@@ -158808,7 +158642,7 @@ ET
1.015 Tw
BT
-60.24000000000001 302.05600000000004 Td
+60.24000000000001 360.6460000000001 Td
/F1.0 10.5 Tf
[<636f6e7472696275746f72206c6963656e73652061677265656d656e74732e2053656520746865204e4f> 20.01953125 <544943452066696c652064697374726962757465642077697468207468697320776f726b20666f72206164646974696f6e616c>] TJ
ET
@@ -158823,7 +158657,7 @@ ET
0.141 Tw
BT
-60.24000000000001 286.27600000000007 Td
+60.24000000000001 344.8660000000001 Td
/F1.0 10.5 Tf
[<696e666f726d6174696f6e20726567617264696e6720636f70> 20.01953125 <797269676874206f776e6572736869702e2054686520415346206c6963656e73657320746869732066696c6520746f20796f7520756e6465722074686520417061636865>] TJ
ET
@@ -158838,7 +158672,7 @@ ET
1.425 Tw
BT
-60.24000000000001 270.4960000000001 Td
+60.24000000000001 329.0860000000001 Td
/F1.0 10.5 Tf
[<4c6963656e73652c2056> 60.05859375 <657273696f6e20322e30202874686520224c6963656e736522293b20796f75206d61> 20.01953125 <79206e6f742075736520746869732066696c652065786365707420696e20636f6d706c69616e6365207769746820746865>] TJ
ET
@@ -158853,7 +158687,7 @@ ET
0.391 Tw
BT
-60.24000000000001 254.71600000000007 Td
+60.24000000000001 313.3060000000001 Td
/F1.0 10.5 Tf
[<4c6963656e73652e2059> 69.82421875 <6f75206d61> 20.01953125 <79206f627461696e206120636f70> 20.01953125 <79206f6620746865204c6963656e73652061742e20>] TJ
ET
@@ -158868,7 +158702,7 @@ ET
0.391 Tw
BT
-309.2540435014204 254.71600000000007 Td
+309.2540435014204 313.3060000000001 Td
/F1.0 10.5 Tf
[<687474703a2f2f777777> 69.82421875 <2e6170616368652e6f72672f6c6963656e7365732f4c4943454e53452d322e30>] TJ
ET
@@ -158883,7 +158717,7 @@ ET
0.391 Tw
BT
-529.3043892045455 254.71600000000007 Td
+529.3043892045455 313.3060000000001 Td
/F1.0 10.5 Tf
<202e> Tj
ET
@@ -158898,7 +158732,7 @@ ET
2.354 Tw
BT
-60.24000000000001 238.93600000000006 Td
+60.24000000000001 297.52600000000007 Td
/F1.0 10.5 Tf
[<556e6c6573732072657175697265642062> 20.01953125 <79206170706c696361626c65206c6177206f722061677265656420746f20696e2077726974696e672c20736f66747761726520646973747269627574656420756e64657220746865>] TJ
ET
@@ -158913,7 +158747,7 @@ ET
0.770 Tw
BT
-60.24000000000001 223.15600000000006 Td
+60.24000000000001 281.7460000000001 Td
/F1.0 10.5 Tf
[<4c6963656e7365206973206469737472696275746564206f6e20616e2022> 80.078125 <4153204953222042> 20.01953125 <415349532c20574954484f55542057> 60.05859375 <415252414e54494553204f522020434f4e444954494f4e53204f4620414e59>] TJ
ET
@@ -158928,7 +158762,7 @@ ET
4.760 Tw
BT
-60.24000000000001 207.37600000000006 Td
+60.24000000000001 265.9660000000001 Td
/F1.0 10.5 Tf
<4b494e442c206569746865722065787072657373206f7220696d706c6965642e2053656520746865204c6963656e736520666f7220746865207370656369666963206c616e677561676520676f7665726e696e67> Tj
ET
@@ -158941,7 +158775,7 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24000000000001 191.59600000000006 Td
+60.24000000000001 250.1860000000001 Td
/F1.0 10.5 Tf
<7065726d697373696f6e7320616e64206c696d69746174696f6e7320756e64657220746865204c6963656e73652e> Tj
ET
@@ -158954,7 +158788,7 @@ ET
2.437 Tw
BT
-60.24000000000001 163.81600000000006 Td
+60.24000000000001 222.4060000000001 Td
/F1.0 10.5 Tf
[<5468652041706163686520497369732070726f6772> 20.01953125 <616d6d696e67206d6f64656c20696e636c75646573207365766572> 20.01953125 <616c206d656368616e69736d7320666f72206120646f6d61696e206f626a65637420746f>] TJ
ET
@@ -158969,7 +158803,7 @@ ET
0.784 Tw
BT
-60.24000000000001 148.03600000000006 Td
+60.24000000000001 206.6260000000001 Td
/F1.0 10.5 Tf
[<70726f766964652055492068696e74732e2054686573652072> 20.01953125 <616e67652066726f6d207468656972207469746c652028736f20616e20656e642d757365722063616e2064697374696e6775697368206f6e65206f626a6563742066726f6d>] TJ
ET
@@ -158982,7 +158816,7 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24000000000001 132.25600000000006 Td
+60.24000000000001 190.8460000000001 Td
/F1.0 10.5 Tf
<616e6f7468657229207468726f75676820746f2068696e747320746861742063616e20696d7061637420746865697220435353207374796c696e672e> Tj
ET
@@ -158995,7 +158829,7 @@ ET
2.976 Tw
BT
-60.24000000000001 104.47600000000006 Td
+60.24000000000001 163.0660000000001 Td
/F1.0 10.5 Tf
[<3d204c61> 20.01953125 <796f7574203a4e6f746963653a204c6963656e73656420746f207468652041706163686520536f6674776172652046> 40.0390625 <6f756e646174696f6e20284153462920756e646572206f6e65206f72206d6f7265>] TJ
ET
@@ -159010,7 +158844,7 @@ ET
1.015 Tw
BT
-60.24000000000001 88.69600000000005 Td
+60.24000000000001 147.2860000000001 Td
/F1.0 10.5 Tf
[<636f6e7472696275746f72206c6963656e73652061677265656d656e74732e2053656520746865204e4f> 20.01953125 <544943452066696c652064697374726962757465642077697468207468697320776f726b20666f72206164646974696f6e616c>] TJ
ET
@@ -159025,7 +158859,7 @@ ET
0.141 Tw
BT
-60.24000000000001 72.91600000000005 Td
+60.24000000000001 131.50600000000009 Td
/F1.0 10.5 Tf
[<696e666f726d6174696f6e20726567617264696e6720636f70> 20.01953125 <797269676874206f776e6572736869702e2054686520415346206c6963656e73657320746869732066696c6520746f20796f7520756e6465722074686520417061636865>] TJ
ET
@@ -159040,7 +158874,7 @@ ET
1.425 Tw
BT
-60.24000000000001 57.13600000000005 Td
+60.24000000000001 115.72600000000008 Td
/F1.0 10.5 Tf
[<4c6963656e73652c2056> 60.05859375 <657273696f6e20322e30202874686520224c6963656e736522293b20796f75206d61> 20.01953125 <79206e6f742075736520746869732066696c652065786365707420696e20636f6d706c69616e6365207769746820746865>] TJ
ET
@@ -159049,78 +158883,13 @@ ET
0.000 Tw
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-q
-0.000 0.000 0.000 scn
-0.000 0.000 0.000 SCN
-1 w
-0 J
-0 j
-[ ] 0 d
-/Stamp1 Do
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-BT
-530.9469999999999 14.388 Td
-/F1.0 9 Tf
-<313333> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-Q
-Q
-
-endstream
-endobj
-924 0 obj
-<< /Type /Page
-/Parent 3 0 R
-/MediaBox [0 0 595.28 841.89]
-/Contents 923 0 R
-/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F1.0 8 0 R
-/F4.0 49 0 R
-/F6.0 70 0 R
-/F7.0 169 0 R
->>
-/XObject << /Stamp1 1253 0 R
->>
->>
-/Annots [926 0 R]
->>
-endobj
-925 0 obj
-[924 0 R /XYZ 60.24 329.80000000000007 null]
-endobj
-926 0 obj
-<< /Border [0 0 0]
-/A << /Type /Action
-/S /URI
-/URI (http://www.apache.org/licenses/LICENSE-2.0)
->>
-/Subtype /Link
-/Rect [309.2540435014204 251.65000000000006 529.3043892045455 265.93000000000006]
-/Type /Annot
->>
-endobj
-927 0 obj
-[924 0 R /XYZ 60.24 116.44000000000005 null]
-endobj
-928 0 obj
-<< /Length 14239
->>
-stream
-q
-/DeviceRGB cs
0.200 0.200 0.200 scn
-/DeviceRGB CS
0.200 0.200 0.200 SCN
0.391 Tw
BT
-60.24 794.6759999999999 Td
+60.24000000000001 99.94600000000008 Td
/F1.0 10.5 Tf
[<4c6963656e73652e2059> 69.82421875 <6f75206d61> 20.01953125 <79206f627461696e206120636f70> 20.01953125 <79206f6620746865204c6963656e73652061742e20>] TJ
ET
@@ -159135,7 +158904,7 @@ ET
0.391 Tw
BT
-309.2540435014204 794.6759999999999 Td
+309.2540435014204 99.94600000000008 Td
/F1.0 10.5 Tf
[<687474703a2f2f777777> 69.82421875 <2e6170616368652e6f72672f6c6963656e7365732f4c4943454e53452d322e30>] TJ
ET
@@ -159150,7 +158919,7 @@ ET
0.391 Tw
BT
-529.3043892045454 794.6759999999999 Td
+529.3043892045455 99.94600000000008 Td
/F1.0 10.5 Tf
<202e> Tj
ET
@@ -159165,7 +158934,7 @@ ET
2.354 Tw
BT
-60.24 778.896 Td
+60.24000000000001 84.16600000000008 Td
/F1.0 10.5 Tf
[<556e6c6573732072657175697265642062> 20.01953125 <79206170706c696361626c65206c6177206f722061677265656420746f20696e2077726974696e672c20736f66747761726520646973747269627574656420756e64657220746865>] TJ
ET
@@ -159180,7 +158949,7 @@ ET
0.770 Tw
BT
-60.24 763.116 Td
+60.24000000000001 68.38600000000008 Td
/F1.0 10.5 Tf
[<4c6963656e7365206973206469737472696275746564206f6e20616e2022> 80.078125 <4153204953222042> 20.01953125 <415349532c20574954484f55542057> 60.05859375 <415252414e54494553204f522020434f4e444954494f4e53204f4620414e59>] TJ
ET
@@ -159195,7 +158964,7 @@ ET
4.760 Tw
BT
-60.24 747.336 Td
+60.24000000000001 52.60600000000008 Td
/F1.0 10.5 Tf
<4b494e442c206569746865722065787072657373206f7220696d706c6965642e2053656520746865204c6963656e736520666f7220746865207370656369666963206c616e677561676520676f7665726e696e67> Tj
ET
@@ -159204,11 +158973,86 @@ ET
0.000 Tw
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
+q
+0.000 0.000 0.000 scn
+0.000 0.000 0.000 SCN
+1 w
+0 J
+0 j
+[ ] 0 d
+/Stamp1 Do
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
BT
-60.24 731.556 Td
+530.9469999999999 14.388 Td
+/F1.0 9 Tf
+<313333> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+Q
+Q
+
+endstream
+endobj
+922 0 obj
+<< /Type /Page
+/Parent 3 0 R
+/MediaBox [0 0 595.28 841.89]
+/Contents 921 0 R
+/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
+/Font << /F1.0 8 0 R
+/F6.0 70 0 R
+/F7.0 169 0 R
+>>
+/XObject << /Stamp1 1247 0 R
+>>
+>>
+/Annots [924 0 R 926 0 R]
+>>
+endobj
+923 0 obj
+[922 0 R /XYZ 60.24 388.3900000000001 null]
+endobj
+924 0 obj
+<< /Border [0 0 0]
+/A << /Type /Action
+/S /URI
+/URI (http://www.apache.org/licenses/LICENSE-2.0)
+>>
+/Subtype /Link
+/Rect [309.2540435014204 310.2400000000001 529.3043892045455 324.5200000000001]
+/Type /Annot
+>>
+endobj
+925 0 obj
+[922 0 R /XYZ 60.24 175.0300000000001 null]
+endobj
+926 0 obj
+<< /Border [0 0 0]
+/A << /Type /Action
+/S /URI
+/URI (http://www.apache.org/licenses/LICENSE-2.0)
+>>
+/Subtype /Link
+/Rect [309.2540435014204 96.88000000000008 529.3043892045455 111.16000000000008]
+/Type /Annot
+>>
+endobj
+927 0 obj
+<< /Length 12631
+>>
+stream
+q
+/DeviceRGB cs
+0.200 0.200 0.200 scn
+/DeviceRGB CS
+0.200 0.200 0.200 SCN
+
+BT
+60.24 794.6759999999999 Td
/F1.0 10.5 Tf
<7065726d697373696f6e7320616e64206c696d69746174696f6e7320756e64657220746865204c6963656e73652e> Tj
ET
@@ -159221,7 +159065,7 @@ ET
2.288 Tw
BT
-60.24 703.776 Td
+60.24 766.896 Td
/F1.0 10.5 Tf
[<546865206d6f7374207369676e69666963616e7420617370656374206f662074686520554920697320746865206c61> 20.01953125 <796f7574206f6620746865206f626a656374d573206d656d626572733a206974732070726f706572746965732c>] TJ
ET
@@ -159234,7 +159078,7 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 687.996 Td
+60.24 751.116 Td
/F1.0 10.5 Tf
<636f6c6c656374696f6e7320616e6420616374696f6e732e2054686573652063616e206265206f7267616e697a656420696e746f20636f6c756d6e732c20726f777320616e6420746162732e> Tj
ET
@@ -159247,7 +159091,7 @@ ET
1.950 Tw
BT
-60.24 660.216 Td
+60.24 723.336 Td
/F1.0 10.5 Tf
[<546869732063616e206265206163636f6d706c6973686564207573696e672065697468657220616e6e6f746174696f6e73206f72207468726f7567682061207365706172> 20.01953125 <6174652066696c652d6261736564206c61> 20.01953125 <796f75742e>] TJ
ET
@@ -159260,7 +159104,7 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 644.436 Td
+60.24 707.556 Td
/F1.0 10.5 Tf
<53696e636520746869732069732061206c6172676520746f7069632c2069742068617320697473206f776e20> Tj
ET
@@ -159271,7 +159115,7 @@ ET
0.259 0.545 0.792 SCN
BT
-257.157 644.436 Td
+257.157 707.556 Td
/F1.0 10.5 Tf
[<6c61> 20.01953125 <796f75742063686170746572>] TJ
ET
@@ -159282,7 +159126,7 @@ ET
0.200 0.200 0.200 SCN
BT
-329.575294921875 644.436 Td
+329.575294921875 707.556 Td
/F1.0 10.5 Tf
[<20696e20746865205769636b> 20.01953125 <6574207669657765722067756964652e>] TJ
ET
@@ -159295,7 +159139,7 @@ ET
0.247 Tw
BT
-60.24 616.6560000000001 Td
+60.24 679.7760000000001 Td
/F1.0 10.5 Tf
[<3d204f626a656374205469746c657320616e642049636f6e73203a4e6f746963653a204c6963656e73656420746f207468652041706163686520536f6674776172652046> 40.0390625 <6f756e646174696f6e20284153462920756e646572206f6e65>] TJ
ET
@@ -159310,7 +159154,7 @@ ET
1.775 Tw
BT
-60.24 600.8760000000001 Td
+60.24 663.9960000000001 Td
/F1.0 10.5 Tf
[<6f72206d6f726520636f6e7472696275746f72206c6963656e73652061677265656d656e74732e2053656520746865204e4f> 20.01953125 <544943452066696c652064697374726962757465642077697468207468697320776f726b20666f72>] TJ
ET
@@ -159325,7 +159169,7 @@ ET
0.546 Tw
BT
-60.24 585.0960000000001 Td
+60.24 648.2160000000001 Td
/F1.0 10.5 Tf
[<6164646974696f6e616c20696e666f726d6174696f6e20726567617264696e6720636f70> 20.01953125 <797269676874206f776e6572736869702e2054686520415346206c6963656e73657320746869732066696c6520746f20796f7520756e646572>] TJ
ET
@@ -159340,7 +159184,7 @@ ET
0.463 Tw
BT
-60.24 569.3160000000001 Td
+60.24 632.4360000000001 Td
/F1.0 10.5 Tf
[<74686520417061636865204c6963656e73652c2056> 60.05859375 <657273696f6e20322e30202874686520224c6963656e736522293b20796f75206d61> 20.01953125 <79206e6f742075736520746869732066696c652065786365707420696e20636f6d706c69616e6365>] TJ
ET
@@ -159355,7 +159199,7 @@ ET
17.115 Tw
BT
-60.24 553.5360000000001 Td
+60.24 616.6560000000002 Td
/F1.0 10.5 Tf
[<7769746820746865204c6963656e73652e2059> 69.82421875 <6f75206d61> 20.01953125 <79206f627461696e206120636f70> 20.01953125 <79206f6620746865204c6963656e73652061742e>] TJ
ET
@@ -159370,7 +159214,7 @@ ET
0.114 Tw
BT
-60.24 537.7560000000001 Td
+60.24 600.8760000000001 Td
/F1.0 10.5 Tf
[<687474703a2f2f777777> 69.82421875 <2e6170616368652e6f72672f6c6963656e7365732f4c4943454e53452d322e30>] TJ
ET
@@ -159385,7 +159229,7 @@ ET
0.114 Tw
BT
-280.290345703125 537.7560000000001 Td
+280.290345703125 600.8760000000001 Td
/F1.0 10.5 Tf
[<202e20556e6c6573732072657175697265642062> 20.01953125 <79206170706c696361626c65206c6177206f722061677265656420746f20696e>] TJ
ET
@@ -159400,7 +159244,7 @@ ET
1.078 Tw
BT
-60.24 521.9760000000001 Td
+60.24 585.0960000000001 Td
/F1.0 10.5 Tf
[<77726974696e672c20736f66747761726520646973747269627574656420756e64657220746865204c6963656e7365206973206469737472696275746564206f6e20616e2022> 80.078125 <4153204953222042> 20.01953125 <415349532c20574954484f5554>] TJ
ET
@@ -159415,7 +159259,7 @@ ET
1.148 Tw
BT
-60.24 506.19600000000014 Td
+60.24 569.3160000000001 Td
/F1.0 10.5 Tf
[<57> 60.05859375 <415252414e54494553204f522020434f4e444954494f4e53204f4620414e59204b494e442c206569746865722065787072657373206f7220696d706c6965642e2053656520746865204c6963656e736520666f72>] TJ
ET
@@ -159428,7 +159272,7 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 490.4160000000001 Td
+60.24 553.5360000000001 Td
/F1.0 10.5 Tf
<746865207370656369666963206c616e677561676520676f7665726e696e67207065726d697373696f6e7320616e64206c696d69746174696f6e7320756e64657220746865204c6963656e73652e> Tj
ET
@@ -159441,7 +159285,7 @@ ET
0.443 Tw
BT
-60.24 462.63600000000014 Td
+60.24 525.7560000000001 Td
/F1.0 10.5 Tf
[<496e204170616368652049736973206576657279206f626a656374206973206964656e74696669656420746f2074686520757365722062> 20.01953125 <792061207469746c6520286c6162656c2920616e6420616e2069636f6e2e20546869732069732073686f776e>] TJ
ET
@@ -159456,7 +159300,7 @@ ET
1.393 Tw
BT
-60.24 446.8560000000001 Td
+60.24 509.9760000000001 Td
/F1.0 10.5 Tf
[<696e207365766572> 20.01953125 <616c20706c616365733a20617320746865206d61696e2068656164696e6720666f7220616e206f626a6563743b2061732061206c696e6b207465787420666f7220616e206f626a656374207265666572656e63696e67>] TJ
ET
@@ -159469,7 +159313,7 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 431.07600000000014 Td
+60.24 494.19600000000014 Td
/F1.0 10.5 Tf
<616e6f74686572206f626a6563742c20616e6420616c736f20696e207461626c657320726570726573656e74696e6720636f6c6c656374696f6e73206f66206f626a656374732e> Tj
ET
@@ -159482,7 +159326,7 @@ ET
1.317 Tw
BT
-60.24 403.2960000000001 Td
+60.24 466.4160000000001 Td
/F1.0 10.5 Tf
<5468652069636f6e206973206f6674656e207468652073616d6520666f7220616c6c20696e7374616e636573206f66206120706172746963756c617220636c6173732c20627574206974d57320616c736f20706f737369626c6520666f7220616e> Tj
ET
@@ -159497,7 +159341,7 @@ ET
0.729 Tw
BT
-60.24 387.5160000000001 Td
+60.24 450.6360000000001 Td
/F1.0 10.5 Tf
<696e646976696475616c20696e7374616e636520746f2072657475726e206120637573746f6d2069636f6e2e205468697320636f756c6420726570726573656e7420746865207374617465206f662074686174206f626a656374202865672061> Tj
ET
@@ -159510,7 +159354,7 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 371.7360000000001 Td
+60.24 434.8560000000001 Td
/F1.0 10.5 Tf
[<73686970706564206f726465722c207361> 20.01953125 <79> 89.84375 <2c206f72206f766572647565206c696272> 20.01953125 <61727920626f6f6b292e>] TJ
ET
@@ -159523,7 +159367,7 @@ ET
0.445 Tw
BT
-60.24 343.9560000000001 Td
+60.24 407.0760000000001 Td
/F1.0 10.5 Tf
<497420697320616c736f20706f737369626c6520666f7220616e206f626a65637420746f2070726f7669646520612043535320636c6173732068696e742e20496e20636f6e6a756e6374696f6e207769746820> Tj
ET
@@ -159538,7 +159382,7 @@ ET
0.445 Tw
BT
-457.0416470588235 343.9560000000001 Td
+457.0416470588235 407.0760000000001 Td
/F1.0 10.5 Tf
<637573746f6d697a656420435353> Tj
ET
@@ -159553,7 +159397,7 @@ ET
0.445 Tw
BT
-535.04 343.9560000000001 Td
+535.04 407.0760000000001 Td
ET
@@ -159566,7 +159410,7 @@ ET
0.005 Tw
BT
-60.24 328.17600000000004 Td
+60.24 391.29600000000005 Td
/F1.0 10.5 Tf
[<746869732063616e206265207573656420746f206170706c7920617262697472> 20.01953125 <617279207374796c696e673b20666f72206578616d706c652065616368206f626a65637420636f756c642062652072656e646572656420696e20612070616765>] TJ
ET
@@ -159579,7 +159423,7 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 312.3960000000001 Td
+60.24 375.5160000000001 Td
/F1.0 10.5 Tf
[<77697468206120646966666572656e74206261636b> 20.01953125 <67726f756e6420636f6c6f75722e>] TJ
ET
@@ -159590,7 +159434,7 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 284.61600000000004 Td
+60.24 347.73600000000005 Td
/F1.0 10.5 Tf
<3d3d204f626a656374205469746c65> Tj
ET
@@ -159603,7 +159447,7 @@ ET
1.266 Tw
BT
-60.24 256.83600000000007 Td
+60.24 319.9560000000001 Td
/F1.0 10.5 Tf
[<546865206f626a656374207469746c652069732061206c6162656c20746f206964656e7469667920616e206f626a65637420746f2074686520656e642d757365722e202047656e6572> 20.01953125 <616c6c7920746865206f626a656374207469746c652069732061>] TJ
ET
@@ -159618,7 +159462,7 @@ ET
1.832 Tw
BT
-60.24 241.05600000000007 Td
+60.24 304.17600000000004 Td
/F1.0 10.5 Tf
<6c6162656c20746f206964656e7469667920616e206f626a65637420746f2074686520656e642d757365722e20205468657265206973206e6f20726571756972656d656e7420666f7220697420746f206265206162736f6c7574656c79> Tj
ET
@@ -159633,7 +159477,7 @@ ET
0.508 Tw
BT
-60.24 225.27600000000007 Td
+60.24 288.3960000000001 Td
/F1.0 10.5 Tf
[<756e697175652c206275742069742073686f756c642062652022756e6971756520656e6f756768> 40.0390625 <2220746f2064697374696e677569736820746865206f626a6563742066726f6d206f74686572206f626a656374d573206c696b> 20.01953125 <656c7920746f>] TJ
ET
@@ -159646,7 +159490,7 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 209.49600000000007 Td
+60.24 272.6160000000001 Td
/F1.0 10.5 Tf
<62652072656e6465726564206f6e207468652073616d6520706167652e> Tj
ET
@@ -159659,7 +159503,7 @@ ET
1.409 Tw
BT
-60.24 181.71600000000007 Td
+60.24 244.83600000000007 Td
/F1.0 10.5 Tf
[<546865207469746c6520697320616c7761> 20.01953125 <79732073686f776e207769746820616e2069636f6e2c20736f2074686572652069732067656e6572> 20.01953125 <616c6c79206e6f206e65656420666f7220746865207469746c6520746f20696e636c756465>] TJ
ET
@@ -159674,7 +159518,7 @@ ET
2.483 Tw
BT
-60.24 165.93600000000006 Td
+60.24 229.05600000000007 Td
/F1.0 10.5 Tf
[<696e666f726d6174696f6e2061626f757420746865206f626a656374d57320747970652e202046> 40.0390625 <6f72206578616d706c6520746865207469746c65206f66206120637573746f6d6572206f626a6563742073686f756c646ed574>] TJ
ET
@@ -159689,7 +159533,7 @@ ET
0.770 Tw
BT
-60.24 150.15600000000006 Td
+60.24 213.27600000000007 Td
/F1.0 10.5 Tf
[<696e636c75646520746865206c69746572> 20.01953125 <616c20737472696e672022437573746f6d6572223b2069742063616e206a75737420686176652074686520637573746f6d6572> -29.78515625 <d573206e616d652c207265666572656e6365206f7220736f6d65>] TJ
ET
@@ -159702,7 +159546,7 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 134.37600000000006 Td
+60.24 197.49600000000007 Td
/F1.0 10.5 Tf
<6f74686572206d65616e696e6766756c20627573696e657373206964656e7469666965722e> Tj
ET
@@ -159713,7 +159557,7 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 106.59600000000006 Td
+60.24 169.71600000000007 Td
/F1.0 10.5 Tf
[<3d3d3d204465636c6172> 20.01953125 <6174697665207374796c65>] TJ
ET
@@ -159724,7 +159568,7 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 78.81600000000006 Td
+60.24 141.93600000000006 Td
/F1.0 10.5 Tf
<54686520> Tj
ET
@@ -159735,7 +159579,7 @@ ET
0.694 0.129 0.275 SCN
BT
-81.66 78.81600000000006 Td
+81.66 141.93600000000006 Td
/F6.0 10.5 Tf
<405469746c65> Tj
ET
@@ -159746,13 +159590,24 @@ ET
0.2
<TRUNCATED>
[22/39] isis-site git commit: ISIS-1810: updates docs for 2.0.0-M1
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/274edd1d/content/versions/2.0.0-M1/guides/ugvw/ugvw.pdf
----------------------------------------------------------------------
diff --git a/content/versions/2.0.0-M1/guides/ugvw/ugvw.pdf b/content/versions/2.0.0-M1/guides/ugvw/ugvw.pdf
index 0fea105..10ebf1c 100644
--- a/content/versions/2.0.0-M1/guides/ugvw/ugvw.pdf
+++ b/content/versions/2.0.0-M1/guides/ugvw/ugvw.pdf
@@ -4,8 +4,8 @@
<< /Title (Wicket Viewer)
/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:20180812182738+01'00')
-/ModDate (D:20180812182738+01'00')
+/CreationDate (D:20180814004122+02'00')
+/ModDate (D:20180814004122+02'00')
>>
endobj
2 0 obj
@@ -23,7 +23,7 @@ endobj
3 0 obj
<< /Type /Pages
/Count 94
-/Kids [7 0 R 10 0 R 12 0 R 14 0 R 38 0 R 50 0 R 63 0 R 71 0 R 79 0 R 88 0 R 94 0 R 100 0 R 109 0 R 113 0 R 116 0 R 127 0 R 131 0 R 144 0 R 151 0 R 160 0 R 167 0 R 170 0 R 181 0 R 187 0 R 193 0 R 203 0 R 217 0 R 220 0 R 233 0 R 240 0 R 245 0 R 250 0 R 264 0 R 276 0 R 285 0 R 288 0 R 293 0 R 298 0 R 305 0 R 309 0 R 313 0 R 321 0 R 337 0 R 339 0 R 347 0 R 356 0 R 358 0 R 362 0 R 369 0 R 375 0 R 378 0 R 380 0 R 387 0 R 397 0 R 403 0 R 411 0 R 416 0 R 423 0 R 430 0 R 436 0 R 445 0 R 451 0 R 462 0 R 467 0 R 471 0 R 480 0 R 484 0 R 493 0 R 501 0 R 507 0 R 509 0 R 516 0 R 520 0 R 525 0 R 528 0 R 532 0 R 536 0 R 543 0 R 546 0 R 553 0 R 557 0 R 575 0 R 584 0 R 587 0 R 592 0 R 599 0 R 603 0 R 606 0 R 621 0 R 623 0 R 631 0 R 633 0 R 638 0 R 641 0 R]
+/Kids [7 0 R 10 0 R 12 0 R 14 0 R 38 0 R 50 0 R 63 0 R 71 0 R 79 0 R 88 0 R 94 0 R 100 0 R 109 0 R 113 0 R 116 0 R 127 0 R 131 0 R 144 0 R 151 0 R 160 0 R 167 0 R 170 0 R 181 0 R 187 0 R 193 0 R 203 0 R 217 0 R 220 0 R 233 0 R 240 0 R 245 0 R 250 0 R 263 0 R 274 0 R 285 0 R 288 0 R 293 0 R 298 0 R 305 0 R 309 0 R 313 0 R 321 0 R 337 0 R 339 0 R 347 0 R 356 0 R 358 0 R 362 0 R 369 0 R 375 0 R 378 0 R 380 0 R 387 0 R 397 0 R 403 0 R 411 0 R 416 0 R 423 0 R 430 0 R 436 0 R 445 0 R 451 0 R 462 0 R 467 0 R 471 0 R 480 0 R 484 0 R 493 0 R 501 0 R 507 0 R 509 0 R 516 0 R 520 0 R 525 0 R 528 0 R 532 0 R 536 0 R 543 0 R 546 0 R 553 0 R 557 0 R 575 0 R 584 0 R 587 0 R 592 0 R 599 0 R 603 0 R 606 0 R 621 0 R 623 0 R 631 0 R 633 0 R 638 0 R 641 0 R]
>>
endobj
4 0 obj
@@ -33347,7 +33347,7 @@ stream
endstream
endobj
249 0 obj
-<< /Length 9442
+<< /Length 7623
>>
stream
q
@@ -33372,220 +33372,165 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-1.715 Tw
-
BT
48.24 335.524231292517 Td
/F1.0 10.5 Tf
-[<416c6c20746865206c61> 20.01953125 <796f757420616e6e6f746174696f6e732028656720>] TJ
+[<4c61> 20.01953125 <796f75742073656d616e746963732063616e20616c736f20626520737065636966696564207573696e672074686520766172696f757320>] 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
-1.715 Tw
-
BT
-206.18829854910712 335.524231292517 Td
+332.45379492187504 335.524231292517 Td
/F4.0 10.5 Tf
-<405265676578> Tj
+<5878784c61796f7574> 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
-1.715 Tw
-
BT
-237.68829854910712 335.524231292517 Td
+379.70379492187504 335.524231292517 Td
/F1.0 10.5 Tf
-<20616e6420> Tj
+<20616e6e6f746174696f6e733a> 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
-
-1.715 Tw
-
-BT
-265.66749999999996 335.524231292517 Td
-/F4.0 10.5 Tf
-<404e616d6564> Tj
-ET
-
-0.000 Tw
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
+-0.500 Tc
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-1.715 Tw
-
BT
-297.16749999999996 335.524231292517 Td
+56.88050000000001 307.744231292517 Td
/F1.0 10.5 Tf
-[<292068617665206265656e20646570726563617465642c20696e7374656164207265706c616365642062> 20.01953125 <7920746865>] TJ
+<a5> Tj
ET
-
-0.000 Tw
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
+
+0.000 Tc
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-12.048 Tw
-
BT
-48.24 319.74423129251704 Td
+66.24000000000001 307.744231292517 Td
/F1.0 10.5 Tf
-<766172696f757320> Tj
+<666f7220646f6d61696e2073657276696365733a20> 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
-12.048 Tw
-
BT
-100.73433333333332 319.74423129251704 Td
+170.9565 307.744231292517 Td
/F4.0 10.5 Tf
-<5878784c61796f7574> Tj
+<40446f6d61696e536572766963654c61796f7574> Tj
ET
-
-0.000 Tw
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
+
+-0.500 Tc
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-12.048 Tw
-
BT
-147.98433333333332 319.74423129251704 Td
+56.88050000000001 285.964231292517 Td
/F1.0 10.5 Tf
-<20616e6e6f746174696f6e733a20> Tj
+<a5> 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
-12.048 Tw
-
-BT
-240.23649999999998 319.74423129251704 Td
-/F4.0 10.5 Tf
-<40416374696f6e4c61796f7574> Tj
-ET
-
-
-0.000 Tw
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
+0.000 Tc
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-12.048 Tw
-
BT
-308.4865 319.74423129251704 Td
+66.24000000000001 285.964231292517 Td
/F1.0 10.5 Tf
-<20> Tj
+<666f7220646f6d61696e206f626a656374733a20> 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
-12.048 Tw
-
BT
-323.2543333333333 319.74423129251704 Td
+165.5595 285.964231292517 Td
/F4.0 10.5 Tf
-<40436f6c6c656374696f6e4c61796f7574> Tj
+<40446f6d61696e4f626a6563744c61796f7574> 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
-12.048 Tw
-
BT
-412.5043333333333 319.74423129251704 Td
+265.3095 285.964231292517 Td
/F1.0 10.5 Tf
-<2c2020> Tj
+<20616e6420> 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
-12.048 Tw
-
BT
-444.66499999999996 319.74423129251704 Td
+289.85850000000005 285.964231292517 Td
/F4.0 10.5 Tf
-<40446f6d61696e4f626a6563744c61796f7574> Tj
+<40566965774d6f64656c4c61796f7574> Tj
ET
-
-0.000 Tw
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
+
+-0.500 Tc
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-12.048 Tw
-
BT
-544.415 319.74423129251704 Td
+56.88050000000001 264.18423129251704 Td
/F1.0 10.5 Tf
-<2c> Tj
+<a5> Tj
ET
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+
+0.000 Tc
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+66.24000000000001 264.18423129251704 Td
+/F1.0 10.5 Tf
+<666f7220616374696f6e733a20> 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
BT
-48.24 303.964231292517 Td
+125.23950000000002 264.18423129251704 Td
/F4.0 10.5 Tf
-<40446f6d61696e536572766963654c61796f7574> Tj
+<40416374696f6e4c61796f7574> Tj
ET
0.000 0.000 0.000 SCN
@@ -33594,9 +33539,9 @@ ET
0.200 0.200 0.200 SCN
BT
-153.24 303.964231292517 Td
+193.48950000000002 264.18423129251704 Td
/F1.0 10.5 Tf
-<2c2020> Tj
+<20616e6420> Tj
ET
0.000 0.000 0.000 SCN
@@ -33605,20 +33550,35 @@ ET
0.694 0.129 0.275 SCN
BT
-161.304 303.964231292517 Td
+218.03850000000003 264.18423129251704 Td
/F4.0 10.5 Tf
<40506172616d657465724c61796f7574> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
+
+-0.500 Tc
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
BT
-245.304 303.964231292517 Td
+56.88050000000001 242.40423129251707 Td
/F1.0 10.5 Tf
-<2c20> Tj
+<a5> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+
+0.000 Tc
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+66.24000000000001 242.40423129251707 Td
+/F1.0 10.5 Tf
+<666f722070726f706572746965733a20> Tj
ET
0.000 0.000 0.000 SCN
@@ -33627,20 +33587,35 @@ ET
0.694 0.129 0.275 SCN
BT
-250.6485 303.964231292517 Td
+141.399 242.40423129251707 Td
/F4.0 10.5 Tf
<4050726f70657274794c61796f7574> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
+
+-0.500 Tc
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
BT
-329.3985 303.964231292517 Td
+56.88050000000001 220.62423129251707 Td
/F1.0 10.5 Tf
-<2c20616e6420> Tj
+<a5> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+
+0.000 Tc
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+66.24000000000001 220.62423129251707 Td
+/F1.0 10.5 Tf
+<666f7220636f6c6c656374696f6e733a20> Tj
ET
0.000 0.000 0.000 SCN
@@ -33649,9 +33624,9 @@ ET
0.694 0.129 0.275 SCN
BT
-356.5725 303.964231292517 Td
+142.69050000000001 220.62423129251707 Td
/F4.0 10.5 Tf
-<40566965774d6f64656c4c61796f7574> Tj
+<40436f6c6c656374696f6e4c61796f7574> Tj
ET
0.000 0.000 0.000 SCN
@@ -33660,7 +33635,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24 264.12423129251704 Td
+48.24000000000001 180.78423129251706 Td
/F2.0 18 Tf
[<332e322e2046696c652d6261736564204c61> 20.01953125 <796f757473>] TJ
ET
@@ -33673,7 +33648,7 @@ ET
0.969 Tw
BT
-48.24 236.104231292517 Td
+48.24000000000001 152.76423129251705 Td
/F1.0 10.5 Tf
<4d657461646174612070726f766964696e672055492068696e74732063616e206265207370656369666965642065697468657220> Tj
ET
@@ -33688,7 +33663,7 @@ ET
0.969 Tw
BT
-314.7543076923077 236.104231292517 Td
+314.7543076923077 152.76423129251705 Td
/F1.0 10.5 Tf
<7573696e6720616e6e6f746174696f6e73> Tj
ET
@@ -33703,7 +33678,7 @@ ET
0.969 Tw
BT
-405.31984615384613 236.104231292517 Td
+405.31984615384613 152.76423129251705 Td
/F1.0 10.5 Tf
<2c206f72207573696e6720616e20> Tj
ET
@@ -33718,7 +33693,7 @@ ET
0.969 Tw
BT
-473.53999999999996 236.104231292517 Td
+473.53999999999996 152.76423129251705 Td
/F4.0 10.5 Tf
<5878782e6c61796f75742e786d6c> Tj
ET
@@ -33733,7 +33708,7 @@ ET
0.969 Tw
BT
-547.04 236.104231292517 Td
+547.04 152.76423129251705 Td
ET
@@ -33744,7 +33719,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24 220.324231292517 Td
+48.24000000000001 136.98423129251705 Td
/F1.0 10.5 Tf
<66696c652028776865726520> Tj
ET
@@ -33755,7 +33730,7 @@ ET
0.694 0.129 0.275 SCN
BT
-105.2865 220.324231292517 Td
+105.28650000000002 136.98423129251705 Td
/F4.0 10.5 Tf
<587878> Tj
ET
@@ -33766,7 +33741,7 @@ ET
0.200 0.200 0.200 SCN
BT
-121.03650000000002 220.324231292517 Td
+121.03650000000002 136.98423129251705 Td
/F1.0 10.5 Tf
<2069732074686520656e74697479206f722076696577206d6f64656c206f626a65637420746f2062652072656e6465726564292e> Tj
ET
@@ -33777,7 +33752,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24 192.544231292517 Td
+48.24000000000001 109.20423129251705 Td
/F1.0 10.5 Tf
[<46696c652d6261736564206c61> 20.01953125 <796f757473206f666665722061206e756d626572206f662062656e65666974733a>] TJ
ET
@@ -33790,7 +33765,7 @@ ET
0.200 0.200 0.200 SCN
BT
-56.88050000000001 164.764231292517 Td
+56.88050000000001 81.42423129251705 Td
/F1.0 10.5 Tf
<a5> Tj
ET
@@ -33805,7 +33780,7 @@ ET
1.916 Tw
BT
-66.24000000000001 164.764231292517 Td
+66.24000000000001 81.42423129251705 Td
/F1.0 10.5 Tf
[<50726f6261626c79206d6f7374207369676e69666963616e746c79> 89.84375 <2c20746865206c61> 20.01953125 <796f75742063616e206265207570646174656420776974686f757420726571756972696e672061207265636f6d70696c65206f6620746865>] TJ
ET
@@ -33818,125 +33793,13 @@ ET
0.200 0.200 0.200 SCN
BT
-66.24000000000001 148.984231292517 Td
+66.24000000000001 65.64423129251705 Td
/F1.0 10.5 Tf
[<636f646520616e642072656465706c6f> 20.01953125 <79206f6620746865206170703b2066696e652d74756e696e6720746865206c61> 20.01953125 <796f7574207769746820796f757220656e64207573657273206973206561737920746f20646f>] TJ
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-
--0.500 Tc
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-BT
-56.88050000000001 127.204231292517 Td
-/F1.0 10.5 Tf
-<a5> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-
-0.000 Tc
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-1.205 Tw
-
-BT
-66.24000000000001 127.204231292517 Td
-/F1.0 10.5 Tf
-[<4d616e> 20.01953125 <7920646576656c6f7065727320616c736f2066696e642069742065617369657220746f2072> 20.01953125 <6174696f6e616c697a652061626f7574206c61> 20.01953125 <796f7574207768656e20616c6c207468652068696e74732061726520636f6c6c61746564>] 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
-
-BT
-66.24000000000001 111.42423129251699 Td
-/F1.0 10.5 Tf
-[<746f67657468657220696e20612073696e676c6520706c616365202872> 20.01953125 <6174686572207468616e20736361747465726564206163726f73732074686520636c617373206d656d6265727320617320616e6e6f746174696f6e73292e>] TJ
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-
--0.500 Tc
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-BT
-56.88050000000001 89.64423129251699 Td
-/F1.0 10.5 Tf
-<a5> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-
-0.000 Tc
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-3.105 Tw
-
-BT
-66.24000000000001 89.64423129251699 Td
-/F1.0 10.5 Tf
-<55492068696e74732063616e2062652070726f766964656420666f7220> Tj
-ET
-
-
-0.000 Tw
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-
-3.105 Tw
-
-BT
-227.90192307692308 89.64423129251699 Td
-/F1.0 10.5 Tf
-<636f6e7472696275746564206173736f63696174696f6e7320616e6420616374696f6e73> 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.105 Tw
-
-BT
-419.4553846153846 89.64423129251699 Td
-/F1.0 10.5 Tf
-<2074686174206172652073796e7468657369736564206174> 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
-
-BT
-66.24000000000001 73.86423129251699 Td
-/F1.0 10.5 Tf
-<72756e74696d652e> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
q
0.000 0.000 0.000 scn
0.000 0.000 0.000 SCN
@@ -33975,7 +33838,7 @@ endobj
/F4.0 53 0 R
>>
>>
-/Annots [251 0 R 253 0 R 254 0 R 255 0 R 256 0 R 257 0 R 258 0 R 259 0 R 261 0 R 262 0 R]
+/Annots [251 0 R 253 0 R 254 0 R 255 0 R 256 0 R 257 0 R 258 0 R 259 0 R 261 0 R]
>>
endobj
251 0 obj
@@ -33996,10 +33859,10 @@ endobj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
-/URI (../rgant/rgant.pdf#_rgant-ActionLayout, )
+/URI (../rgant/rgant.pdf#_rgant-DomainServiceLayout)
>>
/Subtype /Link
-/Rect [240.23649999999998 318.274231292517 308.4865 328.774231292517]
+/Rect [170.9565 306.27423129251696 275.9565 316.77423129251696]
/Type /Annot
>>
endobj
@@ -34007,10 +33870,10 @@ endobj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
-/URI (../rgant/rgant.pdf#_rgant-CollectionLayout)
+/URI (../rgant/rgant.pdf#_rgant-DomainObjectLayout)
>>
/Subtype /Link
-/Rect [323.2543333333333 318.274231292517 412.5043333333333 328.774231292517]
+/Rect [165.5595 284.49423129251704 265.3095 294.99423129251704]
/Type /Annot
>>
endobj
@@ -34018,10 +33881,10 @@ endobj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
-/URI (../rgant/rgant.pdf#_rgant-DomainObjectLayout)
+/URI (../rgant/rgant.pdf#_rgant-ViewModelLayout)
>>
/Subtype /Link
-/Rect [444.66499999999996 318.274231292517 544.415 328.774231292517]
+/Rect [289.85850000000005 284.49423129251704 373.85850000000005 294.99423129251704]
/Type /Annot
>>
endobj
@@ -34029,10 +33892,10 @@ endobj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
-/URI (../rgant/rgant.pdf#_rgant-DomainServiceLayout)
+/URI (../rgant/rgant.pdf#_rgant-ActionLayout, )
>>
/Subtype /Link
-/Rect [48.24 302.49423129251704 153.24 312.994231292517]
+/Rect [125.23950000000002 262.71423129251707 193.48950000000002 273.21423129251707]
/Type /Annot
>>
endobj
@@ -34043,7 +33906,7 @@ endobj
/URI (../rgant/rgant.pdf#_rgant-ParameterLayout)
>>
/Subtype /Link
-/Rect [161.304 302.49423129251704 245.304 312.994231292517]
+/Rect [218.03850000000003 262.71423129251707 302.0385 273.21423129251707]
/Type /Annot
>>
endobj
@@ -34054,7 +33917,7 @@ endobj
/URI (../rgant/rgant.pdf#_rgant-PropertyLayout)
>>
/Subtype /Link
-/Rect [250.6485 302.49423129251704 329.3985 312.994231292517]
+/Rect [141.399 240.93423129251707 220.149 251.43423129251707]
/Type /Annot
>>
endobj
@@ -34062,15 +33925,15 @@ endobj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
-/URI (../rgant/rgant.pdf#_rgant-ViewModelLayout)
+/URI (../rgant/rgant.pdf#_rgant-CollectionLayout)
>>
/Subtype /Link
-/Rect [356.5725 302.49423129251704 440.5725 312.994231292517]
+/Rect [142.69050000000001 219.15423129251707 231.94050000000001 229.65423129251707]
/Type /Annot
>>
endobj
260 0 obj
-[250 0 R /XYZ 0 288.14823129251704 null]
+[250 0 R /XYZ 0 204.80823129251706 null]
endobj
261 0 obj
<< /Border [0 0 0]
@@ -34079,35 +33942,136 @@ endobj
/URI (../ugvw/ugvw.pdf#_ugvw_layout_annotation-based)
>>
/Subtype /Link
-/Rect [314.7543076923077 233.038231292517 405.31984615384613 247.318231292517]
+/Rect [314.7543076923077 149.69823129251705 405.31984615384613 163.97823129251705]
/Type /Annot
>>
endobj
262 0 obj
-<< /Border [0 0 0]
-/A << /Type /Action
-/S /URI
-/URI (../ugfun/ugfun.pdf#_ugfun_how-tos_contributed-members)
->>
-/Subtype /Link
-/Rect [227.90192307692308 86.57823129251699 419.4553846153846 100.85823129251699]
-/Type /Annot
->>
-endobj
-263 0 obj
-<< /Length 15870
+<< /Length 16837
>>
stream
q
+
+-0.500 Tc
/DeviceRGB cs
0.200 0.200 0.200 scn
/DeviceRGB CS
0.200 0.200 0.200 SCN
+BT
+56.88050000000001 793.9259999999999 Td
+/F1.0 10.5 Tf
+<a5> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+
+0.000 Tc
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+1.205 Tw
+
+BT
+66.24000000000001 793.9259999999999 Td
+/F1.0 10.5 Tf
+[<4d616e> 20.01953125 <7920646576656c6f7065727320616c736f2066696e642069742065617369657220746f2072> 20.01953125 <6174696f6e616c697a652061626f7574206c61> 20.01953125 <796f7574207768656e20616c6c207468652068696e74732061726520636f6c6c61746564>] 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
+
+BT
+66.24000000000001 778.146 Td
+/F1.0 10.5 Tf
+[<746f67657468657220696e20612073696e676c6520706c616365202872> 20.01953125 <6174686572207468616e20736361747465726564206163726f73732074686520636c617373206d656d6265727320617320616e6e6f746174696f6e73292e>] TJ
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+
+-0.500 Tc
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+56.88050000000001 756.366 Td
+/F1.0 10.5 Tf
+<a5> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+
+0.000 Tc
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+3.105 Tw
+
+BT
+66.24000000000001 756.366 Td
+/F1.0 10.5 Tf
+<55492068696e74732063616e2062652070726f766964656420666f7220> Tj
+ET
+
+
+0.000 Tw
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+
+3.105 Tw
+
+BT
+227.90192307692308 756.366 Td
+/F1.0 10.5 Tf
+<636f6e7472696275746564206173736f63696174696f6e7320616e6420616374696f6e73> 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.105 Tw
+
+BT
+419.4553846153846 756.366 Td
+/F1.0 10.5 Tf
+<2074686174206172652073796e7468657369736564206174> 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
+
+BT
+66.24000000000001 740.586 Td
+/F1.0 10.5 Tf
+<72756e74696d652e> Tj
+ET
+
+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
+
0.066 Tw
BT
-48.24 794.6759999999999 Td
+48.24000000000001 712.806 Td
/F1.0 10.5 Tf
<497420697320616c736f20706f737369626c6520746f20646f776e6c6f616420616e20696e697469616c20> Tj
ET
@@ -34122,7 +34086,7 @@ ET
0.066 Tw
BT
-248.79420507812497 794.6759999999999 Td
+248.79420507812497 712.806 Td
/F4.0 10.5 Tf
<2e6c61796f75742e786d6c> Tj
ET
@@ -34137,7 +34101,7 @@ ET
0.066 Tw
BT
-306.544205078125 794.6759999999999 Td
+306.544205078125 712.806 Td
/F1.0 10.5 Tf
[<202d20636170747572696e6720616e> 20.01953125 <79206578697374696e67206c61> 20.01953125 <796f7574206d65746164617461202d207573696e67>] TJ
ET
@@ -34152,7 +34116,7 @@ ET
0.733 Tw
BT
-48.24 778.896 Td
+48.24000000000001 697.0260000000001 Td
/F1.0 10.5 Tf
<74686520> Tj
ET
@@ -34167,7 +34131,7 @@ ET
0.733 Tw
BT
-67.66257142857143 778.896 Td
+67.66257142857144 697.0260000000001 Td
/F4.0 10.5 Tf
<4c61796f757453657276696365> Tj
ET
@@ -34182,7 +34146,7 @@ ET
0.733 Tw
BT
-135.91257142857143 778.896 Td
+135.91257142857143 697.0260000000001 Td
/F1.0 10.5 Tf
<20286578706f736564206f6e207468652070726f746f747970696e67206d656e7529206f72207573696e67206120> Tj
ET
@@ -34197,7 +34161,7 @@ ET
0.733 Tw
BT
-376.0677142857143 778.896 Td
+376.0677142857143 697.0260000000001 Td
/F1.0 10.5 Tf
<6d6978696e20616374696f6e> Tj
ET
@@ -34212,7 +34176,7 @@ ET
0.733 Tw
BT
-439.91578571428573 778.896 Td
+439.91578571428573 697.0260000000001 Td
/F1.0 10.5 Tf
<20636f6e747269627574656420746f206576657279> Tj
ET
@@ -34225,7 +34189,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24 763.116 Td
+48.24000000000001 681.2460000000001 Td
/F1.0 10.5 Tf
<646f6d61696e206f626a6563742e> Tj
ET
@@ -34236,7 +34200,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24 735.3359999999999 Td
+48.24000000000001 653.466 Td
/F1.0 10.5 Tf
<54686572652061726520736f6d6520646f776e73696465732c2074686f7567683a> Tj
ET
@@ -34249,7 +34213,7 @@ ET
0.200 0.200 0.200 SCN
BT
-56.88050000000001 707.5559999999999 Td
+56.88050000000001 625.686 Td
/F1.0 10.5 Tf
<a5> Tj
ET
@@ -34264,7 +34228,7 @@ ET
0.123 Tw
BT
-66.24000000000001 707.5559999999999 Td
+66.24000000000001 625.686 Td
/F1.0 10.5 Tf
[<66696c652d6261736564206c61> 20.01953125 <796f75747320617265206e6f742074797065736166653a2061207479706f2077696c6c20726573756c7420696e20746865206d65746164617461206e6f74206265696e67207069636b> 20.01953125 <656420757020666f7220746865>] TJ
ET
@@ -34277,7 +34241,7 @@ ET
0.200 0.200 0.200 SCN
BT
-66.24000000000001 691.776 Td
+66.24000000000001 609.9060000000001 Td
/F1.0 10.5 Tf
<656c656d656e742e> Tj
ET
@@ -34290,7 +34254,7 @@ ET
0.200 0.200 0.200 SCN
BT
-56.88050000000001 669.996 Td
+56.88050000000001 588.1260000000001 Td
/F1.0 10.5 Tf
<a5> Tj
ET
@@ -34305,7 +34269,7 @@ ET
0.425 Tw
BT
-66.24000000000001 669.996 Td
+66.24000000000001 588.1260000000001 Td
/F1.0 10.5 Tf
[<74686579207375666665722066726f6d2073796e746163746963206672> 20.01953125 <6167696c6974793a20616e20696e76616c696420584d4c20646f63756d656e742077696c6c20726573756c7420696e206e6f206d6574616461746120666f7220746865>] TJ
ET
@@ -34318,7 +34282,7 @@ ET
0.200 0.200 0.200 SCN
BT
-66.24000000000001 654.216 Td
+66.24000000000001 572.3460000000001 Td
/F1.0 10.5 Tf
<656e7469726520636c6173732e> Tj
ET
@@ -34331,7 +34295,7 @@ ET
0.200 0.200 0.200 SCN
BT
-56.88050000000001 632.436 Td
+56.88050000000001 550.5660000000001 Td
/F1.0 10.5 Tf
<a5> Tj
ET
@@ -34346,7 +34310,7 @@ ET
1.041 Tw
BT
-66.24000000000001 632.436 Td
+66.24000000000001 550.5660000000003 Td
/F1.0 10.5 Tf
<7468657265206973206e6f206e6f74696f6e206f6620696e6865726974616e63652c20736f206120> Tj
ET
@@ -34361,7 +34325,7 @@ ET
1.041 Tw
BT
-263.57949999999994 632.436 Td
+263.57949999999994 550.5660000000003 Td
/F4.0 10.5 Tf
<2e6c61796f75742e786d6c> Tj
ET
@@ -34376,7 +34340,7 @@ ET
1.041 Tw
BT
-321.32949999999994 632.436 Td
+321.32949999999994 550.5660000000003 Td
/F1.0 10.5 Tf
<20697320726571756972656420666f7220616c6c20636f6e637265746520636c617373657320616e6420616c736f> Tj
ET
@@ -34391,7 +34355,7 @@ ET
1.999 Tw
BT
-66.24000000000001 616.6560000000001 Td
+66.24000000000001 534.7860000000002 Td
/F1.0 10.5 Tf
[<666f7220616e> 20.01953125 <79206162737472> 20.01953125 <61637420636c6173736573202869662075736564206173206120636f6c6c656374696f6e2074797065292e20496e20636f6e7472> 20.01953125 <6173742c207468652064657765792d646563696d616c20666f726d6174>] TJ
ET
@@ -34406,7 +34370,7 @@ ET
2.538 Tw
BT
-66.24000000000001 600.8760000000001 Td
+66.24000000000001 519.0060000000002 Td
/F4.0 10.5 Tf
<404d656d6265724f72646572> Tj
ET
@@ -34421,7 +34385,7 @@ ET
2.538 Tw
BT
-129.24 600.8760000000001 Td
+129.24 519.0060000000002 Td
/F1.0 10.5 Tf
<20616e6e6f746174696f6e20616c6c6f777320746865206d65746164617461206f662074686520737562636c61737320697473207375706572636c617373657320746f2066697420746f676574686572> Tj
ET
@@ -34434,7 +34398,7 @@ ET
0.200 0.200 0.200 SCN
BT
-66.24000000000001 585.0960000000001 Td
+66.24000000000001 503.2260000000002 Td
/F1.0 10.5 Tf
[<72656c61746976656c79207365616d6c6573736c79> 89.84375 <2e>] TJ
ET
@@ -34447,7 +34411,7 @@ ET
0.769 Tw
BT
-48.24000000000001 557.316 Td
+48.24000000000001 475.4460000000002 Td
/F1.0 10.5 Tf
<54686520> Tj
ET
@@ -34462,7 +34426,7 @@ ET
0.769 Tw
BT
-70.42898156738282 557.316 Td
+70.42898156738282 475.4460000000002 Td
/F4.0 10.5 Tf
<5878782e6c61796f75742e786d6c> Tj
ET
@@ -34477,7 +34441,7 @@ ET
0.769 Tw
BT
-143.92898156738283 557.316 Td
+143.92898156738283 475.4460000000002 Td
/F1.0 10.5 Tf
<2066696c65206973206a757374207468652073657269616c697a656420666f726d206f66206120> Tj
ET
@@ -34492,7 +34456,7 @@ ET
0.769 Tw
BT
-322.9028156738281 557.316 Td
+322.9028156738281 475.4460000000002 Td
/F4.0 10.5 Tf
<47726964> Tj
ET
@@ -34507,7 +34471,7 @@ ET
0.769 Tw
BT
-343.9028156738281 557.316 Td
+343.9028156738281 475.4460000000002 Td
/F1.0 10.5 Tf
[<206c61> 20.01953125 <796f757420636c61737320646566696e65642077697468696e20417061636865204973697327>] TJ
ET
@@ -34522,7 +34486,7 @@ ET
1.581 Tw
BT
-48.24000000000001 541.5360000000001 Td
+48.24000000000001 459.66600000000017 Td
/F1.0 10.5 Tf
[<6170706c69622e20546865736520617265204a4158422d616e6e6f746174656420636c6173736573207769746820636f72726573706f6e64696e672058> 9.765625 <534420736368656d61733b2074686520757073686f74206f662074686174206973>] TJ
ET
@@ -34537,7 +34501,7 @@ ET
0.257 Tw
BT
-48.24000000000001 525.7560000000001 Td
+48.24000000000001 443.8860000000002 Td
/F1.0 10.5 Tf
[<746861742049444573207375636820617320496e74656c6c694a20616e642045636c697073652063616e2070726f766964652022696e74656c6c6973656e7365222c206d616b696e672069746561737920746f20617574686f722073756368206c61> 20.01953125 <796f7574>] TJ
ET
@@ -34550,7 +34514,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24000000000001 509.9760000000001 Td
+48.24000000000001 428.1060000000002 Td
/F1.0 10.5 Tf
<66696c65732e> Tj
ET
@@ -34561,7 +34525,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24000000000001 475.47600000000006 Td
+48.24000000000001 393.60600000000017 Td
/F2.0 13 Tf
[<332e322e312e2053656172636820416c676f726974686d20284c696272> 20.01953125 <61727920537570706f727429>] TJ
ET
@@ -34574,7 +34538,7 @@ ET
1.087 Tw
BT
-48.24000000000001 448.91600000000005 Td
+48.24000000000001 367.04600000000016 Td
/F1.0 10.5 Tf
[<46> 40.0390625 <6f72206120676976656e20646f6d61696e206f626a65637420>] TJ
ET
@@ -34589,7 +34553,7 @@ ET
1.087 Tw
BT
-185.9517508544922 448.91600000000005 Td
+185.9517508544922 367.04600000000016 Td
/F4.0 10.5 Tf
<587878> Tj
ET
@@ -34604,7 +34568,7 @@ ET
1.087 Tw
BT
-201.7017508544922 448.91600000000005 Td
+201.7017508544922 367.04600000000016 Td
/F1.0 10.5 Tf
[<20746865206672> 20.01953125 <616d65776f726b20696e697469616c6c7920736561726368657320666f7220612066696c6520286f6e2074686520636c61737370617468292063616c6c6564>] TJ
ET
@@ -34617,7 +34581,7 @@ ET
0.694 0.129 0.275 SCN
BT
-48.24000000000001 433.1360000000001 Td
+48.24000000000001 351.2660000000002 Td
/F4.0 10.5 Tf
<5878782e6c61796f75742e786d6c> Tj
ET
@@ -34628,7 +34592,7 @@ ET
0.200 0.200 0.200 SCN
BT
-121.74000000000001 433.1360000000001 Td
+121.74000000000001 351.2660000000002 Td
/F1.0 10.5 Tf
<2e> Tj
ET
@@ -34641,7 +34605,7 @@ ET
0.915 Tw
BT
-48.24000000000001 405.35600000000005 Td
+48.24000000000001 323.48600000000016 Td
/F1.0 10.5 Tf
[<496620746869732063616ed57420626520666f756e642c207468656e20746865206672> 20.01953125 <616d65776f726b2077696c6c2073656172636820666f7220612066696c65206e616d656420>] TJ
ET
@@ -34656,7 +34620,7 @@ ET
0.915 Tw
BT
-412.30205299479167 405.35600000000005 Td
+412.30205299479167 323.48600000000016 Td
/F4.0 10.5 Tf
<5878782e6c61796f75742e66616c6c6261636b2e786d6c> Tj
ET
@@ -34671,7 +34635,7 @@ ET
0.915 Tw
BT
-533.0520529947917 405.35600000000005 Td
+533.0520529947917 323.48600000000016 Td
/F1.0 10.5 Tf
<2e204966> Tj
ET
@@ -34684,7 +34648,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24000000000001 389.576 Td
+48.24000000000001 307.70600000000013 Td
/F1.0 10.5 Tf
<70726573656e742c20746869732077696c6c206265207573656420696e73746561642e> Tj
ET
@@ -34697,7 +34661,7 @@ ET
0.854 Tw
BT
-48.24000000000001 361.79600000000005 Td
+48.24000000000001 279.92600000000016 Td
/F1.0 10.5 Tf
[<54686973207468657265666f726520616c6c6f7773206c696272> 20.01953125 <617269657320746861742070726f76696465206120646f6d61696e20656e7469746965732f76696577206d6f64656c732028666f72206578616d706c652c2074686520286e6f6e2d>] TJ
ET
@@ -34712,7 +34676,7 @@ ET
2.439 Tw
BT
-48.24000000000001 346.0160000000001 Td
+48.24000000000001 264.1460000000002 Td
/F1.0 10.5 Tf
<4153462920> Tj
ET
@@ -34727,7 +34691,7 @@ ET
2.439 Tw
BT
-76.32013781738281 346.0160000000001 Td
+76.32013781738281 264.1460000000002 Td
/F1.0 10.5 Tf
<496e636f646520506c6174666f726d> Tj
ET
@@ -34742,7 +34706,7 @@ ET
2.439 Tw
BT
-159.36777563476562 346.0160000000001 Td
+159.36777563476562 264.1460000000002 Td
/F1.0 10.5 Tf
[<206d6f64756c65732920746f20646566696e6520746865205549206f66207468657365206f626a65637473207573696e672061206c61> 20.01953125 <796f75742066696c652c207768696c65207374696c6c>] TJ
ET
@@ -34755,7 +34719,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24000000000001 330.23600000000005 Td
+48.24000000000001 248.36600000000016 Td
/F1.0 10.5 Tf
[<616c6c6f77696e672074686520636f6e73756d696e67206170706c69636174696f6e20746f206f766572726964652074686174206c61> 20.01953125 <796f757420696620697420736f2072657175697265732e>] TJ
ET
@@ -34766,7 +34730,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24000000000001 295.73600000000005 Td
+48.24000000000001 213.86600000000016 Td
/F2.0 13 Tf
<332e322e322e20477269647320767320436f6d706f6e656e7473> Tj
ET
@@ -34777,7 +34741,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24000000000001 269.17600000000004 Td
+48.24000000000001 187.30600000000013 Td
/F1.0 10.5 Tf
[<546865206c61> 20.01953125 <796f75742066696c652064697374696e67756973686573206265747765656e2074776f207479706573206f6620656c656d656e743a>] TJ
ET
@@ -34790,7 +34754,7 @@ ET
0.200 0.200 0.200 SCN
BT
-56.88050000000001 241.39600000000002 Td
+56.88050000000001 159.52600000000012 Td
/F1.0 10.5 Tf
<a5> Tj
ET
@@ -34803,7 +34767,7 @@ ET
0.200 0.200 0.200 SCN
BT
-66.24000000000001 241.39600000000002 Td
+66.24000000000001 159.52600000000012 Td
/F1.0 10.5 Tf
<74686f7365207468617420646566696e6520612067726964207374727563747572652c206f663a20726f77732c20636f6c756d6e732c207461622067726f75707320616e6420746162732e> Tj
ET
@@ -34816,7 +34780,7 @@ ET
0.767 Tw
BT
-66.24000000000001 213.616 Td
+66.24000000000001 131.74600000000012 Td
/F1.0 10.5 Tf
<54686520726f777320616e6420636f6c756d6e732061726520636c6f73656c79206d6f64656c6c6564206f6e20> Tj
ET
@@ -34831,7 +34795,7 @@ ET
0.767 Tw
BT
-309.1707760416666 213.616 Td
+309.1707760416666 131.74600000000012 Td
/F1.0 10.5 Tf
[<426f6f74737472> 20.01953125 <61702033>] TJ
ET
@@ -34846,7 +34810,7 @@ ET
0.767 Tw
BT
-366.70041796875 213.616 Td
+366.70041796875 131.74600000000012 Td
/F1.0 10.5 Tf
<20287573656420696e2074686520696d706c656d656e746174696f6e206f6620746865> Tj
ET
@@ -34859,7 +34823,7 @@ ET
0.259 0.545 0.792 SCN
BT
-66.24000000000001 197.836 Td
+66.24000000000001 115.96600000000012 Td
/F1.0 10.5 Tf
[<5769636b> 20.01953125 <657420766965776572>] TJ
ET
@@ -34870,7 +34834,7 @@ ET
0.200 0.200 0.200 SCN
BT
-138.343294921875 197.836 Td
+138.343294921875 115.96600000000012 Td
/F1.0 10.5 Tf
<292e> Tj
ET
@@ -34883,7 +34847,7 @@ ET
0.200 0.200 0.200 SCN
BT
-56.88050000000001 170.056 Td
+56.88050000000001 88.18600000000012 Td
/F1.0 10.5 Tf
<a5> Tj
ET
@@ -34898,7 +34862,7 @@ ET
2.867 Tw
BT
-66.24000000000001 170.056 Td
+66.24000000000001 88.18600000000012 Td
/F1.0 10.5 Tf
<74686f7365207468617420646566696e657320636f6d6d6f6e20636f6d706f6e656e74732c206f663a206669656c6473657473202870726576696f75736c792063616c6c6564206d656d6265722067726f757073206f72> Tj
ET
@@ -34913,7 +34877,7 @@ ET
2.001 Tw
BT
-66.24000000000001 154.276 Td
+66.24000000000001 72.40600000000012 Td
/F1.0 10.5 Tf
<70726f70657274792067726f757073292c2070726f706572746965732c20636f6c6c656374696f6e732c20616374696f6e7320616e6420616c736f20746865207469746c652f69636f6e206f662074686520646f6d61696e206f626a656374> Tj
ET
@@ -34926,91 +34890,13 @@ ET
0.200 0.200 0.200 SCN
BT
-66.24000000000001 138.496 Td
+66.24000000000001 56.62600000000012 Td
/F1.0 10.5 Tf
<697473656c662e> Tj
ET
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
-
-1.158 Tw
-
-BT
-48.24000000000001 110.71600000000001 Td
-/F1.0 10.5 Tf
-<4d6f726520696e666f726d6174696f6e2061626f757420746865736520636c61737365732063616e20626520666f756e6420696e20> Tj
-ET
-
-
-0.000 Tw
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-
-1.158 Tw
-
-BT
-329.31719999999996 110.71600000000001 Td
-/F1.0 10.5 Tf
-<746865207265666572656e6365206775696465> 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
-
-1.158 Tw
-
-BT
-428.92546666666664 110.71600000000001 Td
-/F1.0 10.5 Tf
-<2e20204d6f726520696e666f726d6174696f6e206f6e> 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
-
-BT
-48.24000000000001 94.936 Td
-/F1.0 10.5 Tf
-[<426f6f74737472> 20.01953125 <61702033d57320677269642073797374656d2063616e20626520666f756e6420>] TJ
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-
-BT
-243.37179492187502 94.936 Td
-/F1.0 10.5 Tf
-<68657265> Tj
-ET
-
-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
-
-BT
-266.209294921875 94.936 Td
-/F1.0 10.5 Tf
-<2e> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
q
0.000 0.000 0.000 scn
0.000 0.000 0.000 SCN
@@ -35035,11 +34921,11 @@ Q
endstream
endobj
-264 0 obj
+263 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 263 0 R
+/Contents 262 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/Font << /F1.0 8 0 R
/F4.0 53 0 R
@@ -35048,7 +34934,18 @@ endobj
/XObject << /Stamp1 738 0 R
>>
>>
-/Annots [265 0 R 266 0 R 267 0 R 269 0 R 271 0 R 272 0 R 273 0 R 274 0 R]
+/Annots [264 0 R 265 0 R 266 0 R 267 0 R 269 0 R 271 0 R 272 0 R]
+>>
+endobj
+264 0 obj
+<< /Border [0 0 0]
+/A << /Type /Action
+/S /URI
+/URI (../ugfun/ugfun.pdf#_ugfun_how-tos_contributed-members)
+>>
+/Subtype /Link
+/Rect [227.90192307692308 753.3 419.4553846153846 767.58]
+/Type /Annot
>>
endobj
265 0 obj
@@ -35058,7 +34955,7 @@ endobj
/URI (../rgsvc/rgsvc.pdf#_rgsvc_metadata-api_LayoutService)
>>
/Subtype /Link
-/Rect [67.66257142857143 777.4259999999999 135.91257142857143 787.9259999999999]
+/Rect [67.66257142857144 695.556 135.91257142857143 706.056]
/Type /Annot
>>
endobj
@@ -35069,7 +34966,7 @@ endobj
/URI (../rgcms/rgcms.pdf#_rgcms_classes_mixins_Object)
>>
/Subtype /Link
-/Rect [376.0677142857143 775.8299999999999 439.91578571428573 790.11]
+/Rect [376.0677142857143 693.96 439.91578571428573 708.2400000000001]
/Type /Annot
>>
endobj
@@ -35080,12 +34977,12 @@ endobj
/URI (../rgcms/rgcms.pdf#_rgcms_classes_layout)
>>
/Subtype /Link
-/Rect [322.9028156738281 555.846 343.9028156738281 566.3460000000001]
+/Rect [322.9028156738281 473.97600000000017 343.9028156738281 484.47600000000017]
/Type /Annot
>>
endobj
268 0 obj
-[264 0 R /XYZ 0 494.1600000000001 null]
+[263 0 R /XYZ 0 412.2900000000002 null]
endobj
269 0 obj
<< /Border [0 0 0]
@@ -35094,12 +34991,12 @@ endobj
/URI (http://platform.incode.org)
>>
/Subtype /Link
-/Rect [76.32013781738281 342.9500000000001 159.36777563476562 357.2300000000001]
+/Rect [76.32013781738281 261.08000000000015 159.36777563476562 275.3600000000001]
/Type /Annot
>>
endobj
270 0 obj
-[264 0 R /XYZ 0 314.4200000000001 null]
+[263 0 R /XYZ 0 232.55000000000015 null]
endobj
271 0 obj
<< /Border [0 0 0]
@@ -35108,7 +35005,7 @@ endobj
/URI (http://getbootstrap.com)
>>
/Subtype /Link
-/Rect [309.1707760416666 210.55 366.70041796875 224.83]
+/Rect [309.1707760416666 128.68000000000012 366.70041796875 142.96000000000012]
/Type /Annot
>>
endobj
@@ -35119,34 +35016,12 @@ endobj
/URI (../ugvw/ugvw.pdf)
>>
/Subtype /Link
-/Rect [66.24000000000001 194.77 138.343294921875 209.05]
+/Rect [66.24000000000001 112.90000000000012 138.343294921875 127.18000000000012]
/Type /Annot
>>
endobj
273 0 obj
-<< /Border [0 0 0]
-/A << /Type /Action
-/S /URI
-/URI (../rgcms/rgcms.pdf#_rgcms_classes_layout)
->>
-/Subtype /Link
-/Rect [329.31719999999996 107.65 428.92546666666664 121.93]
-/Type /Annot
->>
-endobj
-274 0 obj
-<< /Border [0 0 0]
-/A << /Type /Action
-/S /URI
-/URI (http://getbootstrap.com/css/#grid)
->>
-/Subtype /Link
-/Rect [243.37179492187502 91.87 266.209294921875 106.15]
-/Type /Annot
->>
-endobj
-275 0 obj
-<< /Length 3422
+<< /Length 4834
>>
stream
q
@@ -35155,8 +35030,86 @@ q
/DeviceRGB CS
0.200 0.200 0.200 SCN
+1.158 Tw
+
BT
-48.24 792.006 Td
+48.24000000000001 793.9259999999999 Td
+/F1.0 10.5 Tf
+<4d6f726520696e666f726d6174696f6e2061626f757420746865736520636c61737365732063616e20626520666f756e6420696e20> Tj
+ET
+
+
+0.000 Tw
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+
+1.158 Tw
+
+BT
+329.31719999999996 793.9259999999999 Td
+/F1.0 10.5 Tf
+<746865207265666572656e6365206775696465> 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
+
+1.158 Tw
+
+BT
+428.92546666666664 793.9259999999999 Td
+/F1.0 10.5 Tf
+<2e20204d6f726520696e666f726d6174696f6e206f6e> 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
+
+BT
+48.24000000000001 778.146 Td
+/F1.0 10.5 Tf
+[<426f6f74737472> 20.01953125 <61702033d57320677269642073797374656d2063616e20626520666f756e6420>] TJ
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+
+BT
+243.37179492187502 778.146 Td
+/F1.0 10.5 Tf
+<68657265> Tj
+ET
+
+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
+
+BT
+266.209294921875 778.146 Td
+/F1.0 10.5 Tf
+<2e> Tj
+ET
+
+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
+
+BT
+48.24000000000001 743.6460000000001 Td
/F2.0 13 Tf
<332e322e332e2053637265656e63617374> Tj
ET
@@ -35167,7 +35120,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24 765.446 Td
+48.24000000000001 717.0860000000001 Td
/F1.0 10.5 Tf
<5468697320> Tj
ET
@@ -35178,7 +35131,7 @@ ET
0.259 0.545 0.792 SCN
BT
-72.1275 765.446 Td
+72.12750000000001 717.0860000000001 Td
/F1.0 10.5 Tf
<73637265656e63617374> Tj
ET
@@ -35189,7 +35142,7 @@ ET
0.200 0.200 0.200 SCN
BT
-124.4805 765.446 Td
+124.4805 717.0860000000001 Td
/F1.0 10.5 Tf
<206465736372696265732074686520666561747572652e> Tj
ET
@@ -35200,7 +35153,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24 730.9460000000001 Td
+48.24000000000001 682.5860000000002 Td
/F2.0 13 Tf
<332e322e342e204578616d706c6573> Tj
ET
@@ -35213,7 +35166,7 @@ ET
0.722 Tw
BT
-48.24 704.3860000000002 Td
+48.24000000000001 656.0260000000003 Td
/F1.0 10.5 Tf
[<50726f6261626c79207468652065617369657374207761> 20.01953125 <7920746f20756e6465727374616e642064796e616d696320584d4c206c61> 20.01953125 <796f7574732069732062> 20.01953125 <79206578616d706c652e2046> 40.0390625 <6f722074686973207765d56c6c2075736520746865>] TJ
ET
@@ -35226,7 +35179,7 @@ ET
0.694 0.129 0.275 SCN
BT
-48.24 688.6060000000002 Td
+48.24000000000001 640.2460000000003 Td
/F4.0 10.5 Tf
<546f446f4974656d> Tj
ET
@@ -35237,7 +35190,7 @@ ET
0.200 0.200 0.200 SCN
BT
-90.24000000000001 688.6060000000002 Td
+90.24000000000001 640.2460000000003 Td
/F1.0 10.5 Tf
<2066726f6d2074686520286e6f6e2d4153462920> Tj
ET
@@ -35248,7 +35201,7 @@ ET
0.259 0.545 0.792 SCN
BT
-191.29200000000003 688.6060000000002 Td
+191.29200000000003 640.2460000000003 Td
/F1.0 10.5 Tf
<49736973206164646f6e732720746f646f617070> Tj
ET
@@ -35259,7 +35212,7 @@ ET
0.200 0.200 0.200 SCN
BT
-293.079 688.6060000000002 Td
+293.07900000000006 640.2460000000003 Td
/F1.0 10.5 Tf
<3a> Tj
ET
@@ -35268,14 +35221,14 @@ ET
0.000 0.000 0.000 scn
q
-498.800 0 0 409.757 48.240 263.033 cm
+498.800 0 0 409.757 48.240 214.673 cm
/I27 Do
Q
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
BT
-48.24 235.01928593996877 Td
+48.24000000000001 186.65928593996887 Td
/F2.0 10.5 Tf
<4e616d65737061636573> Tj
ET
@@ -35288,7 +35241,7 @@ ET
1.315 Tw
BT
-48.24 209.18928593996876 Td
+48.24000000000001 160.82928593996886 Td
/F1.0 10.5 Tf
<4669727374207468696e67732066697273743b20657665727920> Tj
ET
@@ -35303,7 +35256,7 @@ ET
1.315 Tw
BT
-169.93589663461537 209.18928593996876 Td
+169.93589663461537 160.82928593996886 Td
/F4.0 10.5 Tf
<2e6c61796f75742e786d6c> Tj
ET
@@ -35318,7 +35271,7 @@ ET
1.315 Tw
BT
-227.68589663461537 209.18928593996876 Td
+227.68589663461537 160.82928593996886 Td
/F1.0 10.5 Tf
[<2066696c65206d7573742070726f7065726c79206465636c617265207468652058> 9.765625 <5344206e616d6573706163657320616e6420736368656d61732e>] TJ
ET
@@ -35331,7 +35284,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24 193.40928593996875 Td
+48.24000000000001 145.04928593996885 Td
/F1.0 10.5 Tf
<5468657265206172652074776f3a206f6e6520666f7220746865206772696420636c61737365732c20616e64206f6e6520666f722074686520636f6d6d6f6e20636f6d706f6e656e7420636c61737365733a> Tj
ET
@@ -35362,25 +35315,47 @@ Q
endstream
endobj
-276 0 obj
+274 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 275 0 R
+/Contents 273 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F2.0 18 0 R
-/F1.0 8 0 R
+/Font << /F1.0 8 0 R
+/F2.0 18 0 R
/F4.0 53 0 R
>>
/XObject << /I27 281 0 R
/Stamp1 738 0 R
>>
>>
-/Annots [278 0 R 280 0 R 282 0 R]
+/Annots [275 0 R 276 0 R 278 0 R 280 0 R 282 0 R]
+>>
+endobj
+275 0 obj
+<< /Border [0 0 0]
+/A << /Type /Action
+/S /URI
+/URI (../rgcms/rgcms.pdf#_rgcms_classes_layout)
+>>
+/Subtype /Link
+/Rect [329.31719999999996 790.8599999999999 428.92546666666664 805.14]
+/Type /Annot
+>>
+endobj
+276 0 obj
+<< /Border [0 0 0]
+/A << /Type /Action
+/S /URI
+/URI (http://getbootstrap.com/css/#grid)
+>>
+/Subtype /Link
+/Rect [243.37179492187502 775.0799999999999 266.209294921875 789.36]
+/Type /Annot
>>
endobj
277 0 obj
-[276 0 R /XYZ 0 841.89 null]
+[274 0 R /XYZ 0 762.33 null]
endobj
278 0 obj
<< /Border [0 0 0]
@@ -35389,12 +35364,12 @@ endobj
/URI (https://www.youtube.com/watch?v=MxewC5Pve5k)
>>
/Subtype /Link
-/Rect [72.1275 762.38 124.4805 776.6600000000001]
+/Rect [72.12750000000001 714.0200000000001 124.4805 728.3000000000002]
/Type /Annot
>>
endobj
279 0 obj
-[276 0 R /XYZ 0 749.6300000000001 null]
+[274 0 R /XYZ 0 701.2700000000002 null]
endobj
280 0 obj
<< /Border [0 0 0]
@@ -35403,7 +35378,7 @@ endobj
/URI (http://github.com/isisaddons/isis-app-todoapp)
>>
/Subtype /Link
-/Rect [191.29200000000003 685.5400000000002 293.079 699.8200000000003]
+/Rect [191.29200000000003 637.1800000000003 293.07900000000006 651.4600000000004]
/Type /Annot
>>
endobj
@@ -35608,12 +35583,12 @@ endobj
/URI (images/layout-dynamic-xml/ToDoItem.png)
>>
/Subtype /Link
-/Rect [48.24 263.0332859399688 547.04 672.7900000000003]
+/Rect [48.24000000000001 214.67328593996888 547.04 624.4300000000004]
/Type /Annot
>>
endobj
283 0 obj
-[276 0 R /XYZ 0 251.03328593996878 null]
+[274 0 R /XYZ 0 202.67328593996888 null]
endobj
284 0 obj
<< /Length 30874
@@ -122565,7 +122540,7 @@ endobj
/Count 0
/Next 755 0 R
/Prev 753 0 R
-/Dest [250 0 R /XYZ 0 288.14823129251704 null]
+/Dest [250 0 R /XYZ 0 204.80823129251706 null]
>>
endobj
755 0 obj
@@ -123652,590 +123627,590 @@ xref
0002419862 00000 n
0002436410 00000 n
0002437231 00000 n
-0002446727 00000 n
-0002447071 00000 n
-0002447259 00000 n
-0002447317 00000 n
-0002447533 00000 n
-0002447759 00000 n
-0002447978 00000 n
-0002448186 00000 n
-0002448393 00000 n
-0002448601 00000 n
-0002448810 00000 n
-0002448868 00000 n
-0002449099 00000 n
-0002449340 00000 n
-0002465265 00000 n
-0002465580 00000 n
-0002465819 00000 n
-0002466042 00000 n
-0002466258 00000 n
-0002466315 00000 n
-0002466528 00000 n
-0002466585 00000 n
-0002466770 00000 n
-0002466949 00000 n
-0002467155 00000 n
-0002467351 00000 n
-0002470827 00000 n
-0002471115 00000 n
-0002471161 00000 n
-0002471360 00000 n
-0002471417 00000 n
-0002471639 00000 n
-0002554642 00000 n
-0002554843 00000 n
-0002554901 00000 n
-0002585830 00000 n
-0002586071 00000 n
-0002586117 00000 n
-0002620869 00000 n
-0002621136 00000 n
-0002621344 00000 n
-0002621390 00000 n
-0002621610 00000 n
-0002646641 00000 n
-0002646923 00000 n
-0002647103 00000 n
-0002647160 00000 n
-0002647217 00000 n
-0002654795 00000 n
-0002655102 00000 n
-0002655159 00000 n
-0002655216 00000 n
-0002655449 00000 n
-0002766250 00000 n
-0002766473 00000 n
-0002793264 00000 n
-0002793519 00000 n
-0002793695 00000 n
-0002793741 00000 n
-0002823055 00000 n
-0002823328 00000 n
-0002823386 00000 n
-0002823624 00000 n
-0002848410 00000 n
-0002848723 00000 n
-0002848913 00000 n
-0002849132 00000 n
-0002849345 00000 n
-0002849553 00000 n
-0002849763 00000 n
-0002849992 00000 n
-0002862470 00000 n
-0002862793 00000 n
-0002862839 00000 n
-0002863457 00000 n
-0002863664 00000 n
-0002863866 00000 n
-0002864113 00000 n
-0002864347 00000 n
-0002864581 00000 n
-0002864808 00000 n
-0002864865 00000 n
-0002865115 00000 n
-0002865364 00000 n
-0002865421 00000 n
-0002865683 00000 n
-0002871872 00000 n
-0002900162 00000 n
-0002900417 00000 n
-0002909185 00000 n
-0002909473 00000 n
-0002909519 00000 n
-0002909721 00000 n
-0002909941 00000 n
-0002956382 00000 n
-0002956597 00000 n
-0002978429 00000 n
-0002983831 00000 n
-0002984140 00000 n
-0002984328 00000 n
-0002995112 00000 n
-0002995311 00000 n
-0002995368 00000 n
-0002995570 00000 n
-0002995794 00000 n
-0002995852 00000 n
-0003025656 00000 n
-0003025884 00000 n
-0003060536 00000 n
-0003060804 00000 n
-0003060861 00000 n
-0003060918 00000 n
-0003086862 00000 n
-0003087151 00000 n
-0003087197 00000 n
-0003087353 00000 n
-0003087583 00000 n
-0003087641 00000 n
-0003087885 00000 n
-0003089790 00000 n
-0003090057 00000 n
-0003109303 00000 n
-0003109489 00000 n
-0003124587 00000 n
-0003124784 00000 n
-0003153555 00000 n
-0003153796 00000 n
-0003153854 00000 n
-0003156679 00000 n
-0003156907 00000 n
-0003186886 00000 n
-0003187202 00000 n
-0003187248 00000 n
-0003187423 00000 n
-0003187679 00000 n
-0003187936 00000 n
-0003188170 00000 n
-0003219671 00000 n
-0003220014 00000 n
-0003220267 00000 n
-0003220508 00000 n
-0003220733 00000 n
-0003220955 00000 n
-0003221155 00000 n
-0003221397 00000 n
-0003221629 00000 n
-0003221850 00000 n
-0003243878 00000 n
-0003244189 00000 n
-0003244429 00000 n
-0003244633 00000 n
-0003244873 00000 n
-0003245099 00000 n
-0003276344 00000 n
-0003276671 00000 n
-0003276880 00000 n
-0003277122 00000 n
-0003277371 00000 n
-0003277614 00000 n
-0003277859 00000 n
-0003278102 00000 n
-0003305014 00000 n
-0003305330 00000 n
-0003305538 00000 n
-0003305768 00000 n
-0003305998 00000 n
-0003312766 00000 n
-0003313033 00000 n
-0003313079 00000 n
-0003313292 00000 n
-0003313492 00000 n
-0003313550 00000 n
-0003313596 00000 n
-0003315511 00000 n
-0003315804 00000 n
-0003315997 00000 n
-0003326670 00000 n
-0003326877 00000 n
-0003326924 00000 n
-0003327447 00000 n
-0003329554 00000 n
-0003329813 00000 n
-0003329859 00000 n
-0003329916 00000 n
-0003330126 00000 n
-0003340162 00000 n
-0003344228 00000 n
-0003344508 00000 n
-0003344706 00000 n
-0003344754 00000 n
-0003344811 00000 n
-0003345050 00000 n
-0003345108 00000 n
-0003345166 00000 n
-0003345588 00000 n
-0003347495 00000 n
-0003347788 00000 n
-0003347984 00000 n
-0003358345 00000 n
-0003358558 00000 n
-0003358605 00000 n
-0003369601 00000 n
-0003369905 00000 n
-0003369951 00000 n
-0003370182 00000 n
-0003370239 00000 n
-0003370296 00000 n
-0003370509 00000 n
-0003370732 00000 n
-0003370969 00000 n
-0003371177 00000 n
-0003449986 00000 n
-0003451113 00000 n
-0003451394 00000 n
-0003451580 00000 n
-0003518916 00000 n
-0003519115 00000 n
-0003522361 00000 n
-0003522628 00000 n
-0003522816 00000 n
-0003523046 00000 n
-0003525803 00000 n
-0003526070 00000 n
-0003526116 00000 n
-0003526173 00000 n
-0003526230 00000 n
-0003526464 00000 n
-0003597514 00000 n
-0003597709 00000 n
-0003636212 00000 n
-0003639013 00000 n
-0003639285 00000 n
-0003639475 00000 n
-0003639531 00000 n
-0003676865 00000 n
-0003677156 00000 n
-0003677406 00000 n
-0003677463 00000 n
-0003678041 00000 n
-0003678252 00000 n
-0003678485 00000 n
-0003678704 00000 n
-0003678902 00000 n
-0003713476 00000 n
-0003713757 00000 n
-0003713987 00000 n
-0003714210 00000 n
-0003714256 00000 n
-0003714302 00000 n
-0003714347 00000 n
-0003760411 00000 n
-0003765548 00000 n
-0003765841 00000 n
-0003766025 00000 n
-0003766227 00000 n
-0003766285 00000 n
-0003766343 00000 n
-0003788447 00000 n
-0003788675 00000 n
-0003814179 00000 n
-0003814446 00000 n
-0003814492 00000 n
-0003814549 00000 n
-0003814779 00000 n
-0003814825 00000 n
-0003815062 00000 n
-0003842629 00000 n
-0003842901 00000 n
-0003843150 00000 n
-0003843207 00000 n
-0003857620 00000 n
-0003857892 00000 n
-0003858107 00000 n
-0003858153 00000 n
-0003858210 00000 n
-0003877627 00000 n
-0003877868 00000 n
-0003877925 00000 n
-0003901323 00000 n
-0003901596 00000 n
-0003901857 00000 n
-0003901915 00000 n
-0003930540 00000 n
-0003930813 00000 n
-0003931075 00000 n
-0003931132 00000 n
-0003959248 00000 n
-0003959536 00000 n
-0003959767 00000 n
-0003959960 00000 n
-0003960006 00000 n
-0003960064 00000 n
-0003960249 00000 n
-0003982340 00000 n
-0003982581 00000 n
-0003982627 00000 n
-0003984840 00000 n
-0003985099 00000 n
-0003985145 00000 n
-0003985202 00000 n
-0004058347 00000 n
-0004058555 00000 n
-0004123190 00000 n
-0004127315 00000 n
-0004127587 00000 n
-0004127782 00000 n
-0004127838 00000 n
-0004152605 00000 n
-0004152960 00000 n
-0004153006 00000 n
-0004153237 00000 n
-0004153478 00000 n
-0004153718 00000 n
-0004153961 00000 n
-0004154192 00000 n
-0004154396 00000 n
-0004154453 00000 n
-0004155347 00000 n
-0004155557 00000 n
-0004155778 00000 n
-0004156011 00000 n
-0004156269 00000 n
-0004156477 00000 n
-0004156714 00000 n
-0004156939 00000 n
-0004178303 00000 n
-0004178599 00000 n
-0004178645 00000 n
-0004178836 00000 n
-0004178882 00000 n
-0004179129 00000 n
-0004179388 00000 n
-0004179446 00000 n
-0004179696 00000 n
-0004216195 00000 n
-0004216454 00000 n
-0004216688 00000 n
-0004243938 00000 n
-0004244205 00000 n
-0004244251 00000 n
-0004244444 00000 n
-0004244647 00000 n
-0004272323 00000 n
-0004272612 00000 n
-0004272658 00000 n
-0004272715 00000 n
-0004272948 00000 n
-0004273197 00000 n
-0004273448 00000 n
-0004308474 00000 n
-0004308733 00000 n
-0004308791 00000 n
-0004309003 00000 n
-0004318551 00000 n
-0004318797 00000 n
-0004319013 00000 n
-0004354247 00000 n
-0004354600 00000 n
-0004354646 00000 n
-0004354852 00000 n
-0004355062 00000 n
-0004355277 00000 n
-0004355492 00000 n
-0004355707 00000 n
-0004355911 00000 n
-0004355968 00000 n
-0004356180 00000 n
-0004356411 00000 n
-0004356681 00000 n
-0004356912 00000 n
-0004357165 00000 n
-0004399407 00000 n
-0004399635 00000 n
-0004418516 00000 n
-0004418827 00000 n
-0004418873 00000 n
-0004419074 00000 n
-0004419316 00000 n
-0004419547 00000 n
-0004419743 00000 n
-0004419800 00000 n
-0004459869 00000 n
-0004460125 00000 n
-0004478288 00000 n
-0004478583 00000 n
-0004478640 00000 n
-0004478865 00000 n
-0004479082 00000 n
-0004489889 00000 n
-0004490148 00000 n
-0004490438 00000 n
-0004499754 00000 n
-0004500042 00000 n
-0004500088 00000 n
-0004500290 00000 n
-0004500498 00000 n
-0004500691 00000 n
-0004500820 00000 n
-0004500940 00000 n
-0004501065 00000 n
-0004501191 00000 n
-0004501339 00000 n
-0004501478 00000 n
-0004501639 00000 n
-0004501791 00000 n
-0004501954 00000 n
-0004502110 00000 n
-0004502275 00000 n
-0004502433 00000 n
-0004502593 00000 n
-0004502754 00000 n
-0004502928 00000 n
-0004503104 00000 n
-0004503280 00000 n
-0004503456 00000 n
-0004503633 00000 n
-0004503810 00000 n
-0004503964 00000 n
-0004504121 00000 n
-0004504295 00000 n
-0004504469 00000 n
-0004504637 00000 n
-0004504805 00000 n
-0004504975 00000 n
-0004505147 00000 n
-0004505311 00000 n
-0004505477 00000 n
-0004505649 00000 n
-0004505832 00000 n
-0004505997 00000 n
-0004506175 00000 n
-0004506352 00000 n
-0004506529 00000 n
-0004506713 00000 n
-0004506920 00000 n
-0004507120 00000 n
-0004507320 00000 n
-0004507504 00000 n
-0004507699 00000 n
-0004507892 00000 n
-0004508095 00000 n
-0004508290 00000 n
-0004508487 00000 n
-0004508686 00000 n
-0004508885 00000 n
-0004509039 00000 n
-0004509204 00000 n
-0004509377 00000 n
-0004509552 00000 n
-0004509730 00000 n
-0004509908 00000 n
-0004510087 00000 n
-0004510266 00000 n
-0004510433 00000 n
-0004510610 00000 n
-0004510786 00000 n
-0004510973 00000 n
-0004511160 00000 n
-0004511347 00000 n
-0004511525 00000 n
-0004511714 00000 n
-0004511885 00000 n
-0004512067 00000 n
-0004512244 00000 n
-0004512423 00000 n
-0004512598 00000 n
-0004512783 00000 n
-0004512945 00000 n
-0004513107 00000 n
-0004513290 00000 n
-0004513473 00000 n
-0004513657 00000 n
-0004513841 00000 n
-0004514003 00000 n
-0004514165 00000 n
-0004514336 00000 n
-0004514518 00000 n
-0004514660 00000 n
-0004514814 00000 n
-0004514984 00000 n
-0004515165 00000 n
-0004515358 00000 n
-0004515551 00000 n
-0004515738 00000 n
-0004515925 00000 n
-0004516102 00000 n
-0004516279 00000 n
-0004516445 00000 n
-0004516611 00000 n
-0004516898 00000 n
-0004516976 00000 n
-0004517137 00000 n
-0004517329 00000 n
-0004517578 00000 n
-0004517753 00000 n
-0004518042 00000 n
-0004518279 00000 n
-0004518498 00000 n
-0004518725 00000 n
-0004518922 00000 n
-0004519143 00000 n
-0004519368 00000 n
-0004519579 00000 n
-0004519801 00000 n
-0004520035 00000 n
-0004520264 00000 n
-0004520458 00000 n
-0004520720 00000 n
-0004520966 00000 n
-0004521177 00000 n
-0004521471 00000 n
-0004521766 00000 n
-0004522023 00000 n
-0004522252 00000 n
-0004522521 00000 n
-0004522757 00000 n
-0004522991 00000 n
-0004523242 00000 n
-0004523424 00000 n
-0004523684 00000 n
-0004523877 00000 n
-0004524062 00000 n
-0004524298 00000 n
-0004524542 00000 n
-0004524791 00000 n
-0004525016 00000 n
-0004525229 00000 n
-0004525416 00000 n
-0004525694 00000 n
-0004525924 00000 n
-0004526161 00000 n
-0004526365 00000 n
-0004526660 00000 n
-0004526914 00000 n
-0004527116 00000 n
-0004527369 00000 n
-0004527609 00000 n
-0004527795 00000 n
-0004528090 00000 n
-0004528755 00000 n
-0004538449 00000 n
-0004538665 00000 n
-0004540028 00000 n
-0004541075 00000 n
-0004549416 00000 n
-0004549637 00000 n
-0004551000 00000 n
-0004552071 00000 n
-0004553434 00000 n
-0004553645 00000 n
-0004553960 00000 n
-0004554876 00000 n
-0004560904 00000 n
-0004561118 00000 n
-0004562481 00000 n
-0004563530 00000 n
-0004564926 00000 n
-0004565144 00000 n
-0004566507 00000 n
-0004567646 00000 n
-0004573095 00000 n
-0004573321 00000 n
-0004574684 00000 n
-0004575772 00000 n
-0004576935 00000 n
-0004577151 00000 n
-0004577454 00000 n
-0004578591 00000 n
-0004580238 00000 n
-0004580468 00000 n
-0004581831 00000 n
-0004582967 00000 n
-0004584642 00000 n
-0004584856 00000 n
-0004585168 00000 n
-0004586306 00000 n
-0004589012 00000 n
-0004589225 00000 n
-0004590588 00000 n
+0002444908 00000 n
+0002445244 00000 n
+0002445432 00000 n
+0002445490 00000 n
+0002445705 00000 n
+0002445919 00000 n
+0002446150 00000 n
+0002446380 00000 n
+0002446601 00000 n
+0002446809 00000 n
+0002447041 00000 n
+0002447099 00000 n
+0002447334 00000 n
+0002464226 00000 n
+0002464533 00000 n
+0002464750 00000 n
+0002464969 00000 n
+0002465192 00000 n
+0002465420 00000 n
+0002465477 00000 n
+0002465691 00000 n
+0002465749 00000 n
+0002465958 00000 n
+0002466161 00000 n
+0002471049 00000 n
+0002471353 00000 n
+0002471570 00000 n
+0002471778 00000 n
+0002471824 00000 n
+0002472044 00000 n
+0002472101 00000 n
+0002472334 00000 n
+0002555337 00000 n
+0002555551 00000 n
+0002555609 00000 n
+0002586538 00000 n
+0002586779 00000 n
+0002586825 00000 n
+0002621577 00000 n
+0002621844 00000 n
+0002622052 00000 n
+0002622098 00000 n
+0002622318 00000 n
+0002647349 00000 n
+0002647631 00000 n
+0002647811 00000 n
+0002647868 00000 n
+0002647925 00000 n
+0002655503 00000 n
+0002655810 00000 n
+0002655867 00000 n
+0002655924 00000 n
+0002656157 00000 n
+0002766958 00000 n
+0002767181 00000 n
+0002793972 00000 n
+0002794227 00000 n
+0002794403 00000 n
+0002794449 00000 n
+0002823763 00000 n
+0002824036 00000 n
+0002824094 00000 n
+0002824332 00000 n
+0002849118 00000 n
+0002849431 00000 n
+0002849621 00000 n
+0002849840 00000 n
+0002850053 00000 n
+0002850261 00000 n
+0002850471 00000 n
+0002850700 00000 n
+0002863178 00000 n
+0002863501 00000 n
+0002863547 00000 n
+0002864165 00000 n
+0002864372 00000 n
+0002864574 00000 n
+0002864821 00000 n
+0002865055 00000 n
+0002865289 00000 n
+0002865516 00000 n
+0002865573 00000 n
+0002865823 00000 n
+0002866072 00000 n
+0002866129 00000 n
+0002866391 00000 n
+0002872580 00000 n
+0002900870 00000 n
+0002901125 00000 n
+0002909893 00000 n
+0002910181 00000 n
+0002910227 00000 n
+0002910429 00000 n
+0002910649 00000 n
+0002957090 00000 n
+0002957305 00000 n
+0002979137 00000 n
+0002984539 00000 n
+0002984848 00000 n
+0002985036 00000 n
+0002995820 00000 n
+0002996019 00000 n
+0002996076 00000 n
+0002996278 00000 n
+0002996502 00000 n
+0002996560 00000 n
+0003026364 00000 n
+0003026592 00000 n
+0003061244 00000 n
+0003061512 00000 n
+0003061569 00000 n
+0003061626 00000 n
+0003087570 00000 n
+0003087859 00000 n
+0003087905 00000 n
+0003088061 00000 n
+0003088291 00000 n
+0003088349 00000 n
+0003088593 00000 n
+0003090498 00000 n
+0003090765 00000 n
+0003110011 00000 n
+0003110197 00000 n
+0003125295 00000 n
+0003125492 00000 n
+0003154263 00000 n
+0003154504 00000 n
+0003154562 00000 n
+0003157387 00000 n
+0003157615 00000 n
+0003187594 00000 n
+0003187910 00000 n
+0003187956 00000 n
+0003188131 00000 n
+0003188387 00000 n
+0003188644 00000 n
+0003188878 00000 n
+0003220379 00000 n
+0003220722 00000 n
+0003220975 00000 n
+0003221216 00000 n
+0003221441 00000 n
+0003221663 00000 n
+0003221863 00000 n
+0003222105 00000 n
+0003222337 00000 n
+0003222558 00000 n
+0003244586 00000 n
+0003244897 00000 n
+0003245137 00000 n
+0003245341 00000 n
+0003245581 00000 n
+0003245807 00000 n
+0003277052 00000 n
+0003277379 00000 n
+0003277588 00000 n
+0003277830 00000 n
+0003278079 00000 n
+0003278322 00000 n
+0003278567 00000 n
+0003278810 00000 n
+0003305722 00000 n
+0003306038 00000 n
+0003306246 00000 n
+0003306476 00000 n
+0003306706 00000 n
+0003313474 00000 n
+0003313741 00000 n
+0003313787 00000 n
+0003314000 00000 n
+0003314200 00000 n
+0003314258 00000 n
+0003314304 00000 n
+0003316219 00000 n
+0003316512 00000 n
+0003316705 00000 n
+0003327378 00000 n
+0003327585 00000 n
+0003327632 00000 n
+0003328155 00000 n
+0003330262 00000 n
+0003330521 00000 n
+0003330567 00000 n
+0003330624 00000 n
+0003330834 00000 n
+0003340870 00000 n
+0003344936 00000 n
+0003345216 00000 n
+0003345414 00000 n
+0003345462 00000 n
+0003345519 00000 n
+0003345758 00000 n
+0003345816 00000 n
+0003345874 00000 n
+0003346296 00000 n
+0003348203 00000 n
+0003348496 00000 n
+0003348692 00000 n
+0003359053 00000 n
+0003359266 00000 n
+0003359313 00000 n
+0003370309 00000 n
+0003370613 00000 n
+0003370659 00000 n
+0003370890 00000 n
+0003370947 00000 n
+0003371004 00000 n
+0003371217 00000 n
+0003371440 00000 n
+0003371677 00000 n
+0003371885 00000 n
+0003450694 00000 n
+0003451821 00000 n
+0003452102 00000 n
+0003452288 00000 n
+0003519624 00000 n
+0003519823 00000 n
+0003523069 00000 n
+0003523336 00000 n
+0003523524 00000 n
+0003523754 00000 n
+0003526511 00000 n
+0003526778 00000 n
+0003526824 00000 n
+0003526881 00000 n
+0003526938 00000 n
+0003527172 00000 n
+0003598222 00000 n
+0003598417 00000 n
+0003636920 00000 n
+0003639721 00000 n
+0003639993 00000 n
+0003640183 00000 n
+0003640239 00000 n
+0003677573 00000 n
+0003677864 00000 n
+0003678114 00000 n
+0003678171 00000 n
+0003678749 00000 n
+0003678960 00000 n
+0003679193 00000 n
+0003679412 00000 n
+0003679610 00000 n
+0003714184 00000 n
+0003714465 00000 n
+0003714695 00000 n
+0003714918 00000 n
+0003714964 00000 n
+0003715010 00000 n
+0003715055 00000 n
+0003761119 00000 n
+0003766256 00000 n
+0003766549 00000 n
+0003766733 00000 n
+0003766935 00000 n
+0003766993 00000 n
+0003767051 00000 n
+0003789155 00000 n
+0003789383 00000 n
+0003814887 00000 n
+0003815154 00000 n
+0003815200 00000 n
+0003815257 00000 n
+0003815487 00000 n
+0003815533 00000 n
+0003815770 00000 n
+0003843337 00000 n
+0003843609 00000 n
+0003843858 00000 n
+0003843915 00000 n
+0003858328 00000 n
+0003858600 00000 n
+0003858815 00000 n
+0003858861 00000 n
+0003858918 00000 n
+0003878335 00000 n
+0003878576 00000 n
+0003878633 00000 n
+0003902031 00000 n
+0003902304 00000 n
+0003902565 00000 n
+0003902623 00000 n
+0003931248 00000 n
+0003931521 00000 n
+0003931783 00000 n
+0003931840 00000 n
+0003959956 00000 n
+0003960244 00000 n
+0003960475 00000 n
+0003960668 00000 n
+0003960714 00000 n
+0003960772 00000 n
+0003960957 00000 n
+0003983048 00000 n
+0003983289 00000 n
+0003983335 00000 n
+0003985548 00000 n
+0003985807 00000 n
+0003985853 00000 n
+0003985910 00000 n
+0004059055 00000 n
+0004059263 00000 n
+0004123898 00000 n
+0004128023 00000 n
+0004128295 00000 n
+0004128490 00000 n
+0004128546 00000 n
+0004153313 00000 n
+0004153668 00000 n
+0004153714 00000 n
+0004153945 00000 n
+0004154186 00000 n
+0004154426 00000 n
+0004154669 00000 n
+0004154900 00000 n
+0004155104 00000 n
+0004155161 00000 n
+0004156055 00000 n
+0004156265 00000 n
+0004156486 00000 n
+0004156719 00000 n
+0004156977 00000 n
+0004157185 00000 n
+0004157422 00000 n
+0004157647 00000 n
+0004179011 00000 n
+0004179307 00000 n
+0004179353 00000 n
+0004179544 00000 n
+0004179590 00000 n
+0004179837 00000 n
+0004180096 00000 n
+0004180154 00000 n
+0004180404 00000 n
+0004216903 00000 n
+0004217162 00000 n
+0004217396 00000 n
+0004244646 00000 n
+0004244913 00000 n
+0004244959 00000 n
+0004245152 00000 n
+0004245355 00000 n
+0004273031 00000 n
+0004273320 00000 n
+0004273366 00000 n
+0004273423 00000 n
+0004273656 00000 n
+0004273905 00000 n
+0004274156 00000 n
+0004309182 00000 n
+0004309441 00000 n
+0004309499 00000 n
+0004309711 00000 n
+0004319259 00000 n
+0004319505 00000 n
+0004319721 00000 n
+0004354955 00000 n
+0004355308 00000 n
+0004355354 00000 n
+0004355560 00000 n
+0004355770 00000 n
+0004355985 00000 n
+0004356200 00000 n
+0004356415 00000 n
+0004356619 00000 n
+0004356676 00000 n
+0004356888 00000 n
+0004357119 00000 n
+0004357389 00000 n
+0004357620 00000 n
+0004357873 00000 n
+0004400115 00000 n
+0004400343 00000 n
+0004419224 00000 n
+0004419535 00000 n
+0004419581 00000 n
+0004419782 00000 n
+0004420024 00000 n
+0004420255 00000 n
+0004420451 00000 n
+0004420508 00000 n
+0004460577 00000 n
+0004460833 00000 n
+0004478996 00000 n
+0004479291 00000 n
+0004479348 00000 n
+0004479573 00000 n
+0004479790 00000 n
+0004490597 00000 n
+0004490856 00000 n
+0004491146 00000 n
+0004500462 00000 n
+0004500750 00000 n
+0004500796 00000 n
+0004500998 00000 n
+0004501206 00000 n
+0004501399 00000 n
+0004501528 00000 n
+0004501648 00000 n
+0004501773 00000 n
+0004501899 00000 n
+0004502047 00000 n
+0004502186 00000 n
+0004502347 00000 n
+0004502499 00000 n
+0004502662 00000 n
+0004502818 00000 n
+0004502983 00000 n
+0004503141 00000 n
+0004503301 00000 n
+0004503462 00000 n
+0004503636 00000 n
+0004503812 00000 n
+0004503988 00000 n
+0004504164 00000 n
+0004504341 00000 n
+0004504518 00000 n
+0004504672 00000 n
+0004504829 00000 n
+0004505003 00000 n
+0004505177 00000 n
+0004505345 00000 n
+0004505513 00000 n
+0004505683 00000 n
+0004505855 00000 n
+0004506019 00000 n
+0004506185 00000 n
+0004506357 00000 n
+0004506540 00000 n
+0004506705 00000 n
+0004506883 00000 n
+0004507060 00000 n
+0004507237 00000 n
+0004507421 00000 n
+0004507628 00000 n
+0004507828 00000 n
+0004508028 00000 n
+0004508212 00000 n
+0004508407 00000 n
+0004508600 00000 n
+0004508803 00000 n
+0004508998 00000 n
+0004509195 00000 n
+0004509394 00000 n
+0004509593 00000 n
+0004509747 00000 n
+0004509912 00000 n
+0004510085 00000 n
+0004510260 00000 n
+0004510438 00000 n
+0004510616 00000 n
+0004510795 00000 n
+0004510974 00000 n
+0004511141 00000 n
+0004511318 00000 n
+0004511494 00000 n
+0004511681 00000 n
+0004511868 00000 n
+0004512055 00000 n
+0004512233 00000 n
+0004512422 00000 n
+0004512593 00000 n
+0004512775 00000 n
+0004512952 00000 n
+0004513131 00000 n
+0004513306 00000 n
+0004513491 00000 n
+0004513653 00000 n
+0004513815 00000 n
+0004513998 00000 n
+0004514181 00000 n
+0004514365 00000 n
+0004514549 00000 n
+0004514711 00000 n
+0004514873 00000 n
+0004515044 00000 n
+0004515226 00000 n
+0004515368 00000 n
+0004515522 00000 n
+0004515692 00000 n
+0004515873 00000 n
+0004516066 00000 n
+0004516259 00000 n
+0004516446 00000 n
+0004516633 00000 n
+0004516810 00000 n
+0004516987 00000 n
+0004517153 00000 n
+0004517319 00000 n
+0004517606 00000 n
+0004517684 00000 n
+0004517845 00000 n
+0004518037 00000 n
+0004518286 00000 n
+0004518461 00000 n
+0004518750 00000 n
+0004518987 00000 n
+0004519206 00000 n
+0004519433 00000 n
+0004519630 00000 n
+0004519851 00000 n
+0004520076 00000 n
+0004520287 00000 n
+0004520509 00000 n
+0004520743 00000 n
+0004520972 00000 n
+0004521166 00000 n
+0004521428 00000 n
+0004521674 00000 n
+0004521885 00000 n
+0004522179 00000 n
+0004522474 00000 n
+0004522731 00000 n
+0004522960 00000 n
+0004523229 00000 n
+0004523465 00000 n
+0004523699 00000 n
+0004523950 00000 n
+0004524132 00000 n
+0004524392 00000 n
+0004524585 00000 n
+0004524770 00000 n
+0004525006 00000 n
+0004525250 00000 n
+0004525499 00000 n
+0004525724 00000 n
+0004525937 00000 n
+0004526124 00000 n
+0004526402 00000 n
+0004526632 00000 n
+0004526869 00000 n
+0004527073 00000 n
+0004527368 00000 n
+0004527622 00000 n
+0004527824 00000 n
+0004528077 00000 n
+0004528317 00000 n
+0004528503 00000 n
+0004528798 00000 n
+0004529463 00000 n
+0004539157 00000 n
+0004539373 00000 n
+0004540736 00000 n
+0004541783 00000 n
+0004550124 00000 n
+0004550345 00000 n
+0004551708 00000 n
+0004552779 00000 n
+0004554142 00000 n
+0004554353 00000 n
+0004554668 00000 n
+0004555584 00000 n
+0004561612 00000 n
+0004561826 00000 n
+0004563189 00000 n
+0004564238 00000 n
+0004565634 00000 n
+0004565852 00000 n
+0004567215 00000 n
+0004568354 00000 n
+0004573803 00000 n
+0004574029 00000 n
+0004575392 00000 n
+0004576480 00000 n
+0004577643 00000 n
+0004577859 00000 n
+0004578162 00000 n
+0004579299 00000 n
+0004580946 00000 n
+0004581176 00000 n
+0004582539 00000 n
+0004583675 00000 n
+0004585350 00000 n
+0004585564 00000 n
+0004585876 00000 n
+0004587014 00000 n
+0004589720 00000 n
+0004589933 00000 n
+0004591296 00000 n
trailer
<< /Size 829
/Root 2 0 R
/Info 1 0 R
>>
startxref
-4591703
+4592411
%%EOF
[33/39] isis-site git commit: ISIS-1810: updates docs for 2.0.0-M1
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/274edd1d/content/versions/2.0.0-M1/guides/rgant/rgant.html
----------------------------------------------------------------------
diff --git a/content/versions/2.0.0-M1/guides/rgant/rgant.html b/content/versions/2.0.0-M1/guides/rgant/rgant.html
index 7894892..a14aa88 100644
--- a/content/versions/2.0.0-M1/guides/rgant/rgant.html
+++ b/content/versions/2.0.0-M1/guides/rgant/rgant.html
@@ -6441,11 +6441,24 @@ WrapperFactory wrapperFactory;</code></pre>
</ul>
</div>
<div class="paragraph">
- <p>Whenever a domain object is instantiated or otherwise becomes known to the framework, a "created" lifecycle event is fired. This is typically when the <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_DomainObjectContainer"><code>DomainObjectContainer</code></a>'s <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_DomainObjectContainer_object-creation-api"><code>newTransientInstance()</code></a> is called; it will also happen if the object is simply instantiated with <code>new(…)</code>, and then the <code>ServiceRegistry</code>'s <a href="../rgsvc/rgsvc.html#_rgsvc_metadata-api_ServiceRegistry"><code>injectServicesInto(…)</code></a> method is called.</p>
+ <p>Whenever a domain object is instantiated or otherwise becomes known to the framework, a "created" lifecycle event is fired. This is typically when the <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_FactoryService"><code>FactoryService</code></a>'s <code>instantiate()</code> method is called.</p>
</div>
<div class="paragraph">
<p>Subscribers subscribe through the <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_EventBusService"><code>EventBusService</code></a> and can use the event to obtain a reference to the object just created. The subscriber could then, for example, update the object, eg looking up state from some external datastore.</p>
</div>
+ <div class="admonitionblock tip">
+ <table>
+ <tbody>
+ <tr>
+ <td class="icon"> <i class="fa icon-tip" title="Tip"></i> </td>
+ <td class="content">
+ <div class="paragraph">
+ <p>It’s possible to instantiate objects without firing this lifecycle; just instantiate using its regular constructor, and then use the <code>ServiceRegistry</code>'s <a href="../rgsvc/rgsvc.html#_rgsvc_metadata-api_ServiceRegistry"><code>injectServicesInto(…)</code></a> to manually inject any required domain services.</p>
+ </div> </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
<div class="paragraph">
<p>By default the event raised is <code>ObjectCreatedEvent.Default</code>. For example:</p>
</div>
@@ -6481,7 +6494,7 @@ WrapperFactory wrapperFactory;</code></pre>
<div class="sect3">
<h4 id="_subscribers_3">10.4.1. Subscribers</h4>
<div class="paragraph">
- <p>Subscribers (which must be domain services) subscribe using either the <a href="https://github.com/google/guava">Guava</a> API or (if the <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_EventBusService"><code>EventBusService</code></a> has been appropriately configured) using the <a href="http://www.axonframework.org/">Axon Framework</a> API. The examples below use the Guava API.</p>
+ <p>Subscribers (which must be domain services) subscribe using either the <a href="https://github.com/google/guava">Guava</a> API or (if the <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_EventBusService"><code>EventBusService</code></a> has been appropriately configured) using the <a href="http://www.axonframework.org/">Axon Framework</a> API. The examples below are compatible with both.</p>
</div>
<div class="paragraph">
<p>Subscribers can be either coarse-grained (if they subscribe to the top-level event type):</p>
@@ -6490,7 +6503,8 @@ WrapperFactory wrapperFactory;</code></pre>
<div class="content">
<pre class="CodeRay highlight"><code data-lang="java"><span class="annotation">@DomainService</span>(nature=NatureOfService.DOMAIN)
<span class="directive">public</span> <span class="type">class</span> <span class="class">SomeSubscriber</span> <span class="directive">extends</span> AbstractSubscriber {
- <span class="annotation">@com</span>.google.common.eventbus.Subscribe
+ <span class="annotation">@org</span>.axonframework.eventhandling.annotation.EventHandler <span class="comment">// if using axon</span>
+ <span class="annotation">@com</span>.google.common.eventbus.Subscribe <span class="comment">// if using guava</span>
<span class="directive">public</span> <span class="type">void</span> on(ObjectCreatedEvent ev) {
<span class="keyword">if</span>(ev.getSource() <span class="keyword">instanceof</span> ToDoItem) { ... }
}
@@ -6504,26 +6518,14 @@ WrapperFactory wrapperFactory;</code></pre>
<div class="content">
<pre class="CodeRay highlight"><code data-lang="java"><span class="annotation">@DomainService</span>(nature=NatureOfService.DOMAIN)
<span class="directive">public</span> <span class="type">class</span> <span class="class">SomeSubscriber</span> <span class="directive">extends</span> AbstractSubscriber {
- <span class="annotation">@com</span>.google.common.eventbus.Subscribe
+ <span class="annotation">@org</span>.axonframework.eventhandling.annotation.EventHandler <span class="comment">// if using axon</span>
+ <span class="annotation">@com</span>.google.common.eventbus.Subscribe <span class="comment">// if using guava</span>
<span class="directive">public</span> <span class="type">void</span> on(ToDoItem.ObjectCreatedEvent ev) {
...
}
}</code></pre>
</div>
</div>
- <div class="admonitionblock tip">
- <table>
- <tbody>
- <tr>
- <td class="icon"> <i class="fa icon-tip" title="Tip"></i> </td>
- <td class="content">
- <div class="paragraph">
- <p>If the AxonFramework is being used, replace <code>@com.google.common.eventbus.Subscribe</code> with <code>@org.axonframework.eventhandling.annotation.EventHandler</code>.</p>
- </div> </td>
- </tr>
- </tbody>
- </table>
- </div>
</div>
<div class="sect3">
<h4 id="_default_doop_and_noop_events_3">10.4.2. Default, Doop and Noop events</h4>
@@ -8139,7 +8141,7 @@ WrapperFactory wrapperFactory;</code></pre>
<div class="sect3">
<h4 id="_subscribers_10">11.4.1. Subscribers</h4>
<div class="paragraph">
- <p>Subscribers (which must be domain services) subscribe using either the <a href="https://github.com/google/guava">Guava</a> API or (if the <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_EventBusService"><code>EventBusService</code></a> has been appropriately configured) using the <a href="http://www.axonframework.org/">Axon Framework</a> API. The examples below use the Guava API.</p>
+ <p>Subscribers (which must be domain services) subscribe using either the <a href="https://github.com/google/guava">Guava</a> API or (if the <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_EventBusService"><code>EventBusService</code></a> has been appropriately configured) using the <a href="http://www.axonframework.org/">Axon Framework</a> API. The examples below are compatible with both.</p>
</div>
<div class="paragraph">
<p>Subscribers can be either coarse-grained (if they subscribe to the top-level event type):</p>
@@ -8148,7 +8150,8 @@ WrapperFactory wrapperFactory;</code></pre>
<div class="content">
<pre class="CodeRay highlight"><code data-lang="java"><span class="annotation">@DomainService</span>(nature=NatureOfService.DOMAIN)
<span class="directive">public</span> <span class="type">class</span> <span class="class">SomeSubscriber</span> <span class="directive">extends</span> AbstractSubscriber {
- <span class="annotation">@com</span>.google.common.eventbus.Subscribe
+ <span class="annotation">@org</span>.axonframework.eventhandling.annotation.EventHandler <span class="comment">// if using axon</span>
+ <span class="annotation">@com</span>.google.common.eventbus.Subscribe <span class="comment">// if using guava</span>
<span class="directive">public</span> <span class="type">void</span> on(CssClassUiEvent ev) {
<span class="keyword">if</span>(ev.getSource() <span class="keyword">instanceof</span> ToDoItemDto) { ... }
}
@@ -8162,7 +8165,8 @@ WrapperFactory wrapperFactory;</code></pre>
<div class="content">
<pre class="CodeRay highlight"><code data-lang="java"><span class="annotation">@DomainService</span>(nature=NatureOfService.DOMAIN)
<span class="directive">public</span> <span class="type">class</span> <span class="class">SomeSubscriber</span> <span class="directive">extends</span> AbstractSubscriber {
- <span class="annotation">@com</span>.google.common.eventbus.Subscribe
+ <span class="annotation">@org</span>.axonframework.eventhandling.annotation.EventHandler <span class="comment">// if using axon</span>
+ <span class="annotation">@com</span>.google.common.eventbus.Subscribe <span class="comment">// if using guava</span>
<span class="directive">public</span> <span class="type">void</span> on(ToDoItemDto.CssClassUiEvent ev) {
...
}
@@ -8172,19 +8176,6 @@ WrapperFactory wrapperFactory;</code></pre>
<div class="paragraph">
<p>The subscriber should then use <code>CssClassUiEvent#setCssClass(…)</code> to actually specify the CSS class to be used.</p>
</div>
- <div class="admonitionblock tip">
- <table>
- <tbody>
- <tr>
- <td class="icon"> <i class="fa icon-tip" title="Tip"></i> </td>
- <td class="content">
- <div class="paragraph">
- <p>If the AxonFramework is being used, replace <code>@com.google.common.eventbus.Subscribe</code> with <code>@org.axonframework.eventhandling.annotation.EventHandler</code>.</p>
- </div> </td>
- </tr>
- </tbody>
- </table>
- </div>
</div>
<div class="sect3">
<h4 id="_default_doop_and_noop_events_10">11.4.2. Default, Doop and Noop events</h4>
@@ -8204,7 +8195,7 @@ WrapperFactory wrapperFactory;</code></pre>
<div class="sect3">
<h4 id="_raising_events_programmatically_3">11.4.3. Raising events programmatically</h4>
<div class="paragraph">
- <p>Normally events are only raised for interactions through the UI. However, events can be raised programmatically either by calling the <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_EventBusService"><code>EventBusService</code></a> API directly, or as a result of calling the <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_DomainObjectContainer"><code>DomainObjectContainer</code></a>'s <code>cssClassOf(…)</code> method.</p>
+ <p>Normally events are only raised for interactions through the UI. However, events can be raised programmatically either by calling the <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_EventBusService"><code>EventBusService</code></a> API directly.</p>
</div>
</div>
</div>
@@ -8302,7 +8293,7 @@ WrapperFactory wrapperFactory;</code></pre>
<div class="sect3">
<h4 id="_subscribers_11">11.6.1. Subscribers</h4>
<div class="paragraph">
- <p>Subscribers (which must be domain services) subscribe using either the <a href="https://github.com/google/guava">Guava</a> API or (if the <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_EventBusService"><code>EventBusService</code></a> has been appropriately configured) using the <a href="http://www.axonframework.org/">Axon Framework</a> API. The examples below use the Guava API.</p>
+ <p>Subscribers (which must be domain services) subscribe using either the <a href="https://github.com/google/guava">Guava</a> API or (if the <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_EventBusService"><code>EventBusService</code></a> has been appropriately configured) using the <a href="http://www.axonframework.org/">Axon Framework</a> API. The examples below are compatible with both.</p>
</div>
<div class="paragraph">
<p>Subscribers can be either coarse-grained (if they subscribe to the top-level event type):</p>
@@ -8311,7 +8302,8 @@ WrapperFactory wrapperFactory;</code></pre>
<div class="content">
<pre class="CodeRay highlight"><code data-lang="java"><span class="annotation">@DomainService</span>(nature=NatureOfService.DOMAIN)
<span class="directive">public</span> <span class="type">class</span> <span class="class">SomeSubscriber</span> <span class="directive">extends</span> AbstractSubscriber {
- <span class="annotation">@com</span>.google.common.eventbus.Subscribe
+ <span class="annotation">@org</span>.axonframework.eventhandling.annotation.EventHandler <span class="comment">// if using axon</span>
+ <span class="annotation">@com</span>.google.common.eventbus.Subscribe <span class="comment">// if using guava</span>
<span class="directive">public</span> <span class="type">void</span> on(IconUiEvent ev) {
<span class="keyword">if</span>(ev.getSource() <span class="keyword">instanceof</span> ToDoItemDto) { ... }
}
@@ -8325,7 +8317,8 @@ WrapperFactory wrapperFactory;</code></pre>
<div class="content">
<pre class="CodeRay highlight"><code data-lang="java"><span class="annotation">@DomainService</span>(nature=NatureOfService.DOMAIN)
<span class="directive">public</span> <span class="type">class</span> <span class="class">SomeSubscriber</span> <span class="directive">extends</span> AbstractSubscriber {
- <span class="annotation">@com</span>.google.common.eventbus.Subscribe
+ <span class="annotation">@org</span>.axonframework.eventhandling.annotation.EventHandler <span class="comment">// if using axon</span>
+ <span class="annotation">@com</span>.google.common.eventbus.Subscribe <span class="comment">// if using guava</span>
<span class="directive">public</span> <span class="type">void</span> on(ToDoItemDto.IconUiEvent ev) {
...
}
@@ -8335,19 +8328,6 @@ WrapperFactory wrapperFactory;</code></pre>
<div class="paragraph">
<p>The subscriber should then use <code>IconUiEvent#setIconName(…)</code> to actually specify the icon name to be used.</p>
</div>
- <div class="admonitionblock tip">
- <table>
- <tbody>
- <tr>
- <td class="icon"> <i class="fa icon-tip" title="Tip"></i> </td>
- <td class="content">
- <div class="paragraph">
- <p>If the AxonFramework is being used, replace <code>@com.google.common.eventbus.Subscribe</code> with <code>@org.axonframework.eventhandling.annotation.EventHandler</code>.</p>
- </div> </td>
- </tr>
- </tbody>
- </table>
- </div>
</div>
<div class="sect3">
<h4 id="_default_doop_and_noop_events_11">11.6.2. Default, Doop and Noop events</h4>
@@ -8367,7 +8347,7 @@ WrapperFactory wrapperFactory;</code></pre>
<div class="sect3">
<h4 id="_raising_events_programmatically_4">11.6.3. Raising events programmatically</h4>
<div class="paragraph">
- <p>Normally events are only raised for interactions through the UI. However, events can be raised programmatically either by calling the <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_EventBusService"><code>EventBusService</code></a> API directly, or as a result of calling the <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_DomainObjectContainer"><code>DomainObjectContainer</code></a>'s <code>iconNameOf(…)</code> method.</p>
+ <p>Normally events are only raised for interactions through the UI. However, events can be raised programmatically either by calling the <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_EventBusService"><code>EventBusService</code></a> API directly, or as a result of calling the <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_TitleService"><code>TitleService</code></a>'s <code>iconNameOf(…)</code> method.</p>
</div>
</div>
</div>
@@ -9404,10 +9384,10 @@ WrapperFactory wrapperFactory;</code></pre>
)
<span class="annotation">@HomePage</span>
<span class="directive">public</span> ToDoAppDashboard lookup() {
- <span class="keyword">return</span> container.injectServicesInto(<span class="keyword">new</span> ToDoAppDashboard());
+ <span class="keyword">return</span> serviceRegistry.injectServicesInto(<span class="keyword">new</span> ToDoAppDashboard());
}
<span class="annotation">@Inject</span>
- <span class="directive">private</span> DomainObjectContainer container;
+ <span class="predefined-type">ServiceRegistry</span> serviceRegistry;
}</code></pre>
</div>
</div>
@@ -9472,7 +9452,7 @@ WrapperFactory wrapperFactory;</code></pre>
</table>
</div>
<div class="paragraph">
- <p>Isis supports several syntaxes for injecting domain services. The simplest uses the <code>@javax.inject.Inject</code> annotation on the field, as defined in <a href="https://jcp.org/en/jsr/detail?id=330">JSR-330</a>.</p>
+ <p>Apache Isis supports several syntaxes for injecting domain services. The simplest uses the <code>@javax.inject.Inject</code> annotation on the field, as defined in <a href="https://jcp.org/en/jsr/detail?id=330">JSR-330</a>.</p>
</div>
<div class="paragraph">
<p>For example:</p>
@@ -9505,7 +9485,7 @@ WrapperFactory wrapperFactory;</code></pre>
<div class="sect2">
<h3 id="_alternative_syntaxes">16.1. Alternative syntaxes</h3>
<div class="paragraph">
- <p>Isis also supports setter-based injection:</p>
+ <p>Apache Isis also supports setter-based injection:</p>
</div>
<div class="listingblock">
<div class="content">
@@ -9591,55 +9571,35 @@ WrapperFactory wrapperFactory;</code></pre>
<div class="sect2">
<h3 id="_manually_injecting_services">16.3. Manually injecting services</h3>
<div class="paragraph">
- <p>Isis performs dependency injection when domain entities are recreated. It will also perform dependency injection if an object is created through the <code>DomainObjectContainer</code>.</p>
+ <p>Apache Isis performs dependency injection when domain entities are recreated. It will also perform dependency injection if an object is created through the <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_FactoryService"><code>FactoryService</code></a> or <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_RepositoryService"><code>RepositoryService</code></a>.</p>
</div>
<div class="paragraph">
<p>For example, to create a new (transient) domain object, the idiom is:</p>
</div>
<div class="listingblock">
<div class="content">
- <pre class="CodeRay highlight"><code data-lang="java">Customer cust = container.newTransientInstance(Customer.class); <i class="conum" data-value="1"></i><b>(1)</b>
+ <pre class="CodeRay highlight"><code data-lang="java">Customer cust = repositoryService.instantiate(Customer.class); <i class="conum" data-value="1"></i><b>(1)</b>
<span class="comment">// initialize state of "cust"</span>
-container.persist(cust);</code></pre>
+repositoryService.persist(cust);</code></pre>
</div>
</div>
- <div class="colist arabic">
- <table>
- <tbody>
- <tr>
- <td><i class="conum" data-value="1"></i><b>1</b></td>
- <td>where <code>container</code> is an instance of <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_DomainObjectContainer"><code>DomainObjectContainer</code></a>.</td>
- </tr>
- </tbody>
- </table>
- </div>
<div class="paragraph">
- <p>View models are created similarly:</p>
+ <p>View models are created identically:</p>
</div>
<div class="listingblock">
<div class="content">
- <pre class="CodeRay highlight"><code data-lang="java">ToDoAppDashboard dashboard = container.newViewModelInstance(ToDoAppDashboard.class);</code></pre>
+ <pre class="CodeRay highlight"><code data-lang="java">ToDoAppDashboard dashboard = repositoryService.instantiate(ToDoAppDashboard.class);</code></pre>
</div>
</div>
<div class="paragraph">
- <p>If you prefer, though, you can simply instantiate domain objects using "new" and then inject domain services manually:</p>
+ <p>If you prefer, though, you can simply instantiate domain objects using "new" and then inject domain services manually using <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_ServiceRegistry"><code>ServiceRegistry</code></a>:</p>
</div>
<div class="listingblock">
<div class="content">
<pre class="CodeRay highlight"><code data-lang="java">Customer cust = <span class="keyword">new</span> Customer();
-container.injectServicesInto(cust);
+serviceRegistry.injectServicesInto(cust);
<span class="comment">// initialize state of "cust"</span>
-container.persist(cust);</code></pre>
- </div>
- </div>
- <div class="paragraph">
- <p>or if you prefer:</p>
- </div>
- <div class="listingblock">
- <div class="content">
- <pre class="CodeRay highlight"><code data-lang="java">Customer cust = container.injectServicesInto(<span class="keyword">new</span> Customer());
-<span class="comment">// initialize state of "cust"</span>
-container.persist(cust);</code></pre>
+repositoryService.persist(cust);</code></pre>
</div>
</div>
<div class="admonitionblock note">
@@ -9649,10 +9609,10 @@ container.persist(cust);</code></pre>
<td class="icon"> <i class="fa icon-note" title="Note"></i> </td>
<td class="content">
<div class="paragraph">
- <p>There is one subtle difference between using <code>DomainObjectContainer#newTransientInstance(…)</code> and <code>DomainObjectContainer#injectServicesInto(…)</code>, in that with the former Apache Isis will automatically initialize all fields to their default values.</p>
+ <p>Note that using either <code>FactoryService#instantiate(…)</code> or <code>RepositoryService#instantiate(…)</code> will also automatically initialize all fields to their default values, and will also fire a "created" lifecycle event.</p>
</div>
<div class="paragraph">
- <p>This isn’t a particular useful feature (and indeed can sometimes be rather confusing) so you may well wish to standardize on using <code>injectServicesInto(…)</code> throughout.</p>
+ <p>Neither of these are particularly useful (and indeed can sometimes be rather confusing) so you may well wish to standardize on using <code>injectServicesInto(…)</code> throughout.</p>
</div> </td>
</tr>
</tbody>
@@ -11202,41 +11162,7 @@ container.persist(cust);</code></pre>
</div>
</div>
<div class="paragraph">
- <p>Isis uses argument to pass in the configuration properties read from all <a href="../rgcfg/rgcfg.html#_rgcfg_configuration-files">configuration files</a>:</p>
- </div>
- <div class="admonitionblock tip">
- <table>
- <tbody>
- <tr>
- <td class="icon"> <i class="fa icon-tip" title="Tip"></i> </td>
- <td class="content">
- <div class="paragraph">
- <p>Alternatively, you could inject <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_DomainObjectContainer"><code>DomainObjectContainer</code></a> into the service and read configuration properties using <code>DomainObjectContainer#getProperty(…)</code> and related methods. Note that when using this latter API only those configuration properties prefixes <code>application.</code> key are provided.</p>
- </div> </td>
- </tr>
- </tbody>
- </table>
- </div>
- <div class="paragraph">
- <p>A common use case is for domain services that interact with the <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_EventBusService"><code>EventBusService</code></a>. For example:</p>
- </div>
- <div class="listingblock">
- <div class="content">
- <pre class="CodeRay highlight"><code data-lang="java"><span class="annotation">@DomainService</span>(nature=NatureOfService.DOMAIN)
-<span class="directive">public</span> <span class="type">class</span> <span class="class">MySubscribingService</span> {
- <span class="annotation">@PostConstruct</span>
- <span class="directive">public</span> <span class="type">void</span> postConstruct() {
- eventBusService.register(<span class="local-variable">this</span>);
- }
- <span class="annotation">@PreDestroy</span>
- <span class="directive">public</span> <span class="type">void</span> preDestroy() {
- eventBusService.unregister(<span class="local-variable">this</span>);
- }
- ...
- <span class="annotation">@javax</span>.inject.Inject
- EventBusService eventBusService;
-}</code></pre>
- </div>
+ <p>Apache Isis uses argument to pass in the configuration properties read from all <a href="../rgcfg/rgcfg.html#_rgcfg_configuration-files">configuration files</a>:</p>
</div>
<div class="admonitionblock tip">
<table>
@@ -11245,14 +11171,14 @@ container.persist(cust);</code></pre>
<td class="icon"> <i class="fa icon-tip" title="Tip"></i> </td>
<td class="content">
<div class="paragraph">
- <p>In this particular use case, it is generally simpler to just subclass from <a href="../rgcms/rgcms.html#_rgcms_classes_super_AbstractSubscriber"><code>AbstractSubscriber</code></a>.</p>
+ <p>Alternatively, you could inject <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_ConfigurationService"><code>ConfigurationService</code></a> into the service and read configuration properties using <code>ConfigurationService#getProperty(…)</code> and related methods. However, be aware when using this latter API that only those configuration properties keys with an <code>application.</code> prefix are provided.</p>
</div> </td>
</tr>
</tbody>
</table>
</div>
<div class="paragraph">
- <p>Other use cases include obtaining connections to external datasources, eg subscribing to an ActiveMQ router, say, or initializing/cleaning up a background scheduler such as Quartz.</p>
+ <p>Use cases include obtaining connections to external datasources, eg subscribing to an ActiveMQ router, say, or initializing/cleaning up a background scheduler such as Quartz.</p>
</div>
<div class="paragraph">
<p>See also <a href="../rgant/rgant.html#_rgant-PreDestroy"><code>@PreDestroy</code></a></p>
@@ -11360,7 +11286,7 @@ container.persist(cust);</code></pre>
<p>The <code>@javax.jdo.annotation.PrimaryKey</code> annotation is used by JDO/DataNucleus to indicate that a property is used as the primary key for an entity with application-managed identity.</p>
</div>
<div class="paragraph">
- <p>Apache Isis also uses this annotation in a very minimal way: to ensure that the framework’s own logic to initialize newly instantiated objects (eg using <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_DomainObjectContainer"><code>DomainObjectContainer#newTransientInstance(…)</code></a> does not touch the primary key, and also to ensure that the primary key property is always disabled (read-only).</p>
+ <p>Apache Isis also uses this annotation in a very minimal way: to ensure that the framework’s own logic to initialize newly instantiated objects (eg using <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_FactoryService"><code>FactoryService#instantiate(…)</code></a> does not touch the primary key, and also to ensure that the primary key property is always disabled (read-only).</p>
</div>
<div class="admonitionblock note">
<table>
[17/39] isis-site git commit: ISIS-1810: updates docs for 2.0.0-M1
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/274edd1d/content/versions/SNAPSHOT/guides/htg.pdf
----------------------------------------------------------------------
diff --git a/content/versions/SNAPSHOT/guides/htg.pdf b/content/versions/SNAPSHOT/guides/htg.pdf
index a98f418..12683de 100644
--- a/content/versions/SNAPSHOT/guides/htg.pdf
+++ b/content/versions/SNAPSHOT/guides/htg.pdf
@@ -4,16 +4,16 @@
<< /Title (Hints & Tips Guide)
/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:20180812182323+01'00')
-/ModDate (D:20180812182323+01'00')
+/CreationDate (D:20180814003704+02'00')
+/ModDate (D:20180814003704+02'00')
>>
endobj
2 0 obj
<< /Type /Catalog
/Pages 3 0 R
/Names 18 0 R
-/Outlines 477 0 R
-/PageLabels 526 0 R
+/Outlines 476 0 R
+/PageLabels 525 0 R
/PageMode /UseOutlines
/OpenAction [7 0 R /FitH 842.89]
/ViewerPreferences << /DisplayDocTitle true
@@ -23,7 +23,7 @@ endobj
3 0 obj
<< /Type /Pages
/Count 58
-/Kids [7 0 R 10 0 R 12 0 R 14 0 R 16 0 R 31 0 R 36 0 R 41 0 R 47 0 R 53 0 R 62 0 R 70 0 R 80 0 R 98 0 R 112 0 R 114 0 R 126 0 R 131 0 R 137 0 R 139 0 R 145 0 R 153 0 R 160 0 R 166 0 R 169 0 R 180 0 R 184 0 R 186 0 R 194 0 R 198 0 R 200 0 R 204 0 R 206 0 R 214 0 R 216 0 R 222 0 R 229 0 R 240 0 R 247 0 R 257 0 R 263 0 R 268 0 R 278 0 R 286 0 R 288 0 R 295 0 R 299 0 R 304 0 R 307 0 R 316 0 R 318 0 R 325 0 R 329 0 R 332 0 R 347 0 R 349 0 R 364 0 R 375 0 R]
+/Kids [7 0 R 10 0 R 12 0 R 14 0 R 16 0 R 31 0 R 36 0 R 41 0 R 47 0 R 53 0 R 62 0 R 70 0 R 80 0 R 98 0 R 111 0 R 113 0 R 125 0 R 130 0 R 136 0 R 138 0 R 144 0 R 152 0 R 159 0 R 165 0 R 168 0 R 179 0 R 183 0 R 185 0 R 193 0 R 197 0 R 199 0 R 203 0 R 205 0 R 213 0 R 215 0 R 221 0 R 228 0 R 239 0 R 246 0 R 256 0 R 262 0 R 267 0 R 277 0 R 285 0 R 287 0 R 294 0 R 298 0 R 303 0 R 306 0 R 315 0 R 317 0 R 324 0 R 328 0 R 331 0 R 346 0 R 348 0 R 363 0 R 374 0 R]
>>
endobj
4 0 obj
@@ -80,11 +80,11 @@ endobj
<< /Type /Font
/BaseFont /AAAAAP+NotoSerif
/Subtype /TrueType
-/FontDescriptor 528 0 R
+/FontDescriptor 527 0 R
/FirstChar 32
/LastChar 255
-/Widths 530 0 R
-/ToUnicode 529 0 R
+/Widths 529 0 R
+/ToUnicode 528 0 R
>>
endobj
9 0 obj
@@ -1639,7 +1639,7 @@ endobj
/F1.0 8 0 R
>>
>>
-/Annots [384 0 R 385 0 R 386 0 R 387 0 R 388 0 R 389 0 R 390 0 R 391 0 R 392 0 R 393 0 R 394 0 R 395 0 R 396 0 R 397 0 R 398 0 R 399 0 R 400 0 R 401 0 R 402 0 R 403 0 R 404 0 R 405 0 R 406 0 R 407 0 R 408 0 R 409 0 R 410 0 R 411 0 R 412 0 R 413 0 R 414 0 R 415 0 R 416 0 R 417 0 R 418 0 R 419 0 R 420 0 R 421 0 R 422 0 R 423 0 R 424 0 R 425 0 R 426 0 R 427 0 R 428 0 R 429 0 R 430 0 R 431 0 R 432 0 R 433 0 R 434 0 R 435 0 R 436 0 R 437 0 R 438 0 R 439 0 R 440 0 R 441 0 R 442 0 R 443 0 R 444 0 R 445 0 R 446 0 R 447 0 R 448 0 R 449 0 R 450 0 R 451 0 R 452 0 R 453 0 R 454 0 R 455 0 R 456 0 R 457 0 R 458 0 R 459 0 R]
+/Annots [383 0 R 384 0 R 385 0 R 386 0 R 387 0 R 388 0 R 389 0 R 390 0 R 391 0 R 392 0 R 393 0 R 394 0 R 395 0 R 396 0 R 397 0 R 398 0 R 399 0 R 400 0 R 401 0 R 402 0 R 403 0 R 404 0 R 405 0 R 406 0 R 407 0 R 408 0 R 409 0 R 410 0 R 411 0 R 412 0 R 413 0 R 414 0 R 415 0 R 416 0 R 417 0 R 418 0 R 419 0 R 420 0 R 421 0 R 422 0 R 423 0 R 424 0 R 425 0 R 426 0 R 427 0 R 428 0 R 429 0 R 430 0 R 431 0 R 432 0 R 433 0 R 434 0 R 435 0 R 436 0 R 437 0 R 438 0 R 439 0 R 440 0 R 441 0 R 442 0 R 443 0 R 444 0 R 445 0 R 446 0 R 447 0 R 448 0 R 449 0 R 450 0 R 451 0 R 452 0 R 453 0 R 454 0 R 455 0 R 456 0 R 457 0 R 458 0 R]
>>
endobj
11 0 obj
@@ -1982,7 +1982,7 @@ endobj
/Font << /F1.0 8 0 R
>>
>>
-/Annots [460 0 R 461 0 R 462 0 R 463 0 R 464 0 R 465 0 R 466 0 R 467 0 R 468 0 R 469 0 R 470 0 R 471 0 R 472 0 R 473 0 R 474 0 R 475 0 R]
+/Annots [459 0 R 460 0 R 461 0 R 462 0 R 463 0 R 464 0 R 465 0 R 466 0 R 467 0 R 468 0 R 469 0 R 470 0 R 471 0 R 472 0 R 473 0 R 474 0 R]
>>
endobj
13 0 obj
@@ -2050,7 +2050,7 @@ endobj
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/Font << /F1.0 8 0 R
>>
-/XObject << /Stamp1 476 0 R
+/XObject << /Stamp1 475 0 R
>>
>>
>>
@@ -2582,7 +2582,7 @@ endobj
/F1.0 8 0 R
/F3.0 28 0 R
>>
-/XObject << /Stamp1 476 0 R
+/XObject << /Stamp1 475 0 R
>>
>>
/Annots [21 0 R 23 0 R 25 0 R 29 0 R]
@@ -2597,18 +2597,18 @@ endobj
>>
endobj
19 0 obj
-<< /Kids [116 0 R 369 0 R 265 0 R 174 0 R 117 0 R 273 0 R]
+<< /Kids [115 0 R 368 0 R 264 0 R 173 0 R 116 0 R 272 0 R]
>>
endobj
20 0 obj
<< /Type /Font
/BaseFont /AAAAAQ+NotoSerif-Bold
/Subtype /TrueType
-/FontDescriptor 532 0 R
+/FontDescriptor 531 0 R
/FirstChar 32
/LastChar 255
-/Widths 534 0 R
-/ToUnicode 533 0 R
+/Widths 533 0 R
+/ToUnicode 532 0 R
>>
endobj
21 0 obj
@@ -2657,11 +2657,11 @@ endobj
<< /Type /Font
/BaseFont /AAAAAR+mplus1mn-regular
/Subtype /TrueType
-/FontDescriptor 536 0 R
+/FontDescriptor 535 0 R
/FirstChar 32
/LastChar 255
-/Widths 538 0 R
-/ToUnicode 537 0 R
+/Widths 537 0 R
+/ToUnicode 536 0 R
>>
endobj
29 0 obj
@@ -5053,7 +5053,7 @@ endobj
/F4.1 32 0 R
/F2.0 20 0 R
>>
-/XObject << /Stamp1 476 0 R
+/XObject << /Stamp1 475 0 R
>>
>>
/Annots [34 0 R]
@@ -5063,11 +5063,11 @@ endobj
<< /Type /Font
/BaseFont /AAAAAS+FontAwesome
/Subtype /TrueType
-/FontDescriptor 540 0 R
+/FontDescriptor 539 0 R
/FirstChar 32
/LastChar 255
-/Widths 542 0 R
-/ToUnicode 541 0 R
+/Widths 541 0 R
+/ToUnicode 540 0 R
>>
endobj
33 0 obj
@@ -7082,7 +7082,7 @@ endobj
/F1.0 8 0 R
/F2.0 20 0 R
>>
-/XObject << /Stamp1 476 0 R
+/XObject << /Stamp1 475 0 R
>>
>>
/Annots [37 0 R 39 0 R]
@@ -9648,7 +9648,7 @@ endobj
/F1.0 8 0 R
/F3.1 45 0 R
>>
-/XObject << /Stamp1 476 0 R
+/XObject << /Stamp1 475 0 R
>>
>>
/Annots [44 0 R]
@@ -9675,11 +9675,11 @@ endobj
<< /Type /Font
/BaseFont /AAAAAT+mplus1mn-regular
/Subtype /TrueType
-/FontDescriptor 544 0 R
+/FontDescriptor 543 0 R
/FirstChar 32
/LastChar 255
-/Widths 546 0 R
-/ToUnicode 545 0 R
+/Widths 545 0 R
+/ToUnicode 544 0 R
>>
endobj
46 0 obj
@@ -11050,7 +11050,7 @@ endobj
/F1.0 8 0 R
/F3.0 28 0 R
>>
-/XObject << /Stamp1 476 0 R
+/XObject << /Stamp1 475 0 R
>>
>>
/Annots [49 0 R 51 0 R]
@@ -13480,7 +13480,7 @@ endobj
/F1.0 8 0 R
/F3.1 45 0 R
>>
-/XObject << /Stamp1 476 0 R
+/XObject << /Stamp1 475 0 R
>>
>>
/Annots [55 0 R 56 0 R 58 0 R 60 0 R]
@@ -15901,7 +15901,7 @@ endobj
/F2.0 20 0 R
/F3.0 28 0 R
>>
-/XObject << /Stamp1 476 0 R
+/XObject << /Stamp1 475 0 R
>>
>>
/Annots [65 0 R 67 0 R 68 0 R]
@@ -15911,11 +15911,11 @@ endobj
<< /Type /Font
/BaseFont /AAAAAU+NotoSerif-Italic
/Subtype /TrueType
-/FontDescriptor 548 0 R
+/FontDescriptor 547 0 R
/FirstChar 32
/LastChar 255
-/Widths 550 0 R
-/ToUnicode 549 0 R
+/Widths 549 0 R
+/ToUnicode 548 0 R
>>
endobj
64 0 obj
@@ -16986,7 +16986,7 @@ endobj
/F1.0 8 0 R
/F3.0 28 0 R
>>
-/XObject << /Stamp1 476 0 R
+/XObject << /Stamp1 475 0 R
>>
>>
/Annots [72 0 R 73 0 R 74 0 R 75 0 R 76 0 R 77 0 R]
@@ -18359,7 +18359,7 @@ endobj
/F2.0 20 0 R
/F5.0 63 0 R
>>
-/XObject << /Stamp1 476 0 R
+/XObject << /Stamp1 475 0 R
>>
>>
/Annots [81 0 R 82 0 R 83 0 R 84 0 R 85 0 R 87 0 R 88 0 R 89 0 R 90 0 R 91 0 R 92 0 R 93 0 R 94 0 R 95 0 R 96 0 R]
@@ -18534,7 +18534,7 @@ endobj
>>
endobj
97 0 obj
-<< /Length 36840
+<< /Length 29532
>>
stream
q
@@ -18785,7 +18785,7 @@ ET
q
0.5 w
0.933 0.933 0.933 SCN
-113.807 660.430 m
+113.807 648.430 m
113.807 747.330 l
S
Q
@@ -18797,7 +18797,7 @@ Q
0.067 0.067 0.067 SCN
BT
-80.17133333333334 695.3000000000001 Td
+80.17133333333334 689.3000000000001 Td
/F4.1 24 Tf
<21> Tj
ET
@@ -18822,7 +18822,7 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-2.355 Tw
+2.989 Tw
BT
125.80666666666667 715.586 Td
@@ -18837,10 +18837,10 @@ ET
0.694 0.129 0.275 scn
0.694 0.129 0.275 SCN
-2.355 Tw
+2.989 Tw
BT
-202.27374074074072 715.586 Td
+203.542375 715.586 Td
/F3.0 10.5 Tf
<40506172616d657465724c61796f7574286e616d65643d> Tj
ET
@@ -18852,10 +18852,10 @@ ET
0.694 0.129 0.275 scn
0.694 0.129 0.275 SCN
-2.355 Tw
+2.989 Tw
BT
-323.0237407407408 715.586 Td
+324.292375 715.586 Td
/F6.0 10.5 Tf
<c9> Tj
ET
@@ -18867,10 +18867,10 @@ ET
0.694 0.129 0.275 scn
0.694 0.129 0.275 SCN
-2.355 Tw
+2.989 Tw
BT
-333.5237407407408 715.586 Td
+334.792375 715.586 Td
/F3.0 10.5 Tf
<29> Tj
ET
@@ -18882,12 +18882,12 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-2.355 Tw
+2.989 Tw
BT
-338.7737407407408 715.586 Td
+340.042375 715.586 Td
/F1.0 10.5 Tf
-<20616e6e6f746174696f6e2e2020537570706f727420666f7220746869732063616e206265> Tj
+<20616e6e6f746174696f6e2e20537570706f727420666f7220746869732063616e206265> Tj
ET
@@ -18942,40 +18942,32 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-0.263 Tw
-
BT
125.80666666666667 684.0260000000001 Td
/F1.0 10.5 Tf
-<415346292e202028496e2074686520667574757265207765d56c6c20666f6c64207468697320696e746f20636f7265292e202053656520616c736f206f75722067756964616e6365206f6e20> Tj
+<415346292e2028496e2074686520667574757265207765d56c6c20666f6c64207468697320696e746f20636f7265292e> Tj
ET
-
-0.000 Tw
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-
-0.263 Tw
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
-483.453705078125 684.0260000000001 Td
+125.80666666666667 656.246 Td
/F1.0 10.5 Tf
-[<75706772> 20.01953125 <6164696e67>] TJ
+<53656520616c736f206f75722067756964616e6365206f6e20> Tj
ET
-
-0.000 Tw
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
0.259 0.545 0.792 scn
0.259 0.545 0.792 SCN
BT
-125.80666666666667 668.2460000000001 Td
+252.33166666666668 656.246 Td
/F1.0 10.5 Tf
-<746f204a6176612038> Tj
+[<75706772> 20.01953125 <6164696e6720746f204a6176612038>] TJ
ET
0.000 0.000 0.000 SCN
@@ -18984,7 +18976,7 @@ ET
0.200 0.200 0.200 SCN
BT
-168.48916666666668 668.2460000000001 Td
+349.3199615885417 656.246 Td
/F1.0 10.5 Tf
<2e> Tj
ET
@@ -18994,12 +18986,12 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-1.323 Tw
+1.151 Tw
BT
-48.24000000000001 636.466 Td
+48.24000000000001 624.466 Td
/F1.0 10.5 Tf
-[<546865206672> 20.01953125 <616d65776f726b20616c736f20737570706f727473206931386e3a206c6f63616c652d7370656369666963206e616d657320616e64206465736372697074696f6e732e20666f72206d6f726520696e666f726d6174696f6e2c>] TJ
+[<546865206672> 20.01953125 <616d65776f726b20616c736f20737570706f727473206931386e3a206c6f63616c652d7370656369666963206e616d657320616e64206465736372697074696f6e732e2046> 40.0390625 <6f72206d6f726520696e666f726d6174696f6e2c>] TJ
ET
@@ -19010,7 +19002,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24000000000001 620.686 Td
+48.24000000000001 608.686 Td
/F1.0 10.5 Tf
<7365652074686520> Tj
ET
@@ -19021,7 +19013,7 @@ ET
0.259 0.545 0.792 SCN
BT
-85.62 620.686 Td
+85.62 608.686 Td
/F1.0 10.5 Tf
<6265796f6e642d7468652d626173696373> Tj
ET
@@ -19032,7 +19024,7 @@ ET
0.200 0.200 0.200 SCN
BT
-175.668 620.686 Td
+175.668 608.686 Td
/F1.0 10.5 Tf
<2067756964652e> Tj
ET
@@ -19043,7 +19035,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24000000000001 580.8460000000001 Td
+48.24000000000001 568.8460000000001 Td
/F2.0 18 Tf
<312e352e2045616765722072656e646572696e67> Tj
ET
@@ -19054,7 +19046,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24000000000001 552.8260000000002 Td
+48.24000000000001 540.8260000000002 Td
/F1.0 10.5 Tf
[<42> 20.01953125 <792064656661756c742c20706172656e74656420636f6c6c656374696f6e7320616c6c2072656e6465726564206c617a696c79> 89.84375 <2c20696e206f7468657220776f72647320696e20612022636f6c6c617073656422207461626c652076696577> 69.82421875 <2e>] TJ
ET
@@ -19065,7 +19057,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24000000000001 525.0460000000003 Td
+48.24000000000001 513.0460000000003 Td
/F1.0 10.5 Tf
[<46> 40.0390625 <6f7220746865206d6f726520636f6d6d6f6e6c79207573656420636f6c6c656374696f6e732077652077616e7420746f2073686f7720746865207461626c6520657870616e6465643a>] TJ
ET
@@ -19074,14 +19066,14 @@ ET
0.000 0.000 0.000 scn
q
-0.000 0 0 0.000 48.240 509.230 cm
+0.000 0 0 0.000 48.240 497.230 cm
/I1 Do
Q
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
BT
-48.24000000000001 485.26600000000025 Td
+48.24000000000001 473.26600000000025 Td
/F1.0 10.5 Tf
[<46> 40.0390625 <6f72207468697320776520616e6e6f746174652074686520636f6c6c656374696f6e207573696e6720>] TJ
ET
@@ -19092,7 +19084,7 @@ ET
0.694 0.129 0.275 SCN
BT
-253.08408984375004 485.26600000000025 Td
+253.08408984375004 473.26600000000025 Td
/F3.0 10.5 Tf
<40436f6c6c656374696f6e4c61796f75742364656661756c74566965772829> Tj
ET
@@ -19103,7 +19095,7 @@ ET
0.200 0.200 0.200 SCN
BT
-415.83408984375 485.26600000000025 Td
+415.83408984375 473.26600000000025 Td
/F1.0 10.5 Tf
<3b20666f72206578616d706c65> Tj
ET
@@ -19112,28 +19104,28 @@ ET
0.000 0.000 0.000 scn
q
0.961 0.961 0.961 scn
-52.240 469.450 m
-543.040 469.450 l
-545.249 469.450 547.040 467.659 547.040 465.450 c
-547.040 318.790 l
-547.040 316.581 545.249 314.790 543.040 314.790 c
-52.240 314.790 l
-50.031 314.790 48.240 316.581 48.240 318.790 c
-48.240 465.450 l
-48.240 467.659 50.031 469.450 52.240 469.450 c
+52.240 457.450 m
+543.040 457.450 l
+545.249 457.450 547.040 455.659 547.040 453.450 c
+547.040 306.790 l
+547.040 304.581 545.249 302.790 543.040 302.790 c
+52.240 302.790 l
+50.031 302.790 48.240 304.581 48.240 306.790 c
+48.240 453.450 l
+48.240 455.659 50.031 457.450 52.240 457.450 c
h
f
0.800 0.800 0.800 SCN
0.75 w
-52.240 469.450 m
-543.040 469.450 l
-545.249 469.450 547.040 467.659 547.040 465.450 c
-547.040 318.790 l
-547.040 316.581 545.249 314.790 543.040 314.790 c
-52.240 314.790 l
-50.031 314.790 48.240 316.581 48.240 318.790 c
-48.240 465.450 l
-48.240 467.659 50.031 469.450 52.240 469.450 c
+52.240 457.450 m
+543.040 457.450 l
+545.249 457.450 547.040 455.659 547.040 453.450 c
+547.040 306.790 l
+547.040 304.581 545.249 302.790 543.040 302.790 c
+52.240 302.790 l
+50.031 302.790 48.240 304.581 48.240 306.790 c
+48.240 453.450 l
+48.240 455.659 50.031 457.450 52.240 457.450 c
h
S
Q
@@ -19141,7 +19133,7 @@ Q
0.600 0.600 1.000 SCN
BT
-59.24000000000001 446.6250000000003 Td
+59.24000000000001 434.6250000000003 Td
/F3.0 11 Tf
<406a61766178> Tj
ET
@@ -19152,7 +19144,7 @@ ET
0.200 0.200 0.200 SCN
BT
-92.24000000000001 446.6250000000003 Td
+92.24000000000001 434.6250000000003 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -19163,7 +19155,7 @@ ET
0.200 0.200 0.200 SCN
BT
-97.74000000000001 446.6250000000003 Td
+97.74000000000001 434.6250000000003 Td
/F3.0 11 Tf
<6a646f> Tj
ET
@@ -19174,7 +19166,7 @@ ET
0.200 0.200 0.200 SCN
BT
-114.24000000000001 446.6250000000003 Td
+114.24000000000001 434.6250000000003 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -19185,7 +19177,7 @@ ET
0.200 0.200 0.200 SCN
BT
-119.74000000000001 446.6250000000003 Td
+119.74000000000001 434.6250000000003 Td
/F3.0 11 Tf
<616e6e6f746174696f6e73> Tj
ET
@@ -19196,7 +19188,7 @@ ET
0.200 0.200 0.200 SCN
BT
-180.24 446.6250000000003 Td
+180.24 434.6250000000003 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -19207,7 +19199,7 @@ ET
0.200 0.200 0.200 SCN
BT
-185.74 446.6250000000003 Td
+185.74 434.6250000000003 Td
/F3.0 11 Tf
<50657273697374656e74> Tj
ET
@@ -19218,7 +19210,7 @@ ET
0.200 0.200 0.200 SCN
BT
-240.74 446.6250000000003 Td
+240.74 434.6250000000003 Td
/F3.0 11 Tf
<28> Tj
ET
@@ -19229,7 +19221,7 @@ ET
0.200 0.200 0.200 SCN
BT
-246.24 446.6250000000003 Td
+246.24 434.6250000000003 Td
/F3.0 11 Tf
<7461626c65> Tj
ET
@@ -19240,7 +19232,7 @@ ET
0.200 0.200 0.200 SCN
BT
-273.74 446.6250000000003 Td
+273.74 434.6250000000003 Td
/F3.0 11 Tf
<3d> Tj
ET
@@ -19251,7 +19243,7 @@ ET
0.800 0.200 0.000 SCN
BT
-279.24 446.6250000000003 Td
+279.24 434.6250000000003 Td
/F3.0 11 Tf
<22> Tj
ET
@@ -19262,7 +19254,7 @@ ET
0.800 0.200 0.000 SCN
BT
-284.74 446.6250000000003 Td
+284.74 434.6250000000003 Td
/F3.0 11 Tf
<546f446f4974656d446570656e64656e63696573> Tj
ET
@@ -19273,7 +19265,7 @@ ET
0.800 0.200 0.000 SCN
BT
-394.74 446.6250000000003 Td
+394.74 434.6250000000003 Td
/F3.0 11 Tf
<22> Tj
ET
@@ -19284,7 +19276,7 @@ ET
0.200 0.200 0.200 SCN
BT
-400.24 446.6250000000003 Td
+400.24 434.6250000000003 Td
/F3.0 11 Tf
<29> Tj
ET
@@ -19295,7 +19287,7 @@ ET
0.000 0.400 0.600 SCN
BT
-59.24000000000001 431.8850000000003 Td
+59.24000000000001 419.8850000000003 Td
/F3.0 11 Tf
<70726976617465> Tj
ET
@@ -19306,7 +19298,7 @@ ET
0.200 0.200 0.200 SCN
BT
-97.74000000000001 431.8850000000003 Td
+97.74000000000001 419.8850000000003 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -19317,7 +19309,7 @@ ET
0.000 0.467 0.533 SCN
BT
-103.24000000000001 431.8850000000003 Td
+103.24000000000001 419.8850000000003 Td
/F3.0 11 Tf
<536574> Tj
ET
@@ -19328,7 +19320,7 @@ ET
0.200 0.200 0.200 SCN
BT
-119.74000000000001 431.8850000000003 Td
+119.74000000000001 419.8850000000003 Td
/F3.0 11 Tf
<3c> Tj
ET
@@ -19339,7 +19331,7 @@ ET
0.200 0.200 0.200 SCN
BT
-125.24000000000001 431.8850000000003 Td
+125.24000000000001 419.8850000000003 Td
/F3.0 11 Tf
<546f446f4974656d> Tj
ET
@@ -19350,7 +19342,7 @@ ET
0.200 0.200 0.200 SCN
BT
-169.24 431.8850000000003 Td
+169.24 419.8850000000003 Td
/F3.0 11 Tf
<3e> Tj
ET
@@ -19361,7 +19353,7 @@ ET
0.200 0.200 0.200 SCN
BT
-174.74 431.8850000000003 Td
+174.74 419.8850000000003 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -19372,7 +19364,7 @@ ET
0.200 0.200 0.200 SCN
BT
-180.24 431.8850000000003 Td
+180.24 419.8850000000003 Td
/F3.0 11 Tf
<646570656e64656e63696573> Tj
ET
@@ -19383,7 +19375,7 @@ ET
0.200 0.200 0.200 SCN
BT
-246.24 431.8850000000003 Td
+246.24 419.8850000000003 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -19394,7 +19386,7 @@ ET
0.200 0.200 0.200 SCN
BT
-251.74 431.8850000000003 Td
+251.74 419.8850000000003 Td
/F3.0 11 Tf
<3d> Tj
ET
@@ -19405,7 +19397,7 @@ ET
0.200 0.200 0.200 SCN
BT
-257.24 431.8850000000003 Td
+257.24 419.8850000000003 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -19416,7 +19408,7 @@ ET
0.000 0.400 0.600 SCN
BT
-262.74 431.8850000000003 Td
+262.74 419.8850000000003 Td
/F3.0 11 Tf
<6e6577> Tj
ET
@@ -19427,7 +19419,7 @@ ET
0.200 0.200 0.200 SCN
BT
-279.24 431.8850000000003 Td
+279.24 419.8850000000003 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -19438,7 +19430,7 @@ ET
0.000 0.467 0.533 SCN
BT
-284.74 431.8850000000003 Td
+284.74 419.8850000000003 Td
/F3.0 11 Tf
<54726565536574> Tj
ET
@@ -19449,7 +19441,7 @@ ET
0.200 0.200 0.200 SCN
BT
-323.24 431.8850000000003 Td
+323.24 419.8850000000003 Td
/F3.0 11 Tf
<3c> Tj
ET
@@ -19460,7 +19452,7 @@ ET
0.200 0.200 0.200 SCN
BT
-328.74 431.8850000000003 Td
+328.74 419.8850000000003 Td
/F3.0 11 Tf
<3e> Tj
ET
@@ -19471,7 +19463,7 @@ ET
0.200 0.200 0.200 SCN
BT
-334.24 431.8850000000003 Td
+334.24 419.8850000000003 Td
/F3.0 11 Tf
<28> Tj
ET
@@ -19482,7 +19474,7 @@ ET
0.200 0.200 0.200 SCN
BT
-339.74 431.8850000000003 Td
+339.74 419.8850000000003 Td
/F3.0 11 Tf
<29> Tj
ET
@@ -19493,7 +19485,7 @@ ET
0.200 0.200 0.200 SCN
BT
-345.24 431.8850000000003 Td
+345.24 419.8850000000003 Td
/F3.0 11 Tf
<3b> Tj
ET
@@ -19504,7 +19496,7 @@ ET
0.600 0.600 1.000 SCN
BT
-59.24000000000001 417.14500000000027 Td
+59.24000000000001 405.14500000000027 Td
/F3.0 11 Tf
<40436f6c6c656374696f6e> Tj
ET
@@ -19515,7 +19507,7 @@ ET
0.600 0.600 1.000 SCN
BT
-59.24000000000001 402.40500000000026 Td
+59.24000000000001 390.40500000000026 Td
/F3.0 11 Tf
<40436f6c6c656374696f6e4c61796f7574> Tj
ET
@@ -19526,7 +19518,7 @@ ET
0.200 0.200 0.200 SCN
BT
-152.74 402.40500000000026 Td
+152.74 390.40500000000026 Td
/F3.0 11 Tf
<28> Tj
ET
@@ -19537,7 +19529,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24000000000001 387.66500000000025 Td
+59.24000000000001 375.66500000000025 Td
/F3.0 11 Tf
<ca202020> Tj
ET
@@ -19548,7 +19540,7 @@ ET
0.200 0.200 0.200 SCN
BT
-81.24000000000001 387.66500000000025 Td
+81.24000000000001 375.66500000000025 Td
/F3.0 11 Tf
<64656661756c7456696577> Tj
ET
@@ -19559,7 +19551,7 @@ ET
0.200 0.200 0.200 SCN
BT
-141.74 387.66500000000025 Td
+141.74 375.66500000000025 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -19570,7 +19562,7 @@ ET
0.200 0.200 0.200 SCN
BT
-147.24 387.66500000000025 Td
+147.24 375.66500000000025 Td
/F3.0 11 Tf
<3d> Tj
ET
@@ -19581,7 +19573,7 @@ ET
0.200 0.200 0.200 SCN
BT
-152.74 387.66500000000025 Td
+152.74 375.66500000000025 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -19592,7 +19584,7 @@ ET
0.800 0.200 0.000 SCN
BT
-158.24 387.66500000000025 Td
+158.24 375.66500000000025 Td
/F3.0 11 Tf
<22> Tj
ET
@@ -19603,7 +19595,7 @@ ET
0.800 0.200 0.000 SCN
BT
-163.74 387.66500000000025 Td
+163.74 375.66500000000025 Td
/F3.0 11 Tf
<7461626c65> Tj
ET
@@ -19614,7 +19606,7 @@ ET
0.800 0.200 0.000 SCN
BT
-191.24 387.66500000000025 Td
+191.24 375.66500000000025 Td
/F3.0 11 Tf
<22> Tj
ET
@@ -19625,7 +19617,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24000000000001 372.9250000000003 Td
+59.24000000000001 360.9250000000003 Td
/F3.0 11 Tf
<29> Tj
ET
@@ -19636,7 +19628,7 @@ ET
0.000 0.400 0.600 SCN
BT
-59.24000000000001 358.1850000000003 Td
+59.24000000000001 346.1850000000003 Td
/F3.0 11 Tf
<7075626c6963> Tj
ET
@@ -19647,7 +19639,7 @@ ET
0.200 0.200 0.200 SCN
BT
-92.24000000000001 358.1850000000003 Td
+92.24000000000001 346.1850000000003 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -19658,7 +19650,7 @@ ET
0.000 0.467 0.533 SCN
BT
-97.74000000000001 358.1850000000003 Td
+97.74000000000001 346.1850000000003 Td
/F3.0 11 Tf
<536574> Tj
ET
@@ -19669,7 +19661,7 @@ ET
0.200 0.200 0.200 SCN
BT
-114.24000000000001 358.1850000000003 Td
+114.24000000000001 346.1850000000003 Td
/F3.0 11 Tf
<3c> Tj
ET
@@ -19680,7 +19672,7 @@ ET
0.200 0.200 0.200 SCN
BT
-119.74000000000001 358.1850000000003 Td
+119.74000000000001 346.1850000000003 Td
/F3.0 11 Tf
<546f446f4974656d> Tj
ET
@@ -19691,7 +19683,7 @@ ET
0.200 0.200 0.200 SCN
BT
-163.74 358.1850000000003 Td
+163.74 346.1850000000003 Td
/F3.0 11 Tf
<3e> Tj
ET
@@ -19702,7 +19694,7 @@ ET
0.200 0.200 0.200 SCN
BT
-169.24 358.1850000000003 Td
+169.24 346.1850000000003 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -19713,7 +19705,7 @@ ET
0.200 0.200 0.200 SCN
BT
-174.74 358.1850000000003 Td
+174.74 346.1850000000003 Td
/F3.0 11 Tf
<676574446570656e64656e63696573> Tj
ET
@@ -19724,7 +19716,7 @@ ET
0.200 0.200 0.200 SCN
BT
-257.24 358.1850000000003 Td
+257.24 346.1850000000003 Td
/F3.0 11 Tf
<28> Tj
ET
@@ -19735,7 +19727,7 @@ ET
0.200 0.200 0.200 SCN
BT
-262.74 358.1850000000003 Td
+262.74 346.1850000000003 Td
/F3.0 11 Tf
<29> Tj
ET
@@ -19746,7 +19738,7 @@ ET
0.200 0.200 0.200 SCN
BT
-268.24 358.1850000000003 Td
+268.24 346.1850000000003 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -19757,7 +19749,7 @@ ET
0.200 0.200 0.200 SCN
BT
-273.74 358.1850000000003 Td
+273.74 346.1850000000003 Td
/F3.0 11 Tf
<7b> Tj
ET
@@ -19768,7 +19760,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24000000000001 343.4450000000003 Td
+59.24000000000001 331.4450000000003 Td
/F3.0 11 Tf
<ca202020> Tj
ET
@@ -19779,7 +19771,7 @@ ET
0.000 0.400 0.600 SCN
BT
-81.24000000000001 343.4450000000003 Td
+81.24000000000001 331.4450000000003 Td
/F3.0 11 Tf
<72657475726e> Tj
ET
@@ -19790,7 +19782,7 @@ ET
0.200 0.200 0.200 SCN
BT
-114.24000000000001 343.4450000000003 Td
+114.24000000000001 331.4450000000003 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -19801,7 +19793,7 @@ ET
0.200 0.200 0.200 SCN
BT
-119.74000000000001 343.4450000000003 Td
+119.74000000000001 331.4450000000003 Td
/F3.0 11 Tf
<646570656e64656e63696573> Tj
ET
@@ -19812,7 +19804,7 @@ ET
0.200 0.200 0.200 SCN
BT
-185.74 343.4450000000003 Td
+185.74 331.4450000000003 Td
/F3.0 11 Tf
<3b> Tj
ET
@@ -19823,7 +19815,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24000000000001 328.70500000000027 Td
+59.24000000000001 316.70500000000027 Td
/F3.0 11 Tf
<7d> Tj
ET
@@ -19834,7 +19826,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24000000000001 290.8260000000003 Td
+48.24000000000001 278.8260000000003 Td
/F1.0 10.5 Tf
[<416c7465726e61746976656c79> 89.84375 <2c2069742063616e206265207370656369666965642074686520>] TJ
ET
@@ -19845,7 +19837,7 @@ ET
0.694 0.129 0.275 SCN
BT
-229.24064062500003 290.8260000000003 Td
+229.24064062500003 278.8260000000003 Td
/F3.0 10.5 Tf
<5878782e6c61796f75742e786d6c> Tj
ET
@@ -19856,7 +19848,7 @@ ET
0.200 0.200 0.200 SCN
BT
-302.740640625 290.8260000000003 Td
+302.740640625 278.8260000000003 Td
/F1.0 10.5 Tf
<2066696c653a> Tj
ET
@@ -19865,28 +19857,28 @@ ET
0.000 0.000 0.000 scn
q
0.961 0.961 0.961 scn
-52.240 275.010 m
-543.040 275.010 l
-545.249 275.010 547.040 273.219 547.040 271.010 c
-547.040 198.050 l
-547.040 195.841 545.249 194.050 543.040 194.050 c
-52.240 194.050 l
-50.031 194.050 48.240 195.841 48.240 198.050 c
-48.240 271.010 l
-48.240 273.219 50.031 275.010 52.240 275.010 c
+52.240 263.010 m
+543.040 263.010 l
+545.249 263.010 547.040 261.219 547.040 259.010 c
+547.040 186.050 l
+547.040 183.841 545.249 182.050 543.040 182.050 c
+52.240 182.050 l
+50.031 182.050 48.240 183.841 48.240 186.050 c
+48.240 259.010 l
+48.240 261.219 50.031 263.010 52.240 263.010 c
h
f
0.800 0.800 0.800 SCN
0.75 w
-52.240 275.010 m
-543.040 275.010 l
-545.249 275.010 547.040 273.219 547.040 271.010 c
-547.040 198.050 l
-547.040 195.841 545.249 194.050 543.040 194.050 c
-52.240 194.050 l
-50.031 194.050 48.240 195.841 48.240 198.050 c
-48.240 271.010 l
-48.240 273.219 50.031 275.010 52.240 275.010 c
+52.240 263.010 m
+543.040 263.010 l
+545.249 263.010 547.040 261.219 547.040 259.010 c
+547.040 186.050 l
+547.040 183.841 545.249 182.050 543.040 182.050 c
+52.240 182.050 l
+50.031 182.050 48.240 183.841 48.240 186.050 c
+48.240 259.010 l
+48.240 261.219 50.031 263.010 52.240 263.010 c
h
S
Q
@@ -19894,7 +19886,7 @@ Q
0.200 0.200 0.200 SCN
BT
-59.24000000000001 252.18500000000031 Td
+59.24000000000001 240.18500000000031 Td
/F3.0 11 Tf
<3c> Tj
ET
@@ -19905,7 +19897,7 @@ ET
0.200 0.200 0.200 SCN
BT
-64.74000000000001 252.18500000000031 Td
+64.74000000000001 240.18500000000031 Td
/F3.0 11 Tf
<627333> Tj
ET
@@ -19916,7 +19908,7 @@ ET
0.200 0.200 0.200 SCN
BT
-81.24000000000001 252.18500000000031 Td
+81.24000000000001 240.18500000000031 Td
/F3.0 11 Tf
<3a> Tj
ET
@@ -19927,7 +19919,7 @@ ET
0.200 0.200 0.200 SCN
BT
-86.74000000000001 252.18500000000031 Td
+86.74000000000001 240.18500000000031 Td
/F3.0 11 Tf
<636f6c> Tj
ET
@@ -19938,7 +19930,7 @@ ET
0.200 0.200 0.200 SCN
BT
-103.24000000000001 252.18500000000031 Td
+103.24000000000001 240.18500000000031 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -19949,7 +19941,7 @@ ET
0.200 0.200 0.200 SCN
BT
-108.74000000000001 252.18500000000031 Td
+108.74000000000001 240.18500000000031 Td
/F3.0 11 Tf
<7370616e> Tj
ET
@@ -19960,7 +19952,7 @@ ET
0.200 0.200 0.200 SCN
BT
-130.74 252.18500000000031 Td
+130.74 240.18500000000031 Td
/F3.0 11 Tf
<3d> Tj
ET
@@ -19971,7 +19963,7 @@ ET
0.800 0.200 0.000 SCN
BT
-136.24 252.18500000000031 Td
+136.24 240.18500000000031 Td
/F3.0 11 Tf
<22> Tj
ET
@@ -19982,7 +19974,7 @@ ET
0.800 0.200 0.000 SCN
BT
-141.74 252.18500000000031 Td
+141.74 240.18500000000031 Td
/F3.0 11 Tf
<35> Tj
ET
@@ -19993,7 +19985,7 @@ ET
0.800 0.200 0.000 SCN
BT
-147.24 252.18500000000031 Td
+147.24 240.18500000000031 Td
/F3.0 11 Tf
<22> Tj
ET
@@ -20004,7 +19996,7 @@ ET
0.200 0.200 0.200 SCN
BT
-152.74 252.18500000000031 Td
+152.74 240.18500000000031 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -20015,7 +20007,7 @@ ET
0.200 0.200 0.200 SCN
BT
-158.24 252.18500000000031 Td
+158.24 240.18500000000031 Td
/F3.0 11 Tf
<637373436c617373> Tj
ET
@@ -20026,7 +20018,7 @@ ET
0.200 0.200 0.200 SCN
BT
-202.24 252.18500000000031 Td
+202.24 240.18500000000031 Td
/F3.0 11 Tf
<3d> Tj
ET
@@ -20037,7 +20029,7 @@ ET
0.800 0.200 0.000 SCN
BT
-207.74 252.18500000000031 Td
+207.74 240.18500000000031 Td
/F3.0 11 Tf
<22> Tj
ET
@@ -20048,7 +20040,7 @@ ET
0.800 0.200 0.000 SCN
BT
-213.24 252.18500000000031 Td
+213.24 240.18500000000031 Td
/F3.0 11 Tf
<637573746f6d2d70616464696e672d746f702d3230> Tj
ET
@@ -20059,7 +20051,7 @@ ET
0.800 0.200 0.000 SCN
BT
-328.74 252.18500000000031 Td
+328.74 240.18500000000031 Td
/F3.0 11 Tf
<22> Tj
ET
@@ -20070,7 +20062,7 @@ ET
0.200 0.200 0.200 SCN
BT
-334.24 252.18500000000031 Td
+334.24 240.18500000000031 Td
/F3.0 11 Tf
<3e> Tj
ET
@@ -20081,7 +20073,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24000000000001 237.44500000000033 Td
+59.24000000000001 225.44500000000033 Td
/F3.0 11 Tf
<ca202020> Tj
ET
@@ -20092,7 +20084,7 @@ ET
0.184 0.435 0.624 SCN
BT
-81.24000000000001 237.44500000000033 Td
+81.24000000000001 225.44500000000033 Td
/F3.0 11 Tf
<3c6370743a636f6c6c656374696f6e> Tj
ET
@@ -20103,7 +20095,7 @@ ET
0.200 0.200 0.200 SCN
BT
-163.74 237.44500000000033 Td
+163.74 225.44500000000033 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -20114,7 +20106,7 @@ ET
0.310 0.624 0.812 SCN
BT
-169.24 237.44500000000033 Td
+169.24 225.44500000000033 Td
/F3.0 11 Tf
<6964> Tj
ET
@@ -20125,7 +20117,7 @@ ET
0.200 0.200 0.200 SCN
BT
-180.24 237.44500000000033 Td
+180.24 225.44500000000033 Td
/F3.0 11 Tf
<3d> Tj
ET
@@ -20136,7 +20128,7 @@ ET
0.800 0.200 0.000 SCN
BT
-185.74 237.44500000000033 Td
+185.74 225.44500000000033 Td
/F3.0 11 Tf
<22> Tj
ET
@@ -20147,7 +20139,7 @@ ET
0.800 0.200 0.000 SCN
BT
-191.24 237.44500000000033 Td
+191.24 225.44500000000033 Td
/F3.0 11 Tf
<6e6f74596574436f6d706c657465> Tj
ET
@@ -20158,7 +20150,7 @@ ET
0.800 0.200 0.000 SCN
BT
-268.24 237.44500000000033 Td
+268.24 225.44500000000033 Td
/F3.0 11 Tf
<22> Tj
ET
@@ -20169,7 +20161,7 @@ ET
0.200 0.200 0.200 SCN
BT
-273.74 237.44500000000033 Td
+273.74 225.44500000000033 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -20180,7 +20172,7 @@ ET
0.310 0.624 0.812 SCN
BT
-279.24 237.44500000000033 Td
+279.24 225.44500000000033 Td
/F3.0 11 Tf
<64656661756c7456696577> Tj
ET
@@ -20191,7 +20183,7 @@ ET
0.200 0.200 0.200 SCN
BT
-339.74 237.44500000000033 Td
+339.74 225.44500000000033 Td
/F3.0 11 Tf
<3d> Tj
ET
@@ -20202,7 +20194,7 @@ ET
0.800 0.200 0.000 SCN
BT
-345.24 237.44500000000033 Td
+345.24 225.44500000000033 Td
/F3.0 11 Tf
<22> Tj
ET
@@ -20213,7 +20205,7 @@ ET
0.800 0.200 0.000 SCN
BT
-350.74 237.44500000000033 Td
+350.74 225.44500000000033 Td
/F3.0 11 Tf
<7461626c65> Tj
ET
@@ -20224,7 +20216,7 @@ ET
0.800 0.200 0.000 SCN
BT
-378.24 237.44500000000033 Td
+378.24 225.44500000000033 Td
/F3.0 11 Tf
<22> Tj
ET
@@ -20235,7 +20227,7 @@ ET
0.200 0.200 0.200 SCN
BT
-383.74 237.44500000000033 Td
+383.74 225.44500000000033 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -20246,7 +20238,7 @@ ET
0.184 0.435 0.624 SCN
BT
-389.24 237.44500000000033 Td
+389.24 225.44500000000033 Td
/F3.0 11 Tf
<2f3e> Tj
ET
@@ -20257,7 +20249,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24000000000001 222.70500000000033 Td
+59.24000000000001 210.70500000000033 Td
/F3.0 11 Tf
<ca202020> Tj
ET
@@ -20268,7 +20260,7 @@ ET
0.184 0.435 0.624 SCN
BT
-81.24000000000001 222.70500000000033 Td
+81.24000000000001 210.70500000000033 Td
/F3.0 11 Tf
<3c6370743a636f6c6c656374696f6e> Tj
ET
@@ -20279,7 +20271,7 @@ ET
0.200 0.200 0.200 SCN
BT
-163.74 222.70500000000033 Td
+163.74 210.70500000000033 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -20290,7 +20282,7 @@ ET
0.310 0.624 0.812 SCN
BT
-169.24 222.70500000000033 Td
+169.24 210.70500000000033 Td
/F3.0 11 Tf
<6964> Tj
ET
@@ -20301,7 +20293,7 @@ ET
0.200 0.200 0.200 SCN
BT
-180.24 222.70500000000033 Td
+180.24 210.70500000000033 Td
/F3.0 11 Tf
<3d> Tj
ET
@@ -20312,7 +20304,7 @@ ET
0.800 0.200 0.000 SCN
BT
-185.74 222.70500000000033 Td
+185.74 210.70500000000033 Td
/F3.0 11 Tf
<22> Tj
ET
@@ -20323,7 +20315,7 @@ ET
0.800 0.200 0.000 SCN
BT
-191.24 222.70500000000033 Td
+191.24 210.70500000000033 Td
/F3.0 11 Tf
<636f6d706c657465> Tj
ET
@@ -20334,7 +20326,7 @@ ET
0.800 0.200 0.000 SCN
BT
-235.24 222.70500000000033 Td
+235.24 210.70500000000033 Td
/F3.0 11 Tf
<22> Tj
ET
@@ -20345,7 +20337,7 @@ ET
0.200 0.200 0.200 SCN
BT
-240.74 222.70500000000033 Td
+240.74 210.70500000000033 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -20356,7 +20348,7 @@ ET
0.310 0.624 0.812 SCN
BT
-246.24 222.70500000000033 Td
+246.24 210.70500000000033 Td
/F3.0 11 Tf
<64656661756c7456696577> Tj
ET
@@ -20367,7 +20359,7 @@ ET
0.200 0.200 0.200 SCN
BT
-306.74 222.70500000000033 Td
+306.74 210.70500000000033 Td
/F3.0 11 Tf
<3d> Tj
ET
@@ -20378,7 +20370,7 @@ ET
0.800 0.200 0.000 SCN
BT
-312.24 222.70500000000033 Td
+312.24 210.70500000000033 Td
/F3.0 11 Tf
<22> Tj
ET
@@ -20389,7 +20381,7 @@ ET
0.800 0.200 0.000 SCN
BT
-317.74 222.70500000000033 Td
+317.74 210.70500000000033 Td
/F3.0 11 Tf
<7461626c65> Tj
ET
@@ -20400,7 +20392,7 @@ ET
0.800 0.200 0.000 SCN
BT
-345.24 222.70500000000033 Td
+345.24 210.70500000000033 Td
/F3.0 11 Tf
<22> Tj
ET
@@ -20411,7 +20403,7 @@ ET
0.184 0.435 0.624 SCN
BT
-350.74 222.70500000000033 Td
+350.74 210.70500000000033 Td
/F3.0 11 Tf
<2f3e> Tj
ET
@@ -20422,7 +20414,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24000000000001 207.96500000000032 Td
+59.24000000000001 195.96500000000032 Td
/F3.0 11 Tf
<3c> Tj
ET
@@ -20433,7 +20425,7 @@ ET
0.200 0.667 0.667 SCN
BT
-64.74000000000001 207.96500000000032 Td
+64.74000000000001 195.96500000000032 Td
/F3.0 11 Tf
<2f> Tj
ET
@@ -20444,7 +20436,7 @@ ET
0.200 0.667 0.667 SCN
BT
-70.24000000000001 207.96500000000032 Td
+70.24000000000001 195.96500000000032 Td
/F3.0 11 Tf
<627333636f6c3e> Tj
ET
@@ -20457,7 +20449,7 @@ ET
1.072 Tw
BT
-48.24000000000001 170.08600000000033 Td
+48.24000000000001 158.08600000000033 Td
/F1.0 10.5 Tf
<4974206d696768742062652074686f75676874207468617420636f6c6c656374696f6e732074686174206172652065616765726c792072656e64657265642073686f756c6420616c736f2062652065616765726c79206c6f616465642066726f6d> Tj
ET
@@ -20470,7 +20462,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24000000000001 154.30600000000032 Td
+48.24000000000001 142.30600000000032 Td
/F1.0 10.5 Tf
[<7468652064617461626173652062> 20.01953125 <7920656e61626c696e672074686520>] TJ
ET
@@ -20481,7 +20473,7 @@ ET
0.694 0.129 0.275 SCN
BT
-194.30529492187503 154.30600000000032 Td
+194.30529492187503 142.30600000000032 Td
/F3.0 10.5 Tf
<64656661756c74466574636847726f7570> Tj
ET
@@ -20492,7 +20484,7 @@ ET
0.200 0.200 0.200 SCN
BT
-283.55529492187503 154.30600000000032 Td
+283.55529492187503 142.30600000000032 Td
/F1.0 10.5 Tf
<206174747269627574653a> Tj
ET
@@ -20500,37 +20492,413 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
q
+0.000 0.000 0.000 scn
+0.000 0.000 0.000 SCN
+1 w
+0 J
+0 j
+[ ] 0 d
+/Stamp1 Do
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+535.978 14.388 Td
+/F1.0 9 Tf
+<3131> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+Q
+Q
+
+endstream
+endobj
+98 0 obj
+<< /Type /Page
+/Parent 3 0 R
+/MediaBox [0 0 595.28 841.89]
+/Contents 97 0 R
+/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
+/Font << /F2.0 20 0 R
+/F1.0 8 0 R
+/F3.0 28 0 R
+/F4.1 32 0 R
+/F6.0 101 0 R
+>>
+/XObject << /I1 106 0 R
+/Stamp1 475 0 R
+>>
+>>
+/Annots [99 0 R 100 0 R 102 0 R 103 0 R 104 0 R 108 0 R 109 0 R]
+>>
+endobj
+99 0 obj
+<< /Border [0 0 0]
+/A << /Type /Action
+/S /URI
+/URI (../rgant/rgant.pdf#_rgant-ParameterLayout_named)
+>>
+/Subtype /Link
+/Rect [217.50650040000002 767.577 343.50650040000005 778.077]
+/Type /Annot
+>>
+endobj
+100 0 obj
+<< /Border [0 0 0]
+/A << /Type /Action
+/S /URI
+/URI (../rgant/rgant.pdf#_rgant-ParameterLayout_describedAs)
+>>
+/Subtype /Link
+/Rect [383.77300080000003 767.577 541.2730008000001 778.077]
+/Type /Annot
+>>
+endobj
+101 0 obj
+<< /Type /Font
+/BaseFont /AAAAAV+mplus-1p-regular
+/Subtype /TrueType
+/FontDescriptor 551 0 R
+/FirstChar 32
+/LastChar 255
+/Widths 553 0 R
+/ToUnicode 552 0 R
+>>
+endobj
+102 0 obj
+<< /Border [0 0 0]
+/A << /Type /Action
+/S /URI
+/URI (http://platform.incode.org)
+>>
+/Subtype /Link
+/Rect [244.6054059606481 696.74 325.8679657841435 711.0200000000001]
+/Type /Annot
+>>
+endobj
+103 0 obj
+<< /Border [0 0 0]
+/A << /Type /Action
+/S /URI
+/URI (../../migration-notes/migration-notes.pdf#_migration-notes_1.8.0-to-1.9.0_upgrading-to-java8)
+>>
+/Subtype /Link
+/Rect [252.33166666666668 653.18 349.3199615885417 667.46]
+/Type /Annot
+>>
+endobj
+104 0 obj
+<< /Border [0 0 0]
+/A << /Type /Action
+/S /URI
+/URI (../ugbtb/ugbtb.pdf#_ugbtb_i18n)
+>>
+/Subtype /Link
+/Rect [85.62 605.62 175.668 619.9000000000001]
+/Type /Annot
+>>
+endobj
+105 0 obj
+[98 0 R /XYZ 0 592.8700000000001 null]
+endobj
+106 0 obj
+<< /Type /XObject
+/Subtype /Image
+/Height 793
+/Width 1266
+/BitsPerComponent 8
+/ColorSpace /DeviceRGB
+/SMask 107 0 R
+/Length 78104
+/Filter [/FlateDecode]
+/DecodeParms [<< /Predictor 15
+/Colors 3
+/BitsPerComponent 8
+/Columns 1266
+>>]
+>>
+stream
+x��yPT����{��x��}���N�:�8Dc�'��(�ǃJ�(�Ĩā�D ���1 �A�٨�N�� QT�6� �B�:��~{� v���t7��֧���k�=�6�k�Ճ���r `� ��� ��X�봙��!�� ��Z�8- �ځ��@k V
��G>G��� ���af��� �=�9���n�s��� g.v��A�}׀� �]�9k�����g'����;w�xn�>��gh�;� `��ϙ� �R^^�e��y_.
=TUU��ɓ��l�[�i7w���f:.���vۯ} ��Θ�d︐�����w4�v� � X5z�6��ڭ������ A]]��h���������Φ���A*@����_�~-��Eگ� � 0@k V�!Z�� =o�I�E����1�'f~�|��Ì�3���n߾��{o��{��}��%#3��Çv V�SZ;Ho̼'_���\N {�'�Z �Uc��+ݾ---����䵽��@&�
���yd���eee�{������D���]�� |�������?���օ�� X5�h-�vX�!4�PMM͞ ���������G� ��R1*<��/ H(�ϟ�`��ۏ��.�K���� � C��rZ�UTT�T*��͵sp|��ɵk�f]^^^YY�֪����wZ/h- ���%��/�y��mss��/_c�d]L쉗/_���?x��ѣG��n++/ ���s@�!�$ƒ���n?�S8���zAk V� ����k7w��9�f����q���
于��s\���Y`�p�|g�Ek�/�B ��` ��v }��w�̣�V2W� ,� ��#,~�&�ڴ�� ����cUZ�)� ����c=Zk]_�%�m��K�e � �
j!�z � Z�{��_nO��+-���\kݣ�� �v��y3���Z�
j!�z � Z ��C�ݒֶ<�Z��"K b���A- � ����Z�.�ˁk�k,mO�����j'o� ��M���7��<��:!V j!�N,�
��� ��h���gK�e<����7!V j!�N�a �Sz��+�BW-bH���<|�� 0�1Zk7&�/ݗq�� �}��iE���߮�����?}�[[[k �B�$7
+�Sk�6�ِ<S�F���
Iu�� ��h�]y���\�2s����֯�۱�:?��$���զǙWS"6oX�ЀY�ޭPk��a�Y�t��r�#�p�bٚc����i�+
+ `f���MgdK�e����CC�~�
��#+�n*<O4>sܻ�����&T�5�밥�ӥ-��Ur�j�����>����� f�8�u
��8r]����ƍ9��֮q�%���B��]i�B�֞�-�y��:�.�t $ϐ��D�uԶ�cd�! {��]�ve��ҁ j3�r��%��|N�Pk��h+��\ �5��Z�����2=CB+���e������J˻�٬� ]i��rS/�Kձ6�Ck+�G�� �l��Bk�oo�zK ��BmF��v}B�ˑ{��0���{�m|��/* �91Bk�"��w�R�{|�q�F7�����Ƕ_ͻM/� k,<1.4��H��]=T"��I q-h��B��� ʽ���j�Z� ~s�r��5�`W�);l�/��9� � �S���
+�C��]{��^��,
+���je�����^?-���DŽ�G� ~H�� *�t\|�YpGd?�A��7��$빵ׅ��0������5Ei��THY��.#y�
�9�~W���"#p1[��u�w���5�g�F�UY��$�����g�.9r�
+�
e�W\=��C�GM8� ��W� �'�1q���Z�_W �a�ֺG=q9p�y��y��������o��?��� x�$�G�'7�S�~�Q���j,�H��Ѻ�ZNc%jٕ߳���D�8�)�X�٬$r�������˗U��j�ϯP���V�<���f���j9�~����s/W�* ��� �V�^�v��V�+�_Z �`��.�q��[{��aK���ڒ����z`��̘��b kk�֊l8C��sr����
ӥ��.��q&ߩ�)�R�zu���u]U#�ڴu�B-��+T_'����k-���"�v%���D�k�);lŷ�� +�w� ��`�֮�{�t_���Z.YW2=\�_M W
+mS�����?o��X�;=W��n)--ձv����5��3�"�u��dIEE�ڬR����9�,V_S�֒�~�Uk�Q��Z��{=�#�:T�;��=���v�R+���oZ�δ��U�Vh����%�[�� �����7��<0�ynܸ�xl���Os�Hkk ����ԑ݉G�<����[ݫ�U���~�b�Ô��r� ~O�C�z �o�N� �(d;t+� �^o��l�,�R?��ڴ�C������A�=�2� �"jK���U��#�lݱ&��37������h� `��Z���qE�����ظf���$�27�B,������ � ��ܹ��o7�^U����
�wf(�ܧX>����d�!��Y��%�zzk����\O�١�韘�ƴ
ne-�w�8��.dg��ד��{�?�P+���>�~#�\v��SN �;�I��x ��v�Ệw�}������鵱�����<]�%
8ut�J�S'L��l���.� ����G-��������.Yqߔ �
9%L������ }M7Z�1�~龌ϻՕ��F�`�sg��Ls�rv�x`��O��L��n3�k���iSO�0~��Og/.))1�A!VjKԢ�]�g�tU���W ��lw&<���S�_` ����]�`Gt�!����;���Ў[�:n�j�/WF̚)�<�ݴ
vv�i�}:�ǯ�XC����Xm�EQ��7����n� } �oB���*u
Ϸ� �k�i�3���2.�Uto*��R����i�M��r�-X ?o���� bql�ɕ;~ ;k�����Z�k�(jWԺ��mCb��(�Pz���61�x���_` ��F�ֺ��{ �ni B`�]u�Jݒ��S���sz�W���:�Gl��/0 @_�Sk����s�,m@� �+�[z�*�Li0���i� ����Z��'�E�.Ժ� < �ޣ]k���-�q���� �P�6F-��� �_�Ek�4\��]\{^�`i�Al�uQ��� ���.ݗ��|O�"} jc�Һ�= 0
+��ZZpAAA�'��"� � � �8�ZAAA� Z� � � ���@k͚/^ܺu+%%% AAAd ����$>��,h�YCN������މ � � 2�"�ɲ���l��Y�Z�&%%N� � � � �T*%�1�gAk͚��xK�1AAA��
��9= Zk�@kAA���@kAA���� <x044�+BkAA鏑�1�p�����jo6�ݛGl{_��ɓ'i��Ћ��Z�}J^��i]�� �m�ZK
%99yǎ �&��5�� � � �(S^^NBB�s�7U]cc`�~���Ӓtm۶ʹ{CN+�Hzo�.\psss�-��8/�Y�ܺ����l�k-�n���%���nހAAA(QQQd����w�};�mV[[۳�<�X�gZ{��I�I�����Z��*;?M��ޛ-�+'����Bz��e�҃��N[ͦf�GkI\�6jm]���`nn��fS 7�ঁm����)4?��4�vM]n��ߗ� z��Ec�PLvek�
++C,�����T��b]�� �Wh�q��C� #��Mқ"_�M�a�[
+φi9S��J�H�]�Q}^��wLj � �Xc�iY����\R^^NfAjڃѠ�S�F� C��Lk{,k�im�:-�^�-���Ir��)����L�V�-c�V��RâݦF�\���-}Dt�?�����]R5�<+�
�)%�먾�hg`e�A����H��r!4��"�`�c�ֶ� �v-ے.�)�zR)�k����S�-.c�H��t�T楆2�ʯ���P|<�Q`h-� � � ,��i���֒�&%%[�H$�Ά^R�z{k��\zc�܉���lozk5����f�Kk�aQ%�~�.ZK �[���z�Vk �{*�R�c�$�7<W��-7E�1y FV�8U���G1Fk����
+W�`Åq�ړ ��)�O!~�D*Q��.;\�]Vv��=�� � �Յ�A׀ᨨ(��?d���L2�=[K/�b1��
+�Z�J��5��r��r�� {�L�5Jku9-��V��n߾=$$D��;v����J�{�~��I.�<����¸�f��,�-��,��)Jʗtjh�M�wL��#���}ul�U�x���R�&E��<+$3�I��/�T�Hk��P�²T��ϻ. �e�f� ���CF}�o�9��bke�b�sP�D�Cf�| �r�H_A�� �L�QF�jà�����_�8_��]���+ =[���lTvwǠ����A?�-����ܚ�+�~�5� � bu!wؽ{w'+���В��t~���( �T�j�fB���Qr�R��̭�572'�݆�^g�� ߇�o��ե��=�]zk;=�: Ok��x���J��t���e�����_z�3�j�qַ� �T3%�W�� ��Ҫ^i��I � ��- <F��wy���WҼ+y���{k�U�VK^�?�h�T�C��]���eTa��_^�.�P ���qk�֫ �E�!��<qn��úl�?m�UQ9[���l�Lj�!43`:&� G-͍�m�ՠ�<��j�Yy�����7�
���AMoT��[ �B��
+�AA� ��%V^^^� �њ5k��� �3���d��sN��1I+ �l��57r��Z:"���7Jź=|3h�M�`�T�Cy�1��j�r��U�٥��L^���w���O��������LӤurka\�J!c䲫�T�*̄?��#/��?z!��' �L��++��&}�7�b�� [U�x��2�s���C�0h�����ҩi��Ǚ�J1����+;�Se�庞*��"� ��3���%w�:H������c;�Gj����0ͅ�+��)��Cm����� deh����k� �ZC�1|���R��R�Q���C��� �����s���e�&k�Z��*�����p�����.N�ڴV�-�(߲n(a���%!c�Ff�Am
+d����S�0Ο��2EaU�������V}(0N-�T�62\1mj�{g�ֲ^�
+��Sy��CkAAޥ�;h~�g�z��� ����^Yz��~#�������ٌf�GSFq��)�5}����2��SU�J-;n�t�j,g?�=���j��UOo����ڄ*�<��� b�f \X�R7UF���C�B��)ʨl/�Zg%;"�PÊ � �a�.��J!W�F '�a^q�P�X-�ժu(u=T��2�^j��Xi� ��Z� � �.� ������-::Z,'''�[g�kli���� sSL)�1��k���r1���� ~֬Y�� ~�_i[ZZjT�}��2��v�?#T�ݾ};0� ~Z��&� |}�9�, ��lm�`����������Z�s�b�|6$��C>`����KɟO徊���d� ����侳G�Ff�����/
r.��ڊD�������:��e&`�U|�+3W�� ?L��q���d�jߙ��kL^]�utjmq�o�ٲ��j��LxL���Y����]��ZAA�w,�ܔ�dd����QQQ����XJ�9C�z粕Ǫ����Ͷ�N�E鮡����ȹ���[��x����
���M��9N���B��Aw�Q� ���e7 1o40o���=�3��q� z��f���Z�k�y���D˓\�7ݹe�.�B�rySF)g���dW*�Q5�ph�D5�������*�������y �ꤒT���/(�RY�ڇu���r�U�cJ�.�OIka*�3��]+�U(_G�γ�Gk�o�a
+�����yQ�-��"� � z���Y�� sV�Ć�D�K�� �� �l�ݞ���i�dee)O7?��N�l��d͖�퐐�d6�@vZ��iE���Z*]�A�e*�B+8bAA���3[�Ÿ���J�}o�n@��X�Q]�Q� �Glz�\h��9�&-�����=�^�4d�R�~��T�P~I������(�u�e�9 ���|+�� AAA�J�N˕���F ���zk���ݻW��8U�Z� �� }� z��L��� � bx���Z�7��"� � 2�� ȁ�"� � 2�� ȁ�"� � 2�� �IIIioo�tCAA�H�R sz�֬�u�֕+W^�ze閆 � � b��d��l��Y�Zs��6%%% AAAd ���ŋ�,h-� � � ҏ�EAAA�q��� � � H?�AAA�Ǒkm��t ��!��џ-���Z�� 3�d|�� �h- �~ � @?Z � � Џ�� ��@k �ct�kLL�)��Ә
�}��e����=e��Z�m�� ���rZ.��ڦ����??,˂� Џ ��e�}��'��|bf�
OiS � � �;�V��C�}��u�ͤ #>���v8}���A�^�Ak �B��z�WZ��훇Orc��|�='�g~��TL� � �+�ڦ����l �l�g$��,m�Z @+֢��ڢ��
+�m�%ML�
�������]�=�R��gӋ�o�j�ڏ�/���%z�����j���-��v� �2���� c�
+�moo;�-
+��
N��l�7qz`�m@���i;���++���=g��Z��?%���;FM�B�)�b���3��Ig/Ɵ��&����%n�?�$�?�=D5��G8j�<��� ` ay�}�������Ɏ���9=��v_�� ��c�y ��c��� ���ͫ�z�Z�;D�߿7o�ttt477+�xm�1t�L]�`�w;��W�^)˷���}�V����{����ozy�m绔�WR�%�e���c� 9 $,��u
ώ�^u �^x�>��̐T�Z��Q6;�?��2>��J�-�1��}[��Z;�S�������_8d�?�����m�rɿ��_�Ot�u
+8��t����_�&/� C�O�����5/��'v���i�^:k�Nŷ��lزc�͗�� ���3�k���Z+m�?��I�fP<�@����3��
+�v�ob��Q�>C�� +�1�d�К�����Z�� ����v̧��,��`����/]�e������^���ˈq��c�FD�z��0��S��/���
���+7���D����v�=IaNNΜ/��|�2>)e��|~�Is�O��+za�p��7��x~b�O��}�2�a����F�{|o�x��M�$�v���AJ�I�:k�=-�� �?����Φ{��>�����첏���W��\��,�o� p
+��)--/�Nv0z� ���rMMjygi��2zڛ���ֶ��%f��� ��za�/����]�LO� �x�*���^�sX��J�}���?�z�����dߡ��%�յ�ē��}�J{ԥ���ۖ������ѓ�c������ʪ?���VU��sg��V=�v�UGǑ#G���v�ڿ�>}��\�����t���Դ-?
+h��:�Y��\��ho ;�x�<}D�+� �:E�k�v .� �>�̼h���Z,�L�)!+͊^��
T;w�:; O����|@γ�h' �� )e����v��Ak�W6��rת�� *S
���?��4tv����:��� ��{t��Y�/ڊ��Q%����_���G��� ˸ \SyN�)ΞCBQSU���!�
���v������TڱfI�j�� Uu��t�D5k07h���fb,��o�}x���ya�s_�} �>��p�M�����G�������wx��IkKw -�����VY��Z���£� mmm�����oؼ��{� �[Qd�;fjb=Z;q���ҧuuus,�p�|���J� >���H�Q���II�ܥ:g�J>{�N��
+��gyx�uttlں���>�0{ٹK�jjj� ���� �B�
R鍛9cl�3���l�IɆ��N˜3�\��������W��?}���\EU����?D�����uU5mUY��X�b< �Fk�
+���6@���76Z�(�4Fk-I����gU��:��+���i 2�]Ӫ�5m�b��d�_l�1�u`�!�j3��ںN��JwM�����|XLkK* �_\q��ܰ�9����>��|��(�� 4�������j���~ �ԇ��G��^8�ivb���;: ��՞;�_�JNN 2t�_?�1�a�ݗ�Y�������_=ZK�I J��e+�FN���v�w��E�����q3�OtpY����>.>qĤٚ��^��ieUAA��G� 5� �y_K >��#�M�
+pZKgc�>�� A~h3�o���ֶ ~�=�SG�Z����l��i�`�����KW�+**�;��Ö��� �g��_=�K�䟪]Z�9��m����4qi{,�`>U��Mv?��CY�ą�
ٻ�0�(/*YaNQ �����h��ܮ��{��+/x��:F�� N�2n�%.� iQ���w����ϸ��� 4�! ���v�gg
+ۘ��{�{�tҔF�^e��J� ��x�O?8�T~3��6$�nf��hɳ�sUt������?f�1�������t�����'(]E�[[ys_���ݓ���M�D�=|��鬿����X���q�����K��6�`��xr +jS��[�V�_~���u9Һt�4o�L��~̝�Xm�(�\~Yx�����h*����
+��3_%�]� ]�.�����פ�mJ��%���~X 5�����m�l��1�V�֪�iwM�kW��N~�����~�+Ֆ��+�\Ɯ �֗�n���&��kkԠ��o��k洖jh(�Wö��� n j2�cQ����u�b�}!�
��zmnX�}�va�?���Q�`�,pd�`�t�/�|P����r��^�������b�96j�����m2��Z{29���e��ZQe��y��sӇ����ڻ
+�����ej>�����?�&��i��ҴK�d2ِc5��������������C�aQ �_�^���u�rZK���}�S>�֚�rC� �w��?z
+�����=QY�jO �y�W��5���ԑ���\3 �k��s�4��i��� �� /�Ϣ~�U�uY�������*W���b���oW�]0u9"�o��� ���GV{P��족6�Z�^x�]��0O�ż��g��3����"�� 0�ֺ{� ��F�����'�|L�^E�ƆQ�M���^vu~o�J�2J�ر�t7Bw l�r��i-� ���cUVM��3��X� S�T��w,>�S)����i�fnc�7��K�f�$�NE]�/��J��ɔ;�E��OVz/Ï�c��i�tJ��\����hN3?�Ѯ>��thmgM���N�����K&�ɿi���Ӌ�8۩�ćE�xj;]jc�H&5���&� �c��N�?�hk��Y��n�L��t�3��=B~/ �>���!��MM�h��lE���2�m�v�և.��|��3w�όV�Z��u�b�}�*;��="{��������mj��|4�mߨ?��l
+`��j��Gۇ�l��y��1K> ���ɘ�qcS�L,�+0Jko�Ϋ���=o��O �ef,rm�6��� o�Gk��X��ŋ_,Z6�ɍv>22r��w��[�kt"- ;nR�u��;%��@ � ��@�o���$�gf�z��_9��J8�������\�拯K�>��|6|�n�ޠ`��/qkmm۶m��L�Jkc�?�yɗ����Z�$�r�� �� L��l*�� �*�G���7zk�N2ϝ��b�\�Eܔ �!C��OV�~S0c��w�gֳffu���N��i���Z�J��0+��մ� ������`��P��H-�*�f �� x7 �;
+f�ov 3h���#�2���k��@:�WrCm�[E�'� n*�~F1��D.oj7r Fk۫�*٣����\��۰ˍ�h�O�黅��m����u�|�&��G�;���TGҦ��γ�؟/�2T�T�u ���պ�윢g�\�me��Fa�zk�k�>��S�j��Εȟ��o]^��]��+�ݩ��Q+�"����Au�)v������&��6��vt�_�Ć_�"�C�[I�'�� ��?�=hT���]#
+v|xm��s� '��G�� �&�O��I��)��'N w��I�!A�/_��9w �����r�(�/�eHk_44�u�4=Z������������8:���?y|�d�xc�ڰ�Z>��]�upZ[]SWVVvC=��
�e���p�|Nk333��� +W䴶��r�� ���_����� X��z{{�`�� �V��Z� d ��&�� �%���Om+��ۓ��N��WC-Wt��vDg�+���Ԝվ���UZ���ſ� <#R�� �]f���! ���
B�cR��1#�^� �1Z�>�����O/o*�ɢ�a;�
�Z��ۊ"��|h��Ҽq2��+�S�~?�=���2Q-�4��r}�YY�mZ&�2�!0?b�Q5<~s5��g�+ϕ �u�;-��^�4\k�;ܵ��Ǫ��֚� �]k ����Hxj����/�?~- �<���� Gg��$eɄ$�O��NL�:�����)�'O8;y�Jk�N.�E���j�֞g�����+���ڧ�v���wۧ�{�v�m��^��R-hW��X�Ut��Jն�����
�Oa�R��V֭��b)T*
+JE!j�)P*X@(�HH!r �;sI2I&$@`���ߣ!����$s�?�� )�+��?���~�u!=��۶m{�u� �v����ݩ��S yj�z{{�N�|�y����
<��9r�� ��ɺ ��/��O��3� ����s�S�T?��Oz����555S�=�_�5��n�|���Nk���?����n�;�s�ʕ�s��H^{s�0�3eπ���̸�l3��D� �woy�������b3 ��sB�sSS�/>T�f���rh�5�����(tgRݧ}S��M�B�n�]�B���k� �x�A����D]}�m���i,a����_�kIS�� c�GШH(�v�&���z��H� ��q���tdg�Gf'u4T���Ŧ�jq s�Q��~��-.��nm�l8SKo��@��ًB6y!/���#1�:}0��M�9��,�һ̾� ���w q��x�(.�G
5�Zx�2��q���daj��L��p� 6�ς~���o(������z��!����S�]�%I�Y�x�Ԋ��|�}�l�
��OU����g���L�?��ǜK�<.���0�#����'�l3=�pc�y �������X�=bOOOO\�3糽��.\�E�ם�� ��$��c�of̞��r�� ^v[����U�H���g�q�Yo�b������߯xE�\KVo�k��C� �5� �,|�F�PYY9��gL��( �����������)���h���w��Gv���_Owc��-�|y� V��a剌����O�<ͻ�#��Q~������
+���v+!5���*j�:'��sB!h�-�U��Z:�F�eֲ���4�k���^�ޭ,9n�� �BhG��Z��t����v�f��x����1�f��N��Q̵�jfN&ey:;��X.n���� ��.h�S��J��M�عy���{7P�?D�w���i���2����p���;9VA�f9
'� v�-�~�(��h�O�\?C��hI��Б �^��*���*T��Z�.�q'����c�y�ͱ��[���>u��e�SF��bW�\����JfSu�E��m*�7�D_l�z�*j���2���.��.�]�U�5'��墳��;go����l�r�����<$�^���x{�y{���t}���Jbm����C� y�o��KJ��ϒ6l� ~$�dW�611�!k�Һ���?��Tօ|�7Izܸ1����33<�����&���7�ã�o����-��\.��K�==�[�-o�Gb��#G ��n^��"�V��nfbm__��ꚝ��]�Ǝ�胵u������ʹ���=kI >q�
��w��|�����s߾�;�g�+h��4�v�� B!�X���3~u(? �V�R~�� [�pB4�"���5Y�?w�`#5�iv�ో<�5M�_� �XK����O�|���2�� ݲ���y�yν��~��87��1��ǜ,�3�3�e�uK��6gV�Y�g�~�� k��{��m�c-�{ٟ�$&k4�TU�����<6�)��T&�r�U!������ѣ>��~��L���,��vu��[�-*������ꀀ�_?����h]�_��]!��i�㜩��ww��9s��$֒� ��n���Տd��Ν{����>��B�n-)�Ht���� o���wtt�ٳ総���I!h��,�BB!��a*]ơ��M'ku����$}���2d'B�I��LDhkG k/��>:pt��OW�qh�����
��y͎�����[��ߴ}نw^Z�kɪ�W��h�n ���/F�_�1�_��?r� 5{n��u�`3!�~|h��Ou�N��s�|aE�e�/��W���/�=1g1�г WL���G����~�
������ z�Q�ܼ�����>/�!p����O���=}�S�,3g���L{|�ÿ�4Y�S��' <6s.��MMM�3�a��~���xx������.dcb����?1������=<�~�[dZ!�B!d �)�zzz�-��*����O�{���ywx��'7��~�s�y�7Ϻo;=7�Ԝ7N��vl֦/g��ŜW���yl����|�8r85�X;�O�[:�}ɓ^K����$뒼:�c�y� �� dkI�&����nS kg��H=�� w�+!�B!�c=r��۷�;��d��/}�ZtƼ�=��5��K���{�⼷D^a�=C�<�<��������ܐ�$��y=e�k_�ޒ� q��V1�X;�4���rc�ॅB!��q�X�Zzzz*�k�$��qG����<C�x��� =��f��� ���[��q|���H�u#e��� �:&F�u[�t����K�v��_n(Z���7}�b�K !�B!��P�c-C__�B�ʖ| ��Š�Tϭ�f��:w��tW���[S��Z��G}�: �U�3�LȎ�,��]�
��,xg�dz�)�E+ �}����
+!�B!���qk�㓻�Z�B-��� sjޖ�炿p{-� �LuՒX�v��rYYr��Z!�B!�#q �Z��ۆ�������?����ۦ/fmJ� 9��Em�[d�Z!�B!�.�6�2ܾ}�fk[~qELR�_���幫�����B!�B�u�e 9���G��))�jQ�d�D��B!�B�2f�B!�B!
k!�B!�:���B!�B X�����"b-�B!��1���Zf'}�|� �B!�:�#���L�M����B!�B'qD��$�ꓭ�{!�B!��I ~� �O� v� ��X ��A� �� � p`k 80�� �Z b- � ��X ��A� �� � p`k 80�� �Z b- � ��X ��A� �� � p`k 80�� �Z b- � ��X ��A� �� � p`k 80��`����
���R��A!tD�9���Q/@!d��^@��o�u�&�/B谒s89��+٢^�BG��z�L����m|%!��.9���99��^�B���^�XKJ���ZYY��� ���]�p� ֯_�gϞ��
+�Z=�j 8'�o���M�O �B;��F�� ���P/�]�mnn>p� ɱ��{� fL�<���s߾}r�|�U�QT75;nja��E�y�ɒ��i��/�ݨ��� #� C��х��A�
���^9^�v�� ]��Cv�Җ�d�X+�k
!��u�� �W
+*�1��W�^���2e
+b��n77�+V̝;W t�
r~~� �bS%���ũ�eU�Q �X;A�B�(.M�A�P�:t��u� %�Z!4w�� �W
+�qk����O�NR�w��������������� .�j��СC�?���I��bd�bm�� E�|��������
��q�/BGQ�f���r�k!��\�O�BU
+��k���G }���)S�lܸ���é���Cs�̙1cs��y���-[��w�}d�iӦ]�|�w�l��)L ��j�J.H�I�2���I����4_ ����
���(!�B�������T��Z�R���Ō.NHH +�ٳ� ���&��ݻ����'�Q__�������N�8�$�g�}V&��o�r�ei�f�1ɶ�ΖB��q�/BGQ����r�k!��\�O�BU
+*acm��#G�L�r�w�^���I�$�6 �$��?_z���br���k۶m�&M�<y��ݻ��F�k
e��h��V�9dk�!h�@ E��k�QB��Bs?� U)����7o�\�h� w���#� >|8""��իV+�����ǏϘ1��8{�l�m��}5��ն3%eF��ۧi�mǻ���M�s��*�^E��]�e���|��1+ k{բ���a�y���-qcmgcfa
+Ӎ<��&�տ�ś)J)�+R���� Q���`�B-|���*���7c�י�JуX !����
���(!�B�������T�����Jf8qLLLff�������/R�\�r% `���J��СCd�{���dI�b��@Ci��2��a��p�Eô�~�)���
+9��(*d��%���D%JէA� ���vI�b� 1��#������"&�A����<��;kb���l����F�fӎ0���SEf wɌ"�]�K��M�3�b� b-����7 ז��X !��
+~�RP k?��c�|�y��Ricc#w������>�Z����dɒ_������C��ɓ'��?�����k�L&ԏC.+����2
��٪�u�W�v���*6I��{z4e�2B$��&�{>�5��u�t��z�R�� l��#�wU��˷WQu����Ju}�}
+&�N��t��Q�&��9!�s�l�]�]/N�)Jͼ���թ[�����m�%�v4��@�����r�.��A[�ps+���k�Re���78i� �B�������T���
60�y �����BCC���H�����D$����� ��Y��dE[c�����x֧mm7-vYQ<��v����(��x�2oDE��ܸ���JZ]��Tf:����SE���?��O��59��*" ]¼B}��eG����
�I�^t?����:�^?�-�:�Ni���⡜S�Ѿ> f�o�'4�jH���]��\��]��[�&i�牏�K�D��/��D �z���d�[4=��x��ͫڞ �=��[S�os�} f cmMⶀ
�5�;�~�$�<Z��G)�7*W>����<#|�:wR)xx�{;&�f(e��$�;4Q*�G B8l-�W_��jzok��4��
+}� y��6�.\����+V��呌����?66��{���O~B2�[o�����<����$ᬬ��� �����M6kk�U��Z^�N]��ג� W�?dy�(��R�2���IiT��6���8坆�<-۰#�Xkzu1�<��qw� {� )֒�����X[wv����'wpZ0��� ��b�WocR~�Y�l6�� ��+���Z��8f���<��.�V�2��Q��N������ ��p�\z��jG �^�vg]��l*]�W�?��D��OZ9�Z0ck�]����k%qA�W��,�����L�ם�I�>�N�Y���_����YI=�gUV��c%�|�Y��j+�8��W�閪�����jr�G3����j;�
K*�5t�A�&����Aj��n��e<T
+*ac� H.
�DO<�w81��$��@{�]wmٲE�5l���>�>}��ӧYCV���2����M�v�ӌ�zEW����F��5̊�+4f�6��j�cn!֮/S�,��͘z�O7�c��O�����+� i-֖ ��S�s�,&�V/?��e۱��<�Yi���v ��Bh-eK�'8n��T����HR�F�K��D�M!��^��dt��wY�_�;�[����H�Xk����W���~ɝ>A��r�L+������'-�ɻ�3��'��Z�����CmR�Xk8���U�Z~ �,�ɢ��"##���F:���Z���*�sI��� ˉ"ӭu5��&R�[U ��M��Z��t� <I*��� 4��P� k7�ȥ���QN����������,4&���\ G��Bk܈Q���|�$r���6Z�&Fn�Ə-ٲ�l���+>[�#G�[B�2Pm���r������/n�9I?���OV�wJ���l�g�r�q��z�'�����K�^K3B���ra�d�� B8J�"�oK��m�T�lI�l1i���
�;��i��4���{���,�7J[�5t���'?_JoG[�죖�h���ݥG�i{e ��X�q�j���A7e�Z���V�yu������c��3RČ�?�����N���i%T�A����IJ�j���O�V�!���V��˺$ }��e�O�GE��$�E�����Գ�mH(�w��52�;�ZQ��̝��P[��\��P5X���e�a��<���Z�D�d�鹐����� ��>YC�݇4۸�B��={��\z����Tx"���
��y��{Y@*�����dE��{�g���τܣ�/Jv�DV�&[��*��b ���X^X� �k�XK��1�ڴ#���� �FU�����u[�_���ԗ�[b�^ܦ���bJ�U�Q��_`Sˇ&��� u�U}Tn u��m[>���zn�w����e m� ��Q����-�7�% [�F��.:�n��\W .�6˨�ev|]]n� �n3��/9�p4��"�6h�������6�ۯ6���JN������ Y����
h�����^
�Fq˸%S�-%�v��5�4Ks�jykeoO�翛���Ħ����S(n���@ǭ�Cl���� �gf���Zi[99��.Qџ?K�nqݙ���;���U�{kۘ�}�2�������~�e-?���[B�2P%$i�1t��� ߝ��,R��'pRkl>z�.-Y 쬜km��xK!Z˱V�[�t���[kV�ܮ��� ^���*o��V�N�DT'�삦;�l��T
+*acmEE�=��C��C�Ο?��,[�l�UV�^����,11�ȑ#d�ɓ'K$�e���������c�J�Z4�� ���5�GSV�J�Z ����>�V[��0 x(��m�[b�YW6�^8C���UL��~Q���Qwv� �d�,9��u?լ�kuC�w�0)4+��p%yh-�b��2p�b綇��g��7 /��,��S�k��l*:�d;J!
k���[�mV�����viG�Fۧ �1L�MWh���b���t��Z��C=$Utjt�e!'*��{4�}���Cb�z8Sn�1��/�6֒�'�Z�\��;Ǭ b�ߤ�� ��
kU-�����~W�_��c-��}N-�/��xcz㜪Ćڊ��B�� k��s>9��7H�p[CW�Ac-o
B-�ߩ!� kI���GW(�mO�%*�����͛�-"��G 9|���{�ڵ�W����#"" <���� `��M�4�%�60s'�f���w�XK���χ���Ly�SDT�Ո�l�2�� 4�v����ZUm�-��$��ar1�'��� �֨uB��
-����I3��
���2 )֒�����w���n��Pr�hh�E�s���|w����� ��d�jo��2���]R�;�ܣ�2�����(!XY+���Ѓ�����Z�8��{��Jjr��OY{c���3�X�4bi���X�F��WS� ;j��%ٳ�`����o���N�2�kM�j+�� �فZ�����A��[۫mV���|�R7~giJ�P!ۥRP k���I����{'M���+��5m��:::����뮻�����3����U���*�_a�~�0��=fk�^K�1��R� k>��,y�ͱ�����?6��ౖ�)��
bJ�;z�k��B\|\��[k�:��D��>�wuz�(����Co��w�d#<��6� B8�(�R�Di�Z��6h:�<��@Mk٧TwI��F���Z�R(�z�X[)���2W�^US��K��b.����a���-GI�X��^��0��Z�s���o+g�>A�W̿�Co�iUbCm�_r��Z:��Zݭ�pm�V�f>E�.�6�� J5= �V{<���ZR��;U�JA%l�%(
+77�;�cʔ)'N�����`)�<{��O�S�ʌ3̗� k{�Z�� f2�����Gz��0�1�����S�\�:���֊���I1U��� �}ZE�):�d�=��M���t�k" SHNg�~h��H�;�=���$z��hw�Z���u���X�l�Yb-3`���ڵ�� WU��u�sf�N��u�k����%����j�Q� �Dž���[���Z��ͫlt���!���0��&�Fr�Bwq�?3[���J!
Gk'�� %�b����ֆ��UM�uf4�*���װ"uq
?�S���'����Z���y�y�j+ޒC�V��P��J�XK��o }�Q&�������KVVV���k��w Yxڴi�/_�]�M���˙��� �&�*k4
�}�/�2�����O~K�.Nl������M�� rMaZ�!���X6���3�3a{�q0�p��%m�����.L� �y����s5�
+�)ֲ-�L����Y���%Ik�P�E 2� ��K��c�[�}�]|�#���<Y�F7�%y�-! ��-���X����FSVr=uWo^Mm�}��1�l��d�FW�<�Z�)9�p4��3��՚,>�%2�� c߂0ֲ�fB��Y������߇�y��ٗ�&#tl8��+ag�'O�=�X��Rl��wD��2�o��µ^[� B(������T�!�rss �qV'M�4cƌ��Xfnd=���G� y�g��.��C=t��9K[��Zs㗋Sc˪���٘&a'7v%�*�RP��tJ������� �O��Ug2e#�� j㽊�3!"�6E��^��Id�4T����8=S�R�Wd��M;b5�:�xJu�$a�� ���X��#o@�-Gi c���O�B T�O�BU
+�qk %%%�>���ɓ�!7��݃��֬Y���������&���ŋ#�Ȁ3����Z I��k�QB� ���NL?� U)��O�%477 8p`���˅]OO�}���O} �U���!t$o@�-G �B��.T��W�v��������>�`�ڵ������Z�z�{�'�Hd2�ȫ1���!to@�-G �B��.T��o��Q����4������8���WN��r�k!��� V��^)�k���� ��Q]W�;Q'xcB�%Պ���4+���Bh��Al�T���I@�B'���B�"�� �!�H"�B!�X �4_ �p"�X !��+b-p
+�|�$b-�B����)@�B'���B�"�� �!�H"�B!�X ���"t) �[�/VA� �Z�,�� �Z \k���� Lk pA���/ 0a@� ��8 h� ��� �Z�,�� �Z \k���� Lk pA���/ 0a@� ��8 h� ���֎� 8N�29�n�=>��8b-plo��1��k���� �3��v�!p���Ivs�8��A����͗��Ϸ�&����4��e�S� $[�$[ �-��v�!p���Ivs�8��A�� b�8�2�)x_�Z D.��D�c������~�Re���w��u�k��C�$/����q���0��o�5�����X;��}
+ޗ� �����CVVVCC��˗U*g�����oƀ�7G|u�}xeC��#8���ZY�y�������29�n�=>��q�cmwww��ӟ�H�Oҗ�"�h�i�V��v ��q�e�S� �� ��M:ȇ���wժU��������cm�%��U����U �l��vA(H�ޫ ejvܣ>�ڲwܗ�Ivs�8���� kI\<5A���U����v n���/b- r�����������¥K���� /^��ͥc�"'2����c��Ml�5�[e�[lvUDžQ�m�ΑSb-�}(�������-�
݅��+��
�֎� ��M�h�e�/����q��3;.d��}�p�q��t�R��p42b�8�2�)x_�Z ���}���4H���/H�ebm���]������-��Ư6�o:Y��v7eG���i3���a!=�Y[�� �KZ
q���_ɭ�M�X�H c��v�n��o�=�rIf��q��m��nV]x,"ȏ}Ƹ��FO�-ۻ!xw�
����`re�����(%Vz��6-
�Uf�(#��\�5i̋��̋__f� ?��J~��+'����� ˛�W�dy�.�Ϥ^��U��:�W�(++m�g���Hw���s1��I���C��ka�PJ$�1�2&o�Q���֗�x 1|Z���w�w!{kKЁ��v ��q�e�S� #��
9��9
�� k���[G2�?��Z:�^� �����#�Y�U���� ��K�Xr�B�ަQƬwY{��j,T��o�V�e�t�ӯU���L�Ԗ�_̤qS,��ړ�Ƒ��X۞ �8�L��LX`@���'�ڌyxb�8�]�%oSvܮ���<�5��N
1�85����s~� 1R
u�Os����| mٮ� ���7.1�Ͳ�x���V����g�!�Z<&\��6��-�Z�?���pBi��� k��B��-�qY��;�p�|<����lK��� ���,�cI��gZ�X,��/I�%�R]����I�e��H�B (?���V݂���� �(�i&��k�$Ѯ̵���v���B�y�;�2f ��� ��R ��$|�4���>Xߠ��F�`j
+�O��m�fN����CS�6���Mt1�F3��̔s�t@���yR���:�`�O� �>��ָ ��ځ����φ�S�� ��29i:wI�0n*m �S�$Inԟɱ��i�ԋ���qԊ�6�"�f}�2v]�:�C�)Hs| �'L 54�u��JR��7@mJ|*FL�ST5�&��"��L�+θ�;�����e����4�چk��[_R�5P+b� #5t{�]���0z�x���E���2��%���z���5��vs��0n�(5�^��C�ixs�����WS�N���W��(�D�����xL�w|x��#0O,�;o�b���ӟА���<j��R�&�O%�'���}Z
�_UX��U���ek�ch��48�ke2��]*��L����T|䭕�=�`��ʂVç�hЃ>�:�pk=֪dR�mʤւ��S� �bm�EӪ��Z�-K5=�N6��Ӵ�
+v�ؚm�aƈZ�Pj��$����`�bn ;&���/Y��� �% �RHD�����P%�XKm֬'�0�Ӣ��:9�/_����㐛�{��i�V[��9�BӮ,� ��ڽ���N6�is�
�.�7i����4z�.g�(5�[��2J������х����x��|H =��� xűZrK+��/�'�n&�� v=T6�퉥>�9ԧ�6a��_�I"|��R���Fr>�T�z�
���5ٸK��M����bj��V� �cz�>�f�����&��\Z��*j �k��bRr��Lq��
+��]Z}��*T����� dQFQ'gu6~\n%��D˳SDn?��1M=KJ&i)���̋[U*����:٦��j��i�����T=��v��B�Z��:���۳�3Ն�G� I��j����ԙ���$��CT@���G^�"��Ċ�cIuD�+����BNx����w�Om �?ůΫ�}��T6�-�b9�Z�T(��\�w���a
6QX��-�Gk�� &&&(��em� ����
+�@X�"q��!.��D�{z$���b�4��[]�h���Ow���<�Ϭ��Z2�ȸ2�]P�^�����e��6�}�
n�ʹ tm��k�]�ku ��:;[���^���s���Qi;��.L��>�=
� y k! #�:���_��QVJޒ4Np1��Ƽ?��Sepf| �u-OXK�rp�;�.(?�� ����D����w&B:�Ka�����߸q�K�w���V]s� �2��\w�������k�Lׯ�wi�[�ݯsѮ�������Z� ���� H�t��u� ֮t�1G���W]�,�����eđm�&��S^�L�8gT��6�q� � >XKO(�._ ������8 �Z__���O MNN�����lcL禥�R)��a�=��I)R����]�Lj�@JV�?��|���3f0΅,�(��Z��*9���l�km����Tr�Tzb-�SwS\���H,���Π�Z�AEqN�z9�j}���3�X�zk1���*�s슾W�oVϼT��n� �X�%p��������J��Z�
��\�@ߺ
��4���3�;�]�� ����f�?�%n�V��-������c7]���AZ���h��Q���3�e�J� ��~��m�l�Ï?:9�?b�M��sP�`+̴ �v�7|�JΕ�y��s���_e��i��^�O �ZH�H���
+ k�{� C����N����u����.���F�ڵ|�<Uթ�����P�j������m�"���F�a�̖���#I� �`j,I�j�@��� ��� ',�Ү�5�9����5��qG���b�v� f�; 9,��j�5�=K�6P��nI�$��~7�9�aic�>��$��%����t�!�T�AS\����R��d� g��U�� ��a���
O;��k�h�;x%e�ȵ(���>�`QDQ�Z4�ՕB�� ���Y<�Y���JO`"<c��k��ŵ�:�$�en=m�46?Q��`��*
umm!����.b���<�a*���n�� up*�����3��n&���3�rks��؞nG��]��-��V`�}4�o]�~�l�1{~"U歍k�E�T7��=�ç���*o�-��*Ǧ�mo�~�l���C|qn�c �c������??o���l�C9�k��<�_��nb�3��c̨[����W��x�S�w�߸Zw{kר��n�����a��[k=�J��s���V�n`���@T �
��0Ү�)�x�Z��чj
���ߥ�D�!`���,��x1md��~�L1�d� :�u��#e*n� �=���F�.� kWh�~�'��hWu��;�S�\� ���m�X�_�ha�m@Nq�3o�A�/킵x�$�)�&g� ����鰱i��B9��x�mCe�5Z��
}[!�Ҝ$�<�'��б�B� � d! O�}�� X�\Ii2%�Z[K��.´ij�rY�f�֤�����Tȵ�5��ft�aT����߄TV, -rZF1SZ�^���^[�gIԏY�^�$I�[�#!�� �?��¹���rz ��}�����7�ε�~����t�!$H2>�k���kk� kC��X]��:î�=�V��̝d���� ��lϪ���j9�ټ��fB
+�PC���t+� �niyVx�.�H�i�v��0�L�kp
O�!�_���.o�oz�;C�� �ۆ�t�!?�C�n ,�a�mm@���*�\���νZ9�?l�|�-�����$��� ���X&�=�p��w7� �|rO��k�V�B�P���}�Y���&0�X�������hԨZ�L����?�V7�0|��&P����x9"�=���j���wv�Z�"�D�����ɢt��i���mx�0w��e@�܅r�t�����ཱུ>BX�v9�����/�"��x��=��M�rΩ������,ˌ��wI�n�x�����U Xf���
�;$Y �4�n�룖"�"�ɆI�}�BK9���L� ����G&����P�ۻLS:���e��t;vڲ<��/�8��O�e��� Mφv���(�n��ڗ �KFM��g�Q��v��ow�7 �Y9�L9~>�z g4>D���3�
7;���A�[�Y-��`-,���%�C�x�S�3�pT�'>���Yo&�Ŋ%�a.�DdJ3��A�\S}!6
��Q�24��(� ��x��/�k�x/ޘ��]��9T�W�8X�I�Ѵ�3kFÊ�X+��Mkӷ��Շ� !D�5��=�7���%�m�`m�<��� a�� �����^�:�a�tH���ؚ���qmv��4�|5�dߚ{�y���v���Ěݶ<�F#�:���
Ka�O��M}Y�
���_��S������!��k��qĨ����M ��<l�;�U��F��g�o
� �%����rX�a�1X�xE5\���i���Y&p���6
we��p�%�s�0oX�A�� ya��������z)�W�HXˣ�!�t�H� [�m ��0��*0���0 nn-���(�2R4� ���>wZ���u�e��;k+�5�1��uam{=��:���c��y%�A/M�Zh�#B�[ J�C�Z(Ӧݾ�<�քl�`���o�8�Q�SwkM4�ѥ�����`m%G��X�Z>d�m ,�(
+X���p֝Nּ�7p�ڔ�����Ö�d�����^2�g>0OX�F�z�J[��z��Ļ� �]9z ��( �>�`-��F�D�M"13l��} k��ZD��[(Y��wT��e[�5ng)��- ��Q�nY0��Vm7�m�4��ֱep2*b����G �4c�`�Y% �Zj�:�چ8�Rk��FH }AX�CM*7/[��G�@�Z��}����>��tތv ֆW2`��Hs�F�`QD���,�y�f�JT�h:� I�T�إ�N.e��!��ȼ`��3{��V�'@�//�4��W�Xˣ�!�t�H� [�m ����g�Ȓ���#w
+��b[_wC�igM���
k99o�Z�s��p���L?V�,;&��m �s�Z�@������z�3o�����AR�?� kc�d�)�vGD���j߱�Є��"i� @����
+ � M$~r��iD�;��$�q��2�}�ւ�V���Q���H�I$f�-Ѷ`-_X��������2�3Pjպ�����6��}�X���`Q�r�laf*�?o-��85��� �MBv��
�U��E� k�(��_�7��6���=��8* ����^d��ɴ�˚
�/�cm-�jE���Z�$H� E7��A�Xˍ��/�]P��A)�ieV��͢��kk9X�X��դ��k����I�
+q�h;����������,��,�� 9���-j�7�� XFɀ��j����
+���j��j@����ֲL��^�ŴL��EB&�\?q��B�ZpՊ\�ܾ��/��.�Ѯhw���Dbf�m� �F(�c )bi��\��1X2�~�CDX��J���H�>�T��M)py&b-Y�{�y�^��6(�:Byo��@/ k�U+v��(��( K"�&���D�>��J���I���
+}
�-о+P_袪=����`Q\��\w�@XK�"'Gk�L;�i��W ���6T��4���K�c-�jA��<J�7�H�I$f�-Ѷ`-��J���� �V�`Q\y�b_�\9��my�0�?ֲq��2-9u� ��'Y>��OC�,-Hd�P�찍���V���Q��Q�D�M"13l��} k!�U�u8`-(v��
v�l֯�G��$ MK8�~Z^u��D���� ��g�5) Ӧ�W���,]�� h���d�Dj(/L>��}����S�E��,�J�{ �;���}6�3�j�-�Z %�eaI$�$3Öh��R\�]�SpւbU�Z�x5���Ѵi��݁����)�-'�"z�TMx�1�XKuʂ��/�Z1�1��r������3%���됅�]�$��$�"� f�(�X����˳���\�r��}�N���DQ���fD�+�eaI$�$3Ö����l!��b k��r��%�I
���` kA��~��\q��z���>P�T���W�^-..>���s�>�쳈�@BI7��̰��>����a~~�7>ډ�B�UU
~�X��x�N�y � *����ŗ kA�V\bmCCç�~���f�V)�2�---999=�7H�^M�ñCǥ8��>��\��mi����3X!k^�{1�`�t��z�׳Y'G5fr^���F�:�����֩��NG)l�^���yA�x��:���>\��=��W(C��ʯ����7�tֶ�;��)f h�����p
+.�ZP| �$j� �nmm�8q�����o >|x���/��rqq������)����KNr�l�J��K���T�nBtӜ+���j��� ����\�+�M+Fk �V�ⶏ�f��� ĴD����1Y XK��ɥ��_��_��Z�}}}����wfff||�����~��Z�>w����TDO ���6�.bX���BÜ���K����Z�����<����� :r���!ֺt������9D%��|���;Y=�5�}��q�����\�Z?
+��4=�t�|�7�c� �u��^=VQ{1�j�}�ғ諢�y�9s��
4M
֝�ݑ]�`���\���K���Q\������4w%�wϸ� Y}�jm~�[�]��q�}�.fh�f�67�pU�ߞA`�!+j�]���;�����&�e[=�Z�.�FE1� r�C��ʫ}t:]p�E�UU~%���A�� 7�?��������=(BYķgΜ����裏�fsDO퇗���/� O�D�wya-m�[��xq�֝�6�<cm7�����EwW� �v��弨f�nӵE���f;rr�)z�^vn+s.�� �֏v�Z����8����X���d{�?�+\�Z�� �_ �4� ����,֮v��r3DJ>kk��w+��H�̭�_"XK�ؓ�Ǜ&��
+Yt�p�b��Кl��Y� j�����!.��)J� W�rYG��@��=�_ �Ń kA (nOX�n����������{��-,,����vķ_}��_|�
+�uuE2���Z��W�(��u ș��dCX�T��v(��rn��p���W�[.e��!x���9)LB�����ܝ�K
��|x��_d_��D����� ��0 탵�5�7P�(������������8w��N2|���k���x��A��rc�GQ�d��yFC=�Ptw5�V�/��=�_ �Ń kA (nOX������Z�R���
���,((hllD ��?=y�$��K��,�2�,t��KO�N�_(��欼�XKj;U{�R��� .W+�f�;�f:r0u�c��=O�*��������v�;��U�r9ϋ��i�>���H�[�<=���t�aB�,��[[��� -����Z6C@�����̑��":�z������ZP<���F�������srrЍ����������#G�X��423�>m�I>"=��t�5Cx��pZ�S�K�s�_"�0��Z�H�v� ��ͽ�P�8�k;����Q���}����ZN�c��fV�H����+w/ K>�sm��Y[�? :
)+���\`d�Q�j)7(�/����M��^�c�pE��Y[{(��,*n�ƶ��u������c� jǩ���'����`-( X �@q�x�Z�Z��;� �}�W^}��������<}�tsss��N�������=�u�H^�g39��q&!����頞k=�y��[������ �� 2��OXk�٦�����k�T��o���E�[WW�� ���E��t� A=(/����q)���6ֺ�ק����W/�� �^��U��[{���R�T�����whxo-���'�%B�����J�a��[PP�XwN-^�D�M"13ly���`�(*Ӣ����UU~% �E�uj�$���ʮ�)� kA (nXEHB"�&�����g{{�-bW���N�����X�Z�/�\��9�I���=�F��e�@QU(?逵<
+@BI7��̰�}�N3����.�:�"E � (�:��+t���bG`Kl
+l�M�-1"����� $�n��aK��X )�Ү�)� k-�%6�Ħm `��K�7�H�I$f�-Ѷ`-��J�����������-1��($H� A�n���`-��H���������JH��s1���ԙ� �2E� NE�_6zK�^/ �=�]L��p�X��F�D�M"13l��} k!�U
+u�Pt��<T#� HL9��Uҩ�U�<�'[VZe) ��z�>�X�{)����e�,1%�#嵚�+~7�a�d�{)*��O�=����a�%X�a�������� �2�̳_�4��ZsW�(o[������c��2�h�m��$3
U����5Ô�<���2:W�:#`�� AI7��̰%����W)ԁ @��Z|��V��F�����n�B�X��&�q��b��s� AE9F+���x�e�^��^��m�)��! `~s�^yv� ֲb���b��Y��2V���Ѧ��h�ps����éNY
+`��� ���Dbf�m� �B�����h`-�
+Jnqݜ��?'W07�U�R�Ĵ7������G�M��:p��(�m�$I�!�:y�R�罙���vޚė=2�=yM���S^Ϭ��a���/dž�S.9ȱ�'�c���@��imm��S2�K�J��q-!�8' ��)W-2G-��HKHL;]�'�=s������E~�w��
�$y�-tu��Ã��u�O�ق�V2���g ����G�D�cDL[�� � k�_���H�I$f�-Ѷ`m����}�N�u��^JS�&�y�|<���A�p�bp�f�F�\�i�Dg�SL����h���R�?�������f���P |·�IyMZʶ�S��R2�� �x�ڌ�L������Մ�(����*���-����8u�i�%+6�^����f�{%� k�T����"��c5��-o����p!E��v�G��8Y� 3Y[�VbV�X�2�gS� (PY�=x�����M8X�}uk�Ӫ����i � c k +�2vr�RO~@M�1=�.lc�d�;���
+Z���H�I$f�-Ѷ`m���5 O�
�˽^;GL6+e���� ػL�P��{� [���@ �9`m�BF���rƙ��a ���+>�+֮0�W5��#KJG��6��V�$ɪ���C� �|ݵ�?֎^K��~a'O�+F+��&ڤ '���^�:�Qx��υ7 ��G��ڒ�
�:N�\��1��<ma��rq��)���YUY���%�{��moo������W�vww ���Ս�������7�H"�&�����ϯ���N�
+�6�� k�u�ݪ�����um�@ i�H�6�}gk��
eКhƵK[��?o��LVzǾ��aG���2i]巏Q�c;��ͅ�xO۠q� n��ʆ��K�˛���-�i �tsy�h��m���6ڑ�m�̽����l$ M'��q��x�j�ʸ��ė-�yBb��w�$�eȜ�q��M�Ѱ�����ڠڿI��ZV�[̺����$��sҴ�o:X˳�F� ~�����TUU���/...**��/"zޘjP ���Dbf��j �#�~7 ��Gh'�jￓ1"��'��vzsk %j��b��Y
�5�4�P�c SnC�(e���!L��>�>Zش� �3|� �����Y ��p6�m�ٛ>�@'�q86癒1�|�nXu��Fk'W:g)����b�� �Y��ĭ<�a�á�If'��� `����O�0�y�Z�}J�\˛-\S�=BV�&��/zLyK�c���j��p�dɭI�:3 ���q#�eݠ�K k���1VR�]�m6Cg1�`�IZ�6�%{��#�mz O����������^���mcc������� |�AD��
��h� LO=!ũ@�ǯ���@�2�����}�?
+�M'*W�^3I�g�:�k����6Ӧo*vڨ��V��7sC}�P�? � ��>\)���
+e�VU�`m���IȝZ�ñe`V�"j�L8sږ睜��Ȓ }����ʅ-3����.��ɂzy�Õ���� ��� L�~�o �F%���0� #���F�� �i�h����[U��Z�8��2J`X�_��J&dTbZr�b4��r^F�ق�E1�K�h�<� k}L�z���pm�l���
+�"C�X�0���&!�������� ��[�Y�|�4���yGي���Z��&q��'��:��D��� ������AcccFF�W_}e6�
+EKKKDO퇗��RK��䏗 k�� ���BJ/kxD����(�)��c�I�W�F�����f
+H�����_���1-� ��k#�|����n��)�k�Z<1��������ZĽ���~��v(��M�z�������C&�LQ��: k+����"�%6�Ħ���h��ɓ'G� XXX�j�� nݺ522RTT����� ����ĭ�2
���!RC�z��X�Hg�.�L�T�d�f���ddJSO�tb|E��<���Z�Xٙ*5
�[A���mN-���tƅ{���9@��r�-�A��1Z����g��7�פ�'I�G���k����LKOI2�vı��JQp�M�d�a�T0��3$�?T��[y��L�|Sg^I[W�d]���� j�[ E�{JΠ���਼�/y��N� ��(C��ʯ k#��"!O�Ŵ8.q�$��ԍ���$�[�f�
��ֺ������M�{��y���V��F�h�n�`a�Y�e����R;[ Jg s[vJ7
XH�����[bS��E�X[XXX__o0�"�={��F���������� Y���KG�ʊK2N�a������aQ�f���Y�@��
��������� �.���.FԲ��.Xk�����U�e����t �<P��sn��Q� ��LWu�8�k�=2Y�>�g��$7&�WN ����0��0�1T��GD#�l�q�"������^&����d�FX�J^�h�)dqa�OQy
+��<�W���� k����P�R+$ R�?� k-�%6�Ħm��v{{������/Z�V�R�L��ϟ߹s���_]]] �
+�%��d�퍵� c���_��7|�6-��$�Vd��q����ܝ�r�ځ:���?�8S�2;,Z�eyaa=y ������@��e��[���_I$NׄvCS&�箅 L��:R��Ѝ� E9�my�3����U�N" �
��6B ����� �ZA l�M�-�)A�"B�-//���A�PV���ӧ��>����}���<<< �
+�%m
����a�
U)K�Y��%8L�c-㭕I�4��.n��Z��Z���#c}��l�c�Y�
�>�Z[$�GyOB�ճt=���dQ��+j&i���k� ��aVf�͐�Et�� X<`-$a�P~ ��� ��B�I�'����|�� <�� <z��ŋ���z� �T =z��# �5h$d�u6��TR�\#w:�;$�u���Z���!��#!���
�)��r�q]�DV��H�kJU���y�FCs�֖JP�̼�!r`� 2j�&��ۗE}��&��J�:aI倅Y[�*+!��[g��km���y����
+m�>p�
���0R�?��[+h�-�)�%6%h[D��###��"�W^y��W_mmmE;wvvrrr�����a6���4yK6h_ cu �g39��q&!�J���^�H���k����$��� �ZA l�M�-�)A�"B����_����曓'O����N�B�[__��G mmm�C�j��^yIg��?�K��X�Ek]��, ?�k���?��D
k��r��%�I
���` k-�%6�Ħm����z��� "�}��w?������9u�4(�D�M"13ly���h�(*Ӣ�P�hU�_�:�"5u^�$���J�?� k-�%6�Ħm�h�6��F�D�M"13ly��C�j0t>B;�W{��� ki��y�����Q�&H1���@�d�13� k���� ��#c�9� ,�eB��ٱ��B��睝�ghJ���~�Ț�r�-h��������q�m�l��+��<�e��O�S ���|�� `h϶�F��Q��OZ�M� ��5Zݬnֽ�Q�8e�,M�8�v�� ���Dbf���>~���
�c���D{�\
+�o�5<�k76�� ��� ��Bȱ�b���5ӛ��Xµ�hkۆ�%�.D[А��ͮ[7ȷ<ȯ�mA;�K��h������4� ��m�����v;����i=�V��8pw����M km�5g��䅀��4� $�n��aK��#���Aq��?�� � ۋ�ϗ���ȝ:���@���Ҝa�L� �B�1᳙y�:�'Qh�<:�-h�M=�u=4��_ X����~ЈB���@� � ���i��uc�!L[ �� ��k� �vq�wv������Q4� $�n��aK��X �7X��Ύ}rz���ҊI=2�����&�qm!B7�?M�\�,j˶� ��2��
+k�+�����[k�i��3b�Pl��[��� �P�E�h�q��N�b-Q�c-� $H���x�� X ���"s�]�"��ܱ�5ӄfl ��Q"�-.����W] �h����䴞x���g�҅h�������8>261kX�癫��� K+B�Z"b��#`mx
+�� �B��*�v�H�I$f�-Ѷ`-�V<a-�ef~��?�f�ɤJ�ճ�y�*�-D^�Z�0mA�������+D[\�韑!义C���9�&�'!�9 ���W��� ��H�7�H�I$f�-Ѷ`-�V�`-ፅ�W�;�����d�i�B����B4gX\1�r�����g�_��E�/x�=�!�M�طŲn}63O����Q�
�k��+���XK$�eaI$�$3Öh��r+n�������A�8(�� �/�!���ڂȜ��"�ڂ�"n���<n@��3�mAd�P=2�zU���� ~�ڲ�m�q|J=<֯ A�C��2�
+OHS��% LO=Q�¡�k� ��( K"�&���D�>�� �[q��� l�M�-�)�%FX��퍲�$�n��aK��X �X+h�-�)�%6%h[Č������<++�ʕ+�����tKKKEmnnF��Q�D�M"13l�m ���N�
+�r �V�[bS`KlJж�k�z� |�R�Z[[�^�Z\\|���s��}��g=/�� $�n��a˫}���
�����Gh'�
+e�VU�`-�`���Ħ��ؔ�m3�644|��ki�n��(����Ғ����z���Մ? ;t\�S~�Sk�ŮO?]�{�@��u��k�^�f� �y�W�5뼖 D�fZ��;m ����{;��yA�x��:��j ��� @�+�!ZU�W�� �[�����[bS��E�X���u�ĉ����o�y���ɓ'���������ڦ�����/9�a�Q*�&/�tT4/�j ��t���\�|�GT34W�^௸��e��]Y~ �lZ1Z���}l6���\ �%������Ȁ� �[�����[bS��E�X���'�Hz{{gff��� ?~��ߪ��s��MMME��Ax�i��"��ዹ,� VȚ��
ٗ� C͵ +�c]ys�s�av�Ԃ��?���>6jh��l)b n���
��]Q[!;�>��]�=��ʽk`��R��K�NJ�� ��:��.�iR��5�kiz����n3M�t_:Fz��XG� ����
+5郾j)j��E ��gΜ�n���` �C����ϥ���}� �%H; >���LswQry����������8� �]Mm>3H�/ݝ���U��(�U={�q����vQ�)��#c�i��V������QQ��) �ѡ�]��>:�.8֢ Ѫ*������������-��ڏ?����݃"�E|{�̙������>��l6G��~x�HN��"��4Lx����ٌ�iݩk��q� ��bXx`�ne�10F�ዉ������I��X;���p�EO/ݖ�?��Ղ�.X��
+�����V��P� +R[�lL�+\�m�9��W1
�2r�8���ݹ�� ����Z��݊�#�7s����v3�QȘ�#�q�"�N���u�3�&�E}V4,5N����|���%c���A��#V' ����`-( X+h�-�)�%6%h[D���iyy���� �w����hlooG|��W_}����@^ZWW$�mo���}E���_�����K���� ��uSQ�)i�� ��h�{a��iL �
+.vL���ΘUH�Z�N�%���=^·��E���K�y���� �� ��>X�_���2�+�?{���ƕ��?��Su O��K���dO%�j��j\��"��dL��"�\Bd��AS��l�w0s���!` lƃ/ؑ���#�-�aYB`!�$S�YݭK��M �V��.J���o��՟���V�8ûs�x'/ ��<pP��h����w��
+kmĪ���U�w4�ە�7h�- Z���h-��Z�A:A:a:� ���/������ꚛ����?y�diiiSS�����Ozs�Z�4\ �Z�9�\�ߨ Xģ ��V�w���d���8�������)~q�J�,�Z�����(�wy2p;���{��ũ�g�
�[��6���u�*8��{�^X��w;}a�Z�Lf���N�c��8�O��H��Z+t� ����fXUk��7� ,T����z�@k��� �R Z�4�B'�B'Lg���*���_}Ϟ=����B�j�NLL����ݿ��b�o*]�I�|�O�⣦´��}G��VǦ��e�?-���4�塣�ػ+�� :pa��5��n�U �\_���*�U���"۸�ig{�{ �*�w��+�l�Iȱ����Zќ�o>��(ܡZ,<��z��@��³���{k+��9�*�1�����GF��rǺh콵o��+�������}��/.n*n�ಭ��NÉ��T��U>*=?�HZ�-�����Hh-� � �0�E�Zk0�
y� b�����k��v��%2��v��緶�&{�ބ)t��0נ���;��hd�[�)��#ꄼ6���`�Tہ���y���-~.@k���2
�� �� �Yd�� �gbb�믿V(o���'�|BD�
�}����B���MP$ ���۷��Ch�Z@k7F�Zj�>�o ?לl6�?d���h-��Z�A:A:a:� �V�\zZ,���N����nii)qݝٴL|�udRM2��0Q�c6� �jNKޚ��Nծn/�Z �@k�Y�Y��,����`�T�Lb<�,//�%��82��EfHծn/�Z �@k�Y�Y��,�ڝ"�2�&��L������4� ���Z�4�B'�B'Lg���< &�I5�$f�ȶ|�� ���2
�� �� �Y��;�l/��B&�$�� #���Z�4�B'�B'Lg�Pk�<0`��!�ö|.@k���2
�� �� �Y(�ZɃB`�T�Lb&�l�Z @h-� � �0�Z���@&�$�� #���Z�4�B'�B'Lg���<(&�I5�$f�ȶ|�� ���2
�� �� �Y��;
+� dRM2��0�- h- a6�� R�FN���m��2�&��Lٖ��0h�ed�d����Yk����Z��ÇϜ9���m6����\./��]�
+��L�I&1&n��|�r��Z @h-� � �0�E�Z;33��g��k����ouuu�� ***��˿�ꫤn��B �!�j�Ī�* r#�
���82�����$%@k�ed�d����Yk���O�:E������\�gϞ]�z��O?M�v# ��\��r��G��}�dnH�V�`27
��Ucݮ=��9
+~(�
8�uk�I㨰��u�-�;vM 'f�Ph��Q���ԾDb�K٦ED�W�ñ�
+�-2C�vu{��Z�4�B'�B'Lg��֒kЏ?�����MMM���J��ܹsv��������I�tT!<�,˼b�x��Y���n Z�1��=k�Jq��ݾ�Y�j�۶ouZ�6��y������jN+@f�Fodh- a$������mZ����Z��,�9y����Ϭf� i��j��1V�8��`�@��Ia�Yx<ƺ4U{�{l6��6�j������Ì�,�:���\m�%0M�Z{���������=}�t||��CKK�Ç���'''����B *[��(�g��B�)� wqg��q�\�����ו���
+hj�-c]vm��4�,~�O��*]�am�hm���$�����W���s��]qV�v�S�:��{�����lT�y��=��5�BO��k�ť�z��,R뉭���:��kw�*�؝IF�a���?51CZ3�Crq �K���N���3�}E��-N>�J��G x��ԍ�����sp���"�@R�/�ET�<~�xm�%3�jW�h- a$��^�6;p���+s�#�g���v.e��"ຫ-ѐOAֵv\� 5�a5 �ӯ�*i��'0�E�ٕ��*�#Y *E��IN\�@Ӑl��������l6�%~[TTd4M&��~�;�ӹ��[ �k�u�~�CrnY�q������(R�]��jq��F�vWm?7>Pz� >�pZ{�_��V�l�#��Q]���Y!ِ�?���.���/>٢m ۲�XGkI��"r ~[�� �Z��9ɇ)�!MA���� ��
q�A�Oվ�Y���*RU��A����L���Z'|Dy�jRh$ ���P[UV�%Ǟ�O� �� w���L����;�Q���6[h���@k�,����L���[�
�7�YDد糭� �G�L貏�,�BV��Í�,\S�J�1F|��l� � ����k�_����� Z�Z����p8~��ߎ��wuu�l�gϞ���'~���_���'{�¸.M���r��m~n� ����'��j-/`�/8��5��oЖ��c[k���VuU��c�C6�G��'_�� �1����Z��-'i��H�U]v���Sڲ��~�fc�6jsIcC���bFjmD rD�b\�]�e#' b��>Mm�����qW��O s�E�y6ֽ��x;�!�}��Z��<�Z $��a<}ڴ�!���,��Ҍ]o�4o�_"uXڕ|�0�Z;Ҙ�Fߧ�Tg��0���Y�JNQ~�"-����l� ή|�
��d��ir���'cWN�f*)imuu�N�#�P���� =�ӟ����_�t����7�H��+��VU!��r�2ez�?e���\�Zk� �����xCz@k�B��H�"���Z�B~�~�u7��2�S5$��6 l�������
+ߩWU��W�y�6E��1���d^�oHk�� ��;�e�֊�#�,�g�+�j5dAO�F�U�_��m�k-�Z[� ��J �ڵ��Y ���Z�9u���<��p8�5�犟�,�!M�k��6��_Ul�a�2Fu ���u��{X>Ƃ�4*T��sP�B�)�Օ�]�rjmnn�믿�gϞO?��{���&�irr�\Teeey��� ���-r��+�_�?ޚ���TU57�-c~kW�%W��������e���%�:���o�Wefq�6�&�Zsom�
+�}����*=��н�饺����N%|r�M��~h�lms���_��a�[��U���[�3���ΐZ��.Qw��w��ཱུ�ц�촜����h�'*N�*
+�<�����k�f���ƹ�6Jk��NXI+�u�֮=���k-�.9���,6S���ڦ*n�b1�Ǩ =�'}o�Y�2^<X�I���{���\9:J>�8���gղ��~]��M��KIk >|��;��}��W_{����62�ŋ���W�\ف ����Ȥ�d3a��k���@�Z�9��n�2��B4#/�����%�Zk���� �o�c4 �HxX�=xF���z�`$˨�PEl��]JZ���˩��o������o���C���666 9rdiiiv��B �"�j�Ī���=��)k��O�{�+{C���=���h�� �i�o~���cEA��Z�`c�p�ej�O���]�2� c��?'�gEY��1]O�"������n�߹s�h����矛L���4=� �@&�$�� U>333�c5�%o�R��� ��0R��U@:A:AJ��֦Ȥ�d3a�ʇ�Ĉ�����1��䭭�')Z @h-� � �0�Z���@&�$�� �|�v3�F���Z �@k�Y�Y��,�ڝ��2�&��
��Lٖ��0�Z�A:A:a: �v�A!0�L�I&1F��� ��i��N��N��B�֒y0`��Cj�m�\��) �ed�d���P��^�C
+!ջ �G&�$�� #���Z�4�B'�B'Lg���<��Pf �T�Lb&�l�Z @h-� � �0�Z����B�-dRM2��0�- h- a��L�,t�,t�th��#� e��I5�$f�ȶ|�� ���2
�� �� �Y��;�l/��B&�$�� #���Z�4�B'�B'Lg��֒���꼼����[�n=~�xvv��p���nW��l!�j�Ī�[> �g��Z @h-� � �0�E�Z;99�駟vuu����9s�������ǎ ������B$�@&�$�� U>���f�yzz�q d"y�̐�]�^�� ���2
�� �� �Y䬵/^�� �H���_�: ����˗/&u��"1xf���G�)�=�T��nv����3��s H�j����?R�C�Y�u[��8:h� �5�9�dtn��� ��NuqT�yh����
�N'p��NT�q%'��U o�R��� ��0�Z�A:A:a:�l�vii)''� ���7�|s�Ν���/�X,�ϟonnN�c}��bUq{�jx�������GkOGHQ+���
۷5s��kO�ou':��5�Ggz炣��l�k��㙚�Z�i�����Z @h-� � �0�E�Z��ӓ��y���'O� �����_�j0� ;666��M�����x����͊���`�Q](4� vx���]0r�L����y�{e<{0����ű���ֶ����GK۹5/�Vg��p&f�.?|���]U~�Z��C�t��v�DXSk�jz�x���}�}� ߄hb <s���/� "���^q��U���^p���n���xp�WG�Oߞu������2��� �s��;�хL� � �"�_�9_��Gx��g徏���>Z y� >qc������&���͔��V�*�Ǐ ���d�T���� ��i��N��N��"[������r
JT��mAA�Ç'&&� 9b�ۓ��xZkl��
+~+4|�o�*��Ƴ�O�.$���ʣ��'xD�#�Z�����I{aq��H,��]���������]�]]N6A����1n����t�:Z;{MQ|������mO� �. (7,����
�C/<�
��]M���^`A "���Z�x��..ϐ,�b>8������G���ŅG��QG��oU��WT�Ց�bw9Wb�{O+���)��[�\��) �ed�d����Pk�e��?���� y��ӧ333W�^%~{�ܹ���*�;_k���g/�V
+��;�� �.�.NL^�l{2�V|yr���phE!���^>q��J�QF@��{��_���'n����͌Dk�!Z�c�ƆZk�
'�� M�z��A]X|�� �Õ7��
��V� �p�/����\҈m���5H��<�8S
vw�g�M;\�'U ���T4��xfh�?��@
+@k�Y�Y��,2��/��������knn�����ɓ���MMMd��?��~�w`��r��� ��s��Z�w�^Q}��S_"�'ʏ��5�ڧ7TGy3y�^(8I������dq��ty� �]h��l�������Tne��I<���w�5�ƴ�:��C|�{k
���� Q"�%� ��wopܨ����="1�ֲ ��0�Z�A:A:a:� �V�T����{��),,$RV�ubbbll�������~��Z+�A�{k9�g3]�nY�>�|�?�=������f�^��ʋNk&z���͘{�r�p/�vm6�$��{k�k�h��7�̍]�6\|�w�YoT H;X��� ����g��������" �I�Ŋ@ң�oL,� Q"�
�$|�x��ꨃ���sh-�@k�ed�d����Pk
�;�C���W_}��.]�D&���������do_
+e�T�Lb& �v�� �Z ��L�,t�,t�tj��㙘����
+śo���'�ѽp��g�}�����{!� �j�Ī�����?b��@
+@k�Y�Y��,2�Zr�i�X:;;�־����uwf� &�I5�$f�D���lv8 �9-ykzz:U���@k�q� �B6rJ��֦�Ȥ�d3a��gyy��-q��1���-2C�vu{����L�,t�,t�th���`�T�Lb&L����X}�C@k�ed�d���@kw �Ȥ�d3ad[>�Z �@k�Y�Y��,�ڝG��l!�j�Ī�m�@k�ed�d���P�� �Z �Ե�ܡ�K�Q��4���I�dyn�e�.i����: ���[s78��, 措�]�C�qV�xF�zQ�e��M� c�,�9y�>�0��,�!M�^�10Fm��w�U{���Pd_��Ak $ ��ik�H�B�'��Щ,����c"ˌ�*��F��ҵ���L�KK�2�}��fN�tymsZ��k�fk�c��ze���v�
�S��"ຫ-��Q��qv~\��b��
Z ��@.HZk�
+��k�-d!�k���&��u��-�nW����,K�]��o�cMkc�xm&k�ޯy�!�W/!���YR��Yf:��;�3 %tkm���W���Q�Ak $ ��Ik�נ���:�5 ����Kv���t#
p�6Я��,!��Z��*��Ӧ� �w��8:J3v�U�l ����Ү�ГS��v�������7���'Ju�M�q � Z 䂤�����\QD������,+��"�d�Z�9u���;�Y8���:��x�4�5�����!�����s?� @B@k�\���
+�k�ƕ�Ҟ�j'dIk��]�~f��LfO�t�x�:�yKܰ7�,E��{�YV�~�߯��M��Z b��@.�@k����1|�;Y�W� ?2�G�Z�9��nd46�8:J�ǘS���rk�[km���3P����T7h- 1�Z $��#��i���)Ldl���ޝ�v�"���f�'^��2�:+c�+&U]�
+Fg��w�}eo�a��,�^���FFs�mL�XQ�,A��ژ�w 6� GT����&��@k ���� y��Y�Y�Y(Z ��@.@k�Y�Y��,�Z �rZ�4�B'�B'Lg�� H h-� �Z�A:A:a: � @@k�\��2
�� �� �Y�� Z ���i��N��N��� � �Z ��L�,t�,t�th- ���� �?�wKOj��q�[��S���ރk��f6Uw�Z ��L�,t�,t�th- �(l�)wZh�0��puSu�rZ�4�B'�B'Lg�� R�XzS��Za��]������� �ed�d���@k )$�B ���;h-� �Z�A:A:a: �Z�[����H�)Rw�=�!�[u��l��Q��of Ϩ.7Cc��� ������*��aE��ɵVo�eF��E�^]��'��}r�뻕�^����s��0ٳ���k�t,������\� �T��9R.��Zh- � �ed�d���P��ƺ̖��y�k���v�X�e���E�Z;P=%��SU��$ �-jr��m�a
�@Mf�h��L]�7`�_�X��Z �#�B �����Z�A:A:a: �Z;�KS��8C�Dk�4-%�\f���b���e
�.2� -�9����ru#�%r>l�(Q_��.�K�����m�^˭moƮ��*; �
y=��kjW��x#K�^�mzFX0G��2���_W�Q(U%��:�H=�
�B�V?C���j��d�M�����"Y��-�V��! �[{��9_lj�~W;�m����z V2a� =
�Q��n�|Gϥ�0=�}�cc�^/�\*�^��-��P0l�ւ #�B �����Z�A:A:a: �ZKLo�A���v������.�c�U4���;˔ V~�Q]���$�?s���JMf�Z��膵6]h���gk�<d)U7��S�52��(�Oqv�څ��i�Vx���ԐYj�%{Uc�w��p��}u���-�#��v(8y�6�։�#w����ն�nAk���7 �5|;� zp���aC���G. q�=C���;�7�L��ޥ�зK��+?Vv��ւ�"�B �����Z�A:A:a: �Z�Ү�Z_Â7X����W
���Dq����dn�j������'�����b�
hp�9�ܬ�B=������ki��nWH;�A�3�� tQqӫ�=�_p}��Hkm�g�g��~Z� ��AW����m�h˷w�=p��Z��V9����� :�cX�c������l��=�J��`�H��Bk�� ���i��N��N��B��z,�3¥
�NN�6���뷬�j�\�(�[��B�մ�o�We�(Uڮ�gA����ժ��������o
��m�����v�n���f�K�G�=�h��n����w�|w��Z�ǿL���p�j�t����Zh-�AR.��Zh- � �ed�d���P�����\�i��vFkm� ���y!���������.�6;]�V���KFQ殳ujUffEݩ+C�= o��RdVuͬro�s�N��6rm�����hm�7�$��=��n���c�6��Zn�����u?�s]�;E=������'*�k��Z�s�\h7����n`�����j�Z�sa���g����R���Z
Z�4�B'�B'Lg�Yk����o�嘹Rtj�� ����sv��~є��{f�(A}]u�՝�wEF˂��ؒ�Z�&�vº�d�ǽ |��� ڤd� �KXP�?2�]k�T�Ak�\��2
�� �� �Yd�����ܼ�3���>�3
8�?��� l�5���8g���6[�)��f��v��v�e�j�=w�G; >���;!��ח�֎�{<ӎ ���u��,�����6Uw�Z ��L�,t�,t�tyk- Ŭ&�'�����g��<������G���o������=��?�4z4A����ý�0�P'�o�O��>��lw_H�64���,�~Rnxm��;h-� �Z�A:A:a: � �BVo����a7�����������v��Ǭ�7ծ��:Z����Z��v��kl_"N�]��<�q�?T�lz�_���r[]�ڡo7��M� ��h-� � �0�Z H!k�{�Ƿ Oî;��s�۶�7خ��:Z���<ձy�݊����lILh���ް�nbm��;h-� �Z )d#�th- $"�IVW��kV
˘��_��M�|��U>s��/�W���`*1A��aSu�rA���$W/Y��,�Z @
+I��n��v�!�:
+� �@k� $W/Y��,�Z @
+I��&Ok�W^����<�q����*��}�a���{o˺��zO3����ez�\�Hd���@k )$�B��Zh- � �ez�\�Hd���@k )$�B �������F]��6{�D��.M�> eEk��2w�م�+
9҃�ۻ�OY���z��չ�� Ez�����j��C��e�)iw ���2��f����ά� ���: ���[s7��, 措�]�� btf�����"iY�f��*h- �\h���Z �AJZ;���,�Q�Dj��_�U�f O`Bkg�%����9!�
�s��5����ԋ�C�h0�/-�J�u�R��,��F��O��SYZ�g ��=3�]��P�� ����6U^�^r����3C]A�F[F����y�A��p �n�"�� �d�r���BkX i�k����]����J Jct��cAk{F��m�N��Z;Ҹ_���gFkc���U��0ο45dW���,��`m����g�x�3�ݞ�(RvX��롯�:�P4���`�kr��u�km����L��B�歺A��
�� �B��R��Zax���M� �� i�@�f�:K^�)��U��Eveb����s�YU#�QF��o����}cOƮ�Cp"�Y�mF���ٯ�@���^���`n���D�`�^��{�d��k����'�ۧM� .�� �r�3��
BkS>��p�����&Z 䂤�vT�A�N�Y�^�G�A��!�֎4 P��F٬��Y�niWf�F��lf�:�6W��(������3
+p��*͛�k�(Kf�6��{L�ʜ���%� @@k�\���i
+BO�rt��3��� *QS-�Zk�� �Kx:�YBx���iI5.C�H�,��lvB���
����v����� Z 䂤����'�
+:�5Y̷֎4���#���z�}���Vt&��Z2Eq��
����W�+��$f 'K�6��sN��q�Ak $��)i�` ��o��x;G��2�M��L���{k[?��v�+�D�EuNDS-+Z[/ ��U�v� c�Ð��Gųџe�Jޮ�2�r�Zea�~V��U��jNƮ=��9U]|
+���yO�z��W��lr硵 �@k�\���n&�v����E" �0�Z ��@.@k� $W/Y��,�Z �rZ�� �z��B'Lg�� H h-� �Z��ՋD@:a: � @@k�\��2=H�^$�� �Y�� Z ����Ar�"��N��� � �Z d�� ��et��Ҍ8K��- c�YX��,�Z �rA�Z�rm�֊�d�� '�Z1Lg�� H h-� �ZFh-�@k��,�Z �rZ�� ��h-�0�Z ��@.�]k����>�
+?��o�o�t����5g�g�5AkEH2 ���| CC��+���٬�)WVh-s@k $ ��h�? ����>��Ehm��dRS�l �����������++��9�� Z ��6�����n�ӓd�{�%d���vw�IN�_r�4 �Z��O �o���<q�e�g��_�,���6��n���m���ܪ��M�F-Ok?ַ -�K��nhm$��PY��V���-����w�5�sOMO������T���� Z�=��Ms���.8 /��e��م^=?@k7�Y�� Z ��ֿ�^�,�W����M�r���I���м6d\���
+i��S���~ZY�qߔ��{���-Eު X��ї��?YX��m[ +�F�Ձ�F �,|e���|Sӥ��e��~�{���K�)S�Ԋ�>����^e��Ok��/l֓�ڍ�th- ���� �
��枚��\�J��"�u�m�=)��8����z\��Q� �o�ؓ9U�ه~,m�}l���>��76��3� ZB�Y��*���-�p��{�L�� r����^�[�"�����"��u`: � @@k�\�ֆ��s^k}�7��=\|�k���|ӷB�D�]��kt��Mm?���_df�!7��^eɏ\��Y=��o�ν`�:b��� ���/��v�#���r���J����T�Z��ɘÏ��>��1����Ak��YvXk ϝ/VV�� ������ Z d�V�$���?�~�C�O�}� ���~�'�~:�Z^tC7Њ��V��Z�{���PX�;���{�(�V�$����m�������������`C��.89����
��)Zk�
+�YvRk_�|�t���\0[ `r'grr>'g����) w�������~?9O�ֆ�d�� '�Z1Lg�a���|�E�㹓� 0�8�s89���9��h�C��c����T;��!��t�t���Z?o�/^��z� lB���L������@@k ��4������
+� �2<�Ck���2:@kiZK'LgI�� ��Z ����Z���� �Y�� ��Hh-���f��t�th- �$�R ZF��� �]oh����7ۉ�1�����i��~�oZr�$��60[��S>��)����;.���/�� ��]�Z�� ����ZK3�Z IZ � �69���O>�@?����>⨂�p�S����2}[�[2j����/�F,���q3@k�ZK'Lg�� H�Z 䮵\{�Ϸ�^XZ�q�p��k��{\����S��n�����T������z������x7u�y��ӝfzz��g�%�9L�m:-ӳp�6iɶdS���@'iش�ӊ�@
+���E0�] cb���0`@� B�1�q�I�_$# ���E���s�$�͖lKֽ���� r�t�~�.�>���\��D|뢏c�eIn@��en�y�<(���
+��Fm������U �2�Y(�V�$km�-��9��� �:�wS� �t3�;�� �9?_��&�&��'ݴd��6G�ޕߴ�Z� �'��`-�r�m��v .��p�Zkk����������rc� Ub/�J�-S�5��v����U�b���G��je��S�d�Mwh��H�Z��\,W��%�~��c�#ֈ�_k�֒�f����#Z��eF��ɚ�6Ik�+�i���Z O@k�Z@�ZK�������Z�pυX��� )�9E�(q{9_��g���q�K�OS�M��biW*�6�����+��Z9��2�����t ўÇ�=3՛���}ͦ��
9:5�������`M��K�i��ּ��Z+[�� ���T��� ��O+c�� �N��k�j�aO�� 檓jY�Ç��sz;�R5�� 8��#���8mQ�m��֦��.�%�ӡZ�d��4�ZoOY=Ln'r3 �*��v���H�i��&��u�y�
z����#��Bk� � @��ւ��ʵ�v�1�|n�Z[��CC#
�`��Z�w���bq�cd�c�c��o/�)A_/#���9_s���{n�����3V�4�|\6�j���g1�M [[T'M��{�t���G��0gwh�n�a�� �v5��9�Y��I [���Z+o�� ���T��9
+���ڬ�:�V�(ṵ�oڤ\� ��Z O@k�Z Z����eB�U��%�Z9� ���M�e
��\�� �����
+
h��Q��fu�%�Pt.�Z yZ ��Z��V�@k剢s�� ��Z���*4��rZ+O���k-733�L�@ %�'���|�Ck�Z Z�Ѐ��h�<Qt.�������Z�@ �
� N�ɳ1[h-X �]k�<w�F��͋�JI��O�F��!���� ���CkWĚ�E���
��g��=�� ��D S��c��-y`��]��n_z�ya�ȑ���ZŰ�Z��_L?�T�@ J�MN��ɷ��_��Z�P��J������b6��&�fS��ZAh� �h�|��Ȳ�b�d.�*q{9�
z�u�2�Q������[T�)�I��6?�� ��\�&<�8;dYkx]A.Ik�8/�VI��֒#L=*��1�@� e����T��f�3F�e�A���mt-uz�+�1���%�"C Ik5m~��Ь��BkeN�N��.��N�0F^1[�P�NS�]V�K������?�D"ݾuS^�SKL5�Z���Z%��Z[��a��h�z����S�r��~��2�{�}z�Ϟe��Z�
+T��nC�G�! � 6��n�h����f�Z[�R-�V��Z�!�3n-QSn�a^/�o��[.�T+jmҾmN7#v7XXk3�Z� ����x�v��������.5�z�� �h�2wh-P��ڄj�����Y6D��� YLn��j��oL��2� �_���ʜ��K����&j-�3 )�V�n��} :C G�b��@n]�{�,����Y�Z� ����(���Vk�پu%�ܡ�@�\kӎ�M[:�E�֊z���Zh��I��8��-4>6��K?�u��骵Y�Z� ����(��Bk�/*�څfBN��}F[�͆.�vy�6�y�xJ��Z���: /<����ӗfF�
+�+����=֢�ݽLءK7Y�B��jm6��*h-�@�$
+���Z �ڵV���3xn�<Qt.�Z�XI\_�� �h�BZ+g���Dѹ@kb%Qp}���_��
+
h�����E��E ��D��Z @~Q��*�l��r&>���*����Z�@ +���+����r�Uz���e��\䉢s��֎ݮ��ꆍ[�m����������n��'[�#��BV��9��s(]� N? �����r�-xA ���E� � S��\ڱ�EM��%�>����c͓��%�Ak ����%k�.#��BVy�9��ώM�2sf������P(xl~K� �����$]��� ��t�ޝ�#�g��Ih- ������j
+�����"d��Cܕ�Rj��?�Z�@ ����vV��+���Z�0y/4{���h,Akcۇ��*���Uh@k� r�'��E�ZK�r�Ѧj��ۧ�~���L�u���E_ �����Mu6l���}�� tW��m������C<��t��E�ױ�1�Ř�ڛ+����������SR�g� dW�%ͮ�I/[
+�3�@�'�ڰ0)�J}����bZ;vdtV��8'����H��mwbZ;v���/���ɴ]��� �h�BZ+g��<Qt.r����ֽ�П�����o<� z��Ұc��D�ݰ���*nOͫ�~z���������놼��~{_CǃG��� ��ڞ�W)���\���6C�y|]�Z;٪���ۮ�Iw-pmB��E�V*�f[��vչ��R�w
+����6����_ �C�/���� ���m��+��j��k ��Z&��Z 2�v�u����b��٦��{�t
f�m�M5,��������E� ��,��ܶ��;��4 ٲ�]���z��8 ��i�TkM�oli���q��n�O�i{�� ���N:�����ߌNXe�}sw-
+�"�TkC�9���� �B8$��ω �j�}�1.����wB��O?�h�yV� 3�x��} �ژ٦uZh- �@k��[jt~��:��R*�v9 y�\d� ���Ԧ:!'
�%�� �$��ӃG_�8�!��X
+i���$l��Hg�I#�D������B _��� Z���\�!��O ��
q�g/ؗ� ��BN � hmTk����Y�Foi�x9_��Z��l�"i/.�p�w����b/k2�L5Ik�� �rX,iw����� ˓�OW���1^� �4Ck� r�'��E�Z��Q9����߲1�Z;���U_��j9)�"DJ,��/φ[�~��Z���N� f�g�B�e��tm(t�j���?����[ @ހ�
+�0C,�`o��(�3�����M_���φ��t��]�9����ﻑVk�Xv*&��6?ϸ�d��:¥j-9 =)Y���=�V� y��\d���\��7o�uh�? ���!� ��͠��Jo���]ͥ�6�b s]���#7#k��[\���a�h���;�q�g{�(��������1C2��E6�$�� �hm�Z[TN�4`,N.�]�q��L�sgLk���R�V�Bء��S�g6�uBN:]T��i�^� �V� y��\䩵4�nk���m���]*nGʭ�ۧv�(e&�LZ��ȱ�t��� �)�ڍ+��5���O�D���j��y���5q{ind�U�.:��� �������g�@ �z\_�� �hmLk� Ikiݕ�����֊uZ/���i�Z+Vk9r��h����
Y>4�:!'�����Wڸ�x��
+r�'��E�Z����Z�XA\_�� �hm�L���A�ήf �ʳ>#i- U+�L��U.Ek����C.6[Xq���'�.6����;�����E��E ��D��5�Z��.�����_���x�F6�Ck�*P��fզ���k%s#�>��r��E��E ��E��5�ZK����������]���� Z�1�GG8�"����9���"����(���Pk�ݿ�/�pxv���W���f� Z T�V���3�E�(:h-�@�$�� yꌭ���������B6�Ck�*��*4��r��E��E �X0>v��ba����ߞ��-����l��o,�� �Z�Ѐ���"O� ��@�3�a�k>��� �w������n��YW�6��U �Uh@k� r�'��Z�@ �1����IᙚF�v��چ W��'b����܆���w�i��&�-���km�<�;d�!����-y���<�'�[y����a���"����С�;Z�}�v�̼
�rBk��E�(:h-�PUĄ��x? ��w������C�!5B���fff&&\뾱��-�w�� kLh-P�ڌZ[��r�t&�^�8j���vv�*;ʼnϳն�9��`#Z; U ����4��e�!�u9hm�/!g y��\��B=sZ��t_������+�f[K�j�_�ǿ��p.�ï}������U ���X\e<�=A�f�����G.&ɤ��j��-��W�.�_�Ӕt�댮$�շ�Î6}�+�����Zb���B_B�@.�Dѹ@k�J"�i�x�nhvv�_kk�E�6�ocM
+�� Z����%�
;�/>�6�����[�P�%j:���Z�� )��9��T9#����"��B%�NϤ��q��ik���~�+_����?���@�@k���`��]���vvI&8-�f,�g��k:����#��*��
�lȒR�}� q }���ϳ.v�%��ǡ�
+��E��Z� �2��/�WP8 ������
������(�0;�K 1�u� J � ����6C�6�Z������eô�1-���T�Mu���&km�[����l�jm�/!g y��\�� 5�Z�333�@�����Ux�^��ϟ��/���{��mLYZ T�� �9~~�c�Y`M�y���xA����ޞ�4�W8G\�8&��RIf��>���� Z��5r� �Z ���vnn.
+�A�����U�*<�i[� � ��9��/
Z @Ԯ��a�g�]%Y�e�Z+g��<Qt.�Z ��� �p8��T�%����Y��*<����
w�������ݦ��@k���&�暏�;4�Vh��A.�Dѹ@k k�� ȏ ?��| �����x��}�{ #��Z T�V���3�E�(:h- `���R���i���3!;n�,��Ix�T��δ��RRz����b�F-���$��Z���
+
h��A.�Dѹ@k k���Z�� �w����s�N�O�ѽ_���[o�8��! ��s \�&n\ �%�Vsx�ރ�l91����|_Z��� �Uh@k� r�'��Z X�j���͍�zM�F� ���֦�pZK��45�2n�p��˯쑖��@-@k�Z9�\䉢s�֮>h�|��VUy���9���ayG��;.V� ,)}��tI��s�����~ ��~Y�ѓg�Ϟ�h���b���q���+���q�ܿ���_���<��f?���?��_Z ��Vz,�0��^&� ��(��Bk�r�'��Z�����[U��g$wZp\�*=[UZV�=�{���K����O_KW�%Z[RN5K��v���;^�m��Z�Z��37������U��~��
���G��6�������V��@-�]k�
� ��ܜ�����e=%2�V� y��\���! ��UU�~Fr���7�N�t��6�;+i���F�03�pι�[�� 2Vk�MG+Z��7�N�3���M�l���^:�{�o�������^�
��G�;��/m`�{Z ԂڵVw����N�%YkM�l�����
+�U(�E�(:h��F�*oU���� i��œWF����%b�����v��%�Z/��`I�#��Z/�[� )�F���֖]]v�+�\텿��7~�9�Y�="��ퟝ�����+��;�w*~Kh-P ��Z1��V����\���� �"O� �v�A#d����iwS'�0�k�UU��
+�o��Uk[��o
+Ҳ������ގ�-NAXϜhI� *���ܫ>^�'���;!wVjk{�1�^�s���q��������������g�s�����|N�0i3h-P ��4ZKV�]���� �"O� �v�A#d ђ�7^x���?�}�Q��^��<���z9�2j�V��g���U�?.�T��x����3��Rz YMEx����d�Ֆ G�����eiʨ�U��e\�
+�v�&i �J��H��v#���Z���e� g �u�Z+s��<Qt.�����
1-�"�ڭ�VUy�+$��:|� ΄�ۛ�/)��
+v݉��u��\nS(,�Z ��^�]AN�������xtD��Zh��A.�Dѹ�^k=��nY����?��^G�>��۰��)ND\ M�����ny�)���w�9r�ʞ��e$�"d*���{=Y�L���F��c���j�pf̗�� 3c��\��;i�+h�4���d8���Zɉ�Ϳ��?� ����"ۧ�Z3NÁ[g��
{�c�)�4���tߑ˫�+M?h�H/�~��@���uw�ǁ.�|�*����o6�Pk�9v��4�y;�� h�BZ+g��<Qt.��ZI;C=�����4?v����/%*k�6p��� ��@Zs]���ַ;i�6kR�!���
�-&
�4W �p�9S&f,�,�d�D�5���\� �� ������}B��W��7���M��n�g�K�#]'�%k���*�ϭ]�@kH Z�Ѐ���"O�����QDZ��W����f���<]t�.Ֆ���M����w iq ����b�w��� <� �5�M��6M� L�z����on/��Zוm�/y�O����uEW ���
�1i��M���
+��c�?MN���K�B�D�n�5�&^��bZ+��5Ҫc��J�n��(���ui���B���q�)�Z��Ʈ>q��H�E� ��h�z�-� ���n�&L��^�Wn7�<�g�|��#,�C�?���W�YҨ�jq�n�������"�'�j莱��dm 9"�n���gZ#G֎͗7��u��_Z����g��������'n���Lڰ9�W���/��V>��Xo���tu� �6l�� O>��nr�M��"6�sƻ^Im�M�x_�� h- @k�Z9�\䉢sQ��J���aw�]*b�w�m�I��%�qd���мa�>�S� mxi}�ye�K}�H u�њ ���x�ۛ���]���im��uNߏ?�y�&_wH�(z��__wDO��� `I��^�!�wYJ'� Z+H^:��Bsck@� �:_?�k�W�" �̈́���'�Pa�9�-d�֫��q�G��3�l�l}��B�?�@�Zz� M,9���P��}�h �VrL/� �W!"Ӓ���b��ت�ޞ@�O�+x_s}���Q
�|�g\�5��';Læ�b��
�k5�͞��bm ��i={fB����LႧ � ���?��J��t{xM��� ��9 )��RIj=f6�� h- �Ykm��Z9�\䉢sQ��- ��~f������F�64ڤ���-[���D��v�kk���l8r;U;��F:!�Cŝ��>�M��w��%�(K��H����|�Ik��}���̘�������?-�F����Ć7�_�N���7t��e�wc��C�*,��d�:!�j�����ӟ��ܗT�6�|��?0��T��'i(���D�L�k���� %�i����@Z����EKZ�N��)�_1�V�ķ :!/ h- �\k� k�sY# y��\������ݶ^��;T�m�X���Y��'b��
����XP�j�vI)�-ol:v[�� ��
+���7�TC�0�r$۱���p�b[|��Q�����j�t1��� �
$\C�������n��U��i& v� r3aaf��qO�Z�z� k��>�!���͟� ��t J��X�VNZK( ��(uBJ��دon���[k����k>_*��& M�ξ�3A�x�%�#m��n��4������3� �K�a�ko ���' w=z�Ю��6�����Wk�i��̶J%�z��%� �km������@.����h-�5�i��������[^�y"f���Ji�lM����2���ް�iM˃�!��h*����o�æ-O {�ж�fB���!�hE�o�rn���u���QkzDOt�'�� �W���k��r&�� ���)��=� �ӱ�ƚ'�+�l���M�����v�&I��\��/>�V^Z�%��;v}wdD���w�:B�&����U�S �����g���b�v�l��3N�}�l���3>�HCE�]s��0j4rb�~���ܿ��~�fh\����'�j�� ����Bo
��������V��%� 5km��Zr�'�E&�^ke �ڭ�˚yua�OpQ69mU_�����H�-ڥv��_ҋCF D��f)����KZ @�Z��V� y��\����\��OU�_�//hm>�m���W�j�S�>���b�� ���������V��%� h�BZ+g��<Qt.�����Tު*O?#��%� �k��-< �w�u/�0KF��>h�JA.���h��F�*oU�����hm�i���M ��\�.��@kH Z+��(jt~��:� ì����ڕ�\� r� �����Tު*O?#9�ځ:m�8��U��̉�K�@^�y���6���� Z @�ڨ� ��9�����M5��]�����|��jYg��Y�R�-�X��|��n� ���ۋ{]�X�
Y��Dw9�?��t�s�+�
]
f�k��rt�m�.*'g�G���Z+g��<Qt.�����Tު*O?#9��3��{t�י�.�l'o��_�=z<��s��Z ��Vsl��� �3%im��� v��v���PU�<
�1��1�4�H�֨-7��ogP���ͤC�/0�V3���5d����dw�U�j-r�'�E&�Pk�6��`|���w��t��c� ����%}����s ~�� �RZ� �Dk߿�V� � ��Vk���^>`,N�Z]�E ��2�ψU�w��l�m �&hmw�)�r<G$��L���T���no�p�}d/r4G���Z+g��<Qt.2��ٵi�B_�D孪��3B�lff�H�����| ø\����%}�%k��ܼR�
<TRUNCATED>
[34/39] isis-site git commit: ISIS-1810: updates docs for 2.0.0-M1
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/274edd1d/content/versions/2.0.0-M1/guides/htg.pdf
----------------------------------------------------------------------
diff --git a/content/versions/2.0.0-M1/guides/htg.pdf b/content/versions/2.0.0-M1/guides/htg.pdf
index a98f418..12683de 100644
--- a/content/versions/2.0.0-M1/guides/htg.pdf
+++ b/content/versions/2.0.0-M1/guides/htg.pdf
@@ -4,16 +4,16 @@
<< /Title (Hints & Tips Guide)
/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:20180812182323+01'00')
-/ModDate (D:20180812182323+01'00')
+/CreationDate (D:20180814003704+02'00')
+/ModDate (D:20180814003704+02'00')
>>
endobj
2 0 obj
<< /Type /Catalog
/Pages 3 0 R
/Names 18 0 R
-/Outlines 477 0 R
-/PageLabels 526 0 R
+/Outlines 476 0 R
+/PageLabels 525 0 R
/PageMode /UseOutlines
/OpenAction [7 0 R /FitH 842.89]
/ViewerPreferences << /DisplayDocTitle true
@@ -23,7 +23,7 @@ endobj
3 0 obj
<< /Type /Pages
/Count 58
-/Kids [7 0 R 10 0 R 12 0 R 14 0 R 16 0 R 31 0 R 36 0 R 41 0 R 47 0 R 53 0 R 62 0 R 70 0 R 80 0 R 98 0 R 112 0 R 114 0 R 126 0 R 131 0 R 137 0 R 139 0 R 145 0 R 153 0 R 160 0 R 166 0 R 169 0 R 180 0 R 184 0 R 186 0 R 194 0 R 198 0 R 200 0 R 204 0 R 206 0 R 214 0 R 216 0 R 222 0 R 229 0 R 240 0 R 247 0 R 257 0 R 263 0 R 268 0 R 278 0 R 286 0 R 288 0 R 295 0 R 299 0 R 304 0 R 307 0 R 316 0 R 318 0 R 325 0 R 329 0 R 332 0 R 347 0 R 349 0 R 364 0 R 375 0 R]
+/Kids [7 0 R 10 0 R 12 0 R 14 0 R 16 0 R 31 0 R 36 0 R 41 0 R 47 0 R 53 0 R 62 0 R 70 0 R 80 0 R 98 0 R 111 0 R 113 0 R 125 0 R 130 0 R 136 0 R 138 0 R 144 0 R 152 0 R 159 0 R 165 0 R 168 0 R 179 0 R 183 0 R 185 0 R 193 0 R 197 0 R 199 0 R 203 0 R 205 0 R 213 0 R 215 0 R 221 0 R 228 0 R 239 0 R 246 0 R 256 0 R 262 0 R 267 0 R 277 0 R 285 0 R 287 0 R 294 0 R 298 0 R 303 0 R 306 0 R 315 0 R 317 0 R 324 0 R 328 0 R 331 0 R 346 0 R 348 0 R 363 0 R 374 0 R]
>>
endobj
4 0 obj
@@ -80,11 +80,11 @@ endobj
<< /Type /Font
/BaseFont /AAAAAP+NotoSerif
/Subtype /TrueType
-/FontDescriptor 528 0 R
+/FontDescriptor 527 0 R
/FirstChar 32
/LastChar 255
-/Widths 530 0 R
-/ToUnicode 529 0 R
+/Widths 529 0 R
+/ToUnicode 528 0 R
>>
endobj
9 0 obj
@@ -1639,7 +1639,7 @@ endobj
/F1.0 8 0 R
>>
>>
-/Annots [384 0 R 385 0 R 386 0 R 387 0 R 388 0 R 389 0 R 390 0 R 391 0 R 392 0 R 393 0 R 394 0 R 395 0 R 396 0 R 397 0 R 398 0 R 399 0 R 400 0 R 401 0 R 402 0 R 403 0 R 404 0 R 405 0 R 406 0 R 407 0 R 408 0 R 409 0 R 410 0 R 411 0 R 412 0 R 413 0 R 414 0 R 415 0 R 416 0 R 417 0 R 418 0 R 419 0 R 420 0 R 421 0 R 422 0 R 423 0 R 424 0 R 425 0 R 426 0 R 427 0 R 428 0 R 429 0 R 430 0 R 431 0 R 432 0 R 433 0 R 434 0 R 435 0 R 436 0 R 437 0 R 438 0 R 439 0 R 440 0 R 441 0 R 442 0 R 443 0 R 444 0 R 445 0 R 446 0 R 447 0 R 448 0 R 449 0 R 450 0 R 451 0 R 452 0 R 453 0 R 454 0 R 455 0 R 456 0 R 457 0 R 458 0 R 459 0 R]
+/Annots [383 0 R 384 0 R 385 0 R 386 0 R 387 0 R 388 0 R 389 0 R 390 0 R 391 0 R 392 0 R 393 0 R 394 0 R 395 0 R 396 0 R 397 0 R 398 0 R 399 0 R 400 0 R 401 0 R 402 0 R 403 0 R 404 0 R 405 0 R 406 0 R 407 0 R 408 0 R 409 0 R 410 0 R 411 0 R 412 0 R 413 0 R 414 0 R 415 0 R 416 0 R 417 0 R 418 0 R 419 0 R 420 0 R 421 0 R 422 0 R 423 0 R 424 0 R 425 0 R 426 0 R 427 0 R 428 0 R 429 0 R 430 0 R 431 0 R 432 0 R 433 0 R 434 0 R 435 0 R 436 0 R 437 0 R 438 0 R 439 0 R 440 0 R 441 0 R 442 0 R 443 0 R 444 0 R 445 0 R 446 0 R 447 0 R 448 0 R 449 0 R 450 0 R 451 0 R 452 0 R 453 0 R 454 0 R 455 0 R 456 0 R 457 0 R 458 0 R]
>>
endobj
11 0 obj
@@ -1982,7 +1982,7 @@ endobj
/Font << /F1.0 8 0 R
>>
>>
-/Annots [460 0 R 461 0 R 462 0 R 463 0 R 464 0 R 465 0 R 466 0 R 467 0 R 468 0 R 469 0 R 470 0 R 471 0 R 472 0 R 473 0 R 474 0 R 475 0 R]
+/Annots [459 0 R 460 0 R 461 0 R 462 0 R 463 0 R 464 0 R 465 0 R 466 0 R 467 0 R 468 0 R 469 0 R 470 0 R 471 0 R 472 0 R 473 0 R 474 0 R]
>>
endobj
13 0 obj
@@ -2050,7 +2050,7 @@ endobj
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/Font << /F1.0 8 0 R
>>
-/XObject << /Stamp1 476 0 R
+/XObject << /Stamp1 475 0 R
>>
>>
>>
@@ -2582,7 +2582,7 @@ endobj
/F1.0 8 0 R
/F3.0 28 0 R
>>
-/XObject << /Stamp1 476 0 R
+/XObject << /Stamp1 475 0 R
>>
>>
/Annots [21 0 R 23 0 R 25 0 R 29 0 R]
@@ -2597,18 +2597,18 @@ endobj
>>
endobj
19 0 obj
-<< /Kids [116 0 R 369 0 R 265 0 R 174 0 R 117 0 R 273 0 R]
+<< /Kids [115 0 R 368 0 R 264 0 R 173 0 R 116 0 R 272 0 R]
>>
endobj
20 0 obj
<< /Type /Font
/BaseFont /AAAAAQ+NotoSerif-Bold
/Subtype /TrueType
-/FontDescriptor 532 0 R
+/FontDescriptor 531 0 R
/FirstChar 32
/LastChar 255
-/Widths 534 0 R
-/ToUnicode 533 0 R
+/Widths 533 0 R
+/ToUnicode 532 0 R
>>
endobj
21 0 obj
@@ -2657,11 +2657,11 @@ endobj
<< /Type /Font
/BaseFont /AAAAAR+mplus1mn-regular
/Subtype /TrueType
-/FontDescriptor 536 0 R
+/FontDescriptor 535 0 R
/FirstChar 32
/LastChar 255
-/Widths 538 0 R
-/ToUnicode 537 0 R
+/Widths 537 0 R
+/ToUnicode 536 0 R
>>
endobj
29 0 obj
@@ -5053,7 +5053,7 @@ endobj
/F4.1 32 0 R
/F2.0 20 0 R
>>
-/XObject << /Stamp1 476 0 R
+/XObject << /Stamp1 475 0 R
>>
>>
/Annots [34 0 R]
@@ -5063,11 +5063,11 @@ endobj
<< /Type /Font
/BaseFont /AAAAAS+FontAwesome
/Subtype /TrueType
-/FontDescriptor 540 0 R
+/FontDescriptor 539 0 R
/FirstChar 32
/LastChar 255
-/Widths 542 0 R
-/ToUnicode 541 0 R
+/Widths 541 0 R
+/ToUnicode 540 0 R
>>
endobj
33 0 obj
@@ -7082,7 +7082,7 @@ endobj
/F1.0 8 0 R
/F2.0 20 0 R
>>
-/XObject << /Stamp1 476 0 R
+/XObject << /Stamp1 475 0 R
>>
>>
/Annots [37 0 R 39 0 R]
@@ -9648,7 +9648,7 @@ endobj
/F1.0 8 0 R
/F3.1 45 0 R
>>
-/XObject << /Stamp1 476 0 R
+/XObject << /Stamp1 475 0 R
>>
>>
/Annots [44 0 R]
@@ -9675,11 +9675,11 @@ endobj
<< /Type /Font
/BaseFont /AAAAAT+mplus1mn-regular
/Subtype /TrueType
-/FontDescriptor 544 0 R
+/FontDescriptor 543 0 R
/FirstChar 32
/LastChar 255
-/Widths 546 0 R
-/ToUnicode 545 0 R
+/Widths 545 0 R
+/ToUnicode 544 0 R
>>
endobj
46 0 obj
@@ -11050,7 +11050,7 @@ endobj
/F1.0 8 0 R
/F3.0 28 0 R
>>
-/XObject << /Stamp1 476 0 R
+/XObject << /Stamp1 475 0 R
>>
>>
/Annots [49 0 R 51 0 R]
@@ -13480,7 +13480,7 @@ endobj
/F1.0 8 0 R
/F3.1 45 0 R
>>
-/XObject << /Stamp1 476 0 R
+/XObject << /Stamp1 475 0 R
>>
>>
/Annots [55 0 R 56 0 R 58 0 R 60 0 R]
@@ -15901,7 +15901,7 @@ endobj
/F2.0 20 0 R
/F3.0 28 0 R
>>
-/XObject << /Stamp1 476 0 R
+/XObject << /Stamp1 475 0 R
>>
>>
/Annots [65 0 R 67 0 R 68 0 R]
@@ -15911,11 +15911,11 @@ endobj
<< /Type /Font
/BaseFont /AAAAAU+NotoSerif-Italic
/Subtype /TrueType
-/FontDescriptor 548 0 R
+/FontDescriptor 547 0 R
/FirstChar 32
/LastChar 255
-/Widths 550 0 R
-/ToUnicode 549 0 R
+/Widths 549 0 R
+/ToUnicode 548 0 R
>>
endobj
64 0 obj
@@ -16986,7 +16986,7 @@ endobj
/F1.0 8 0 R
/F3.0 28 0 R
>>
-/XObject << /Stamp1 476 0 R
+/XObject << /Stamp1 475 0 R
>>
>>
/Annots [72 0 R 73 0 R 74 0 R 75 0 R 76 0 R 77 0 R]
@@ -18359,7 +18359,7 @@ endobj
/F2.0 20 0 R
/F5.0 63 0 R
>>
-/XObject << /Stamp1 476 0 R
+/XObject << /Stamp1 475 0 R
>>
>>
/Annots [81 0 R 82 0 R 83 0 R 84 0 R 85 0 R 87 0 R 88 0 R 89 0 R 90 0 R 91 0 R 92 0 R 93 0 R 94 0 R 95 0 R 96 0 R]
@@ -18534,7 +18534,7 @@ endobj
>>
endobj
97 0 obj
-<< /Length 36840
+<< /Length 29532
>>
stream
q
@@ -18785,7 +18785,7 @@ ET
q
0.5 w
0.933 0.933 0.933 SCN
-113.807 660.430 m
+113.807 648.430 m
113.807 747.330 l
S
Q
@@ -18797,7 +18797,7 @@ Q
0.067 0.067 0.067 SCN
BT
-80.17133333333334 695.3000000000001 Td
+80.17133333333334 689.3000000000001 Td
/F4.1 24 Tf
<21> Tj
ET
@@ -18822,7 +18822,7 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-2.355 Tw
+2.989 Tw
BT
125.80666666666667 715.586 Td
@@ -18837,10 +18837,10 @@ ET
0.694 0.129 0.275 scn
0.694 0.129 0.275 SCN
-2.355 Tw
+2.989 Tw
BT
-202.27374074074072 715.586 Td
+203.542375 715.586 Td
/F3.0 10.5 Tf
<40506172616d657465724c61796f7574286e616d65643d> Tj
ET
@@ -18852,10 +18852,10 @@ ET
0.694 0.129 0.275 scn
0.694 0.129 0.275 SCN
-2.355 Tw
+2.989 Tw
BT
-323.0237407407408 715.586 Td
+324.292375 715.586 Td
/F6.0 10.5 Tf
<c9> Tj
ET
@@ -18867,10 +18867,10 @@ ET
0.694 0.129 0.275 scn
0.694 0.129 0.275 SCN
-2.355 Tw
+2.989 Tw
BT
-333.5237407407408 715.586 Td
+334.792375 715.586 Td
/F3.0 10.5 Tf
<29> Tj
ET
@@ -18882,12 +18882,12 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-2.355 Tw
+2.989 Tw
BT
-338.7737407407408 715.586 Td
+340.042375 715.586 Td
/F1.0 10.5 Tf
-<20616e6e6f746174696f6e2e2020537570706f727420666f7220746869732063616e206265> Tj
+<20616e6e6f746174696f6e2e20537570706f727420666f7220746869732063616e206265> Tj
ET
@@ -18942,40 +18942,32 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-0.263 Tw
-
BT
125.80666666666667 684.0260000000001 Td
/F1.0 10.5 Tf
-<415346292e202028496e2074686520667574757265207765d56c6c20666f6c64207468697320696e746f20636f7265292e202053656520616c736f206f75722067756964616e6365206f6e20> Tj
+<415346292e2028496e2074686520667574757265207765d56c6c20666f6c64207468697320696e746f20636f7265292e> Tj
ET
-
-0.000 Tw
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-
-0.263 Tw
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
-483.453705078125 684.0260000000001 Td
+125.80666666666667 656.246 Td
/F1.0 10.5 Tf
-[<75706772> 20.01953125 <6164696e67>] TJ
+<53656520616c736f206f75722067756964616e6365206f6e20> Tj
ET
-
-0.000 Tw
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
0.259 0.545 0.792 scn
0.259 0.545 0.792 SCN
BT
-125.80666666666667 668.2460000000001 Td
+252.33166666666668 656.246 Td
/F1.0 10.5 Tf
-<746f204a6176612038> Tj
+[<75706772> 20.01953125 <6164696e6720746f204a6176612038>] TJ
ET
0.000 0.000 0.000 SCN
@@ -18984,7 +18976,7 @@ ET
0.200 0.200 0.200 SCN
BT
-168.48916666666668 668.2460000000001 Td
+349.3199615885417 656.246 Td
/F1.0 10.5 Tf
<2e> Tj
ET
@@ -18994,12 +18986,12 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-1.323 Tw
+1.151 Tw
BT
-48.24000000000001 636.466 Td
+48.24000000000001 624.466 Td
/F1.0 10.5 Tf
-[<546865206672> 20.01953125 <616d65776f726b20616c736f20737570706f727473206931386e3a206c6f63616c652d7370656369666963206e616d657320616e64206465736372697074696f6e732e20666f72206d6f726520696e666f726d6174696f6e2c>] TJ
+[<546865206672> 20.01953125 <616d65776f726b20616c736f20737570706f727473206931386e3a206c6f63616c652d7370656369666963206e616d657320616e64206465736372697074696f6e732e2046> 40.0390625 <6f72206d6f726520696e666f726d6174696f6e2c>] TJ
ET
@@ -19010,7 +19002,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24000000000001 620.686 Td
+48.24000000000001 608.686 Td
/F1.0 10.5 Tf
<7365652074686520> Tj
ET
@@ -19021,7 +19013,7 @@ ET
0.259 0.545 0.792 SCN
BT
-85.62 620.686 Td
+85.62 608.686 Td
/F1.0 10.5 Tf
<6265796f6e642d7468652d626173696373> Tj
ET
@@ -19032,7 +19024,7 @@ ET
0.200 0.200 0.200 SCN
BT
-175.668 620.686 Td
+175.668 608.686 Td
/F1.0 10.5 Tf
<2067756964652e> Tj
ET
@@ -19043,7 +19035,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24000000000001 580.8460000000001 Td
+48.24000000000001 568.8460000000001 Td
/F2.0 18 Tf
<312e352e2045616765722072656e646572696e67> Tj
ET
@@ -19054,7 +19046,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24000000000001 552.8260000000002 Td
+48.24000000000001 540.8260000000002 Td
/F1.0 10.5 Tf
[<42> 20.01953125 <792064656661756c742c20706172656e74656420636f6c6c656374696f6e7320616c6c2072656e6465726564206c617a696c79> 89.84375 <2c20696e206f7468657220776f72647320696e20612022636f6c6c617073656422207461626c652076696577> 69.82421875 <2e>] TJ
ET
@@ -19065,7 +19057,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24000000000001 525.0460000000003 Td
+48.24000000000001 513.0460000000003 Td
/F1.0 10.5 Tf
[<46> 40.0390625 <6f7220746865206d6f726520636f6d6d6f6e6c79207573656420636f6c6c656374696f6e732077652077616e7420746f2073686f7720746865207461626c6520657870616e6465643a>] TJ
ET
@@ -19074,14 +19066,14 @@ ET
0.000 0.000 0.000 scn
q
-0.000 0 0 0.000 48.240 509.230 cm
+0.000 0 0 0.000 48.240 497.230 cm
/I1 Do
Q
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
BT
-48.24000000000001 485.26600000000025 Td
+48.24000000000001 473.26600000000025 Td
/F1.0 10.5 Tf
[<46> 40.0390625 <6f72207468697320776520616e6e6f746174652074686520636f6c6c656374696f6e207573696e6720>] TJ
ET
@@ -19092,7 +19084,7 @@ ET
0.694 0.129 0.275 SCN
BT
-253.08408984375004 485.26600000000025 Td
+253.08408984375004 473.26600000000025 Td
/F3.0 10.5 Tf
<40436f6c6c656374696f6e4c61796f75742364656661756c74566965772829> Tj
ET
@@ -19103,7 +19095,7 @@ ET
0.200 0.200 0.200 SCN
BT
-415.83408984375 485.26600000000025 Td
+415.83408984375 473.26600000000025 Td
/F1.0 10.5 Tf
<3b20666f72206578616d706c65> Tj
ET
@@ -19112,28 +19104,28 @@ ET
0.000 0.000 0.000 scn
q
0.961 0.961 0.961 scn
-52.240 469.450 m
-543.040 469.450 l
-545.249 469.450 547.040 467.659 547.040 465.450 c
-547.040 318.790 l
-547.040 316.581 545.249 314.790 543.040 314.790 c
-52.240 314.790 l
-50.031 314.790 48.240 316.581 48.240 318.790 c
-48.240 465.450 l
-48.240 467.659 50.031 469.450 52.240 469.450 c
+52.240 457.450 m
+543.040 457.450 l
+545.249 457.450 547.040 455.659 547.040 453.450 c
+547.040 306.790 l
+547.040 304.581 545.249 302.790 543.040 302.790 c
+52.240 302.790 l
+50.031 302.790 48.240 304.581 48.240 306.790 c
+48.240 453.450 l
+48.240 455.659 50.031 457.450 52.240 457.450 c
h
f
0.800 0.800 0.800 SCN
0.75 w
-52.240 469.450 m
-543.040 469.450 l
-545.249 469.450 547.040 467.659 547.040 465.450 c
-547.040 318.790 l
-547.040 316.581 545.249 314.790 543.040 314.790 c
-52.240 314.790 l
-50.031 314.790 48.240 316.581 48.240 318.790 c
-48.240 465.450 l
-48.240 467.659 50.031 469.450 52.240 469.450 c
+52.240 457.450 m
+543.040 457.450 l
+545.249 457.450 547.040 455.659 547.040 453.450 c
+547.040 306.790 l
+547.040 304.581 545.249 302.790 543.040 302.790 c
+52.240 302.790 l
+50.031 302.790 48.240 304.581 48.240 306.790 c
+48.240 453.450 l
+48.240 455.659 50.031 457.450 52.240 457.450 c
h
S
Q
@@ -19141,7 +19133,7 @@ Q
0.600 0.600 1.000 SCN
BT
-59.24000000000001 446.6250000000003 Td
+59.24000000000001 434.6250000000003 Td
/F3.0 11 Tf
<406a61766178> Tj
ET
@@ -19152,7 +19144,7 @@ ET
0.200 0.200 0.200 SCN
BT
-92.24000000000001 446.6250000000003 Td
+92.24000000000001 434.6250000000003 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -19163,7 +19155,7 @@ ET
0.200 0.200 0.200 SCN
BT
-97.74000000000001 446.6250000000003 Td
+97.74000000000001 434.6250000000003 Td
/F3.0 11 Tf
<6a646f> Tj
ET
@@ -19174,7 +19166,7 @@ ET
0.200 0.200 0.200 SCN
BT
-114.24000000000001 446.6250000000003 Td
+114.24000000000001 434.6250000000003 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -19185,7 +19177,7 @@ ET
0.200 0.200 0.200 SCN
BT
-119.74000000000001 446.6250000000003 Td
+119.74000000000001 434.6250000000003 Td
/F3.0 11 Tf
<616e6e6f746174696f6e73> Tj
ET
@@ -19196,7 +19188,7 @@ ET
0.200 0.200 0.200 SCN
BT
-180.24 446.6250000000003 Td
+180.24 434.6250000000003 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -19207,7 +19199,7 @@ ET
0.200 0.200 0.200 SCN
BT
-185.74 446.6250000000003 Td
+185.74 434.6250000000003 Td
/F3.0 11 Tf
<50657273697374656e74> Tj
ET
@@ -19218,7 +19210,7 @@ ET
0.200 0.200 0.200 SCN
BT
-240.74 446.6250000000003 Td
+240.74 434.6250000000003 Td
/F3.0 11 Tf
<28> Tj
ET
@@ -19229,7 +19221,7 @@ ET
0.200 0.200 0.200 SCN
BT
-246.24 446.6250000000003 Td
+246.24 434.6250000000003 Td
/F3.0 11 Tf
<7461626c65> Tj
ET
@@ -19240,7 +19232,7 @@ ET
0.200 0.200 0.200 SCN
BT
-273.74 446.6250000000003 Td
+273.74 434.6250000000003 Td
/F3.0 11 Tf
<3d> Tj
ET
@@ -19251,7 +19243,7 @@ ET
0.800 0.200 0.000 SCN
BT
-279.24 446.6250000000003 Td
+279.24 434.6250000000003 Td
/F3.0 11 Tf
<22> Tj
ET
@@ -19262,7 +19254,7 @@ ET
0.800 0.200 0.000 SCN
BT
-284.74 446.6250000000003 Td
+284.74 434.6250000000003 Td
/F3.0 11 Tf
<546f446f4974656d446570656e64656e63696573> Tj
ET
@@ -19273,7 +19265,7 @@ ET
0.800 0.200 0.000 SCN
BT
-394.74 446.6250000000003 Td
+394.74 434.6250000000003 Td
/F3.0 11 Tf
<22> Tj
ET
@@ -19284,7 +19276,7 @@ ET
0.200 0.200 0.200 SCN
BT
-400.24 446.6250000000003 Td
+400.24 434.6250000000003 Td
/F3.0 11 Tf
<29> Tj
ET
@@ -19295,7 +19287,7 @@ ET
0.000 0.400 0.600 SCN
BT
-59.24000000000001 431.8850000000003 Td
+59.24000000000001 419.8850000000003 Td
/F3.0 11 Tf
<70726976617465> Tj
ET
@@ -19306,7 +19298,7 @@ ET
0.200 0.200 0.200 SCN
BT
-97.74000000000001 431.8850000000003 Td
+97.74000000000001 419.8850000000003 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -19317,7 +19309,7 @@ ET
0.000 0.467 0.533 SCN
BT
-103.24000000000001 431.8850000000003 Td
+103.24000000000001 419.8850000000003 Td
/F3.0 11 Tf
<536574> Tj
ET
@@ -19328,7 +19320,7 @@ ET
0.200 0.200 0.200 SCN
BT
-119.74000000000001 431.8850000000003 Td
+119.74000000000001 419.8850000000003 Td
/F3.0 11 Tf
<3c> Tj
ET
@@ -19339,7 +19331,7 @@ ET
0.200 0.200 0.200 SCN
BT
-125.24000000000001 431.8850000000003 Td
+125.24000000000001 419.8850000000003 Td
/F3.0 11 Tf
<546f446f4974656d> Tj
ET
@@ -19350,7 +19342,7 @@ ET
0.200 0.200 0.200 SCN
BT
-169.24 431.8850000000003 Td
+169.24 419.8850000000003 Td
/F3.0 11 Tf
<3e> Tj
ET
@@ -19361,7 +19353,7 @@ ET
0.200 0.200 0.200 SCN
BT
-174.74 431.8850000000003 Td
+174.74 419.8850000000003 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -19372,7 +19364,7 @@ ET
0.200 0.200 0.200 SCN
BT
-180.24 431.8850000000003 Td
+180.24 419.8850000000003 Td
/F3.0 11 Tf
<646570656e64656e63696573> Tj
ET
@@ -19383,7 +19375,7 @@ ET
0.200 0.200 0.200 SCN
BT
-246.24 431.8850000000003 Td
+246.24 419.8850000000003 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -19394,7 +19386,7 @@ ET
0.200 0.200 0.200 SCN
BT
-251.74 431.8850000000003 Td
+251.74 419.8850000000003 Td
/F3.0 11 Tf
<3d> Tj
ET
@@ -19405,7 +19397,7 @@ ET
0.200 0.200 0.200 SCN
BT
-257.24 431.8850000000003 Td
+257.24 419.8850000000003 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -19416,7 +19408,7 @@ ET
0.000 0.400 0.600 SCN
BT
-262.74 431.8850000000003 Td
+262.74 419.8850000000003 Td
/F3.0 11 Tf
<6e6577> Tj
ET
@@ -19427,7 +19419,7 @@ ET
0.200 0.200 0.200 SCN
BT
-279.24 431.8850000000003 Td
+279.24 419.8850000000003 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -19438,7 +19430,7 @@ ET
0.000 0.467 0.533 SCN
BT
-284.74 431.8850000000003 Td
+284.74 419.8850000000003 Td
/F3.0 11 Tf
<54726565536574> Tj
ET
@@ -19449,7 +19441,7 @@ ET
0.200 0.200 0.200 SCN
BT
-323.24 431.8850000000003 Td
+323.24 419.8850000000003 Td
/F3.0 11 Tf
<3c> Tj
ET
@@ -19460,7 +19452,7 @@ ET
0.200 0.200 0.200 SCN
BT
-328.74 431.8850000000003 Td
+328.74 419.8850000000003 Td
/F3.0 11 Tf
<3e> Tj
ET
@@ -19471,7 +19463,7 @@ ET
0.200 0.200 0.200 SCN
BT
-334.24 431.8850000000003 Td
+334.24 419.8850000000003 Td
/F3.0 11 Tf
<28> Tj
ET
@@ -19482,7 +19474,7 @@ ET
0.200 0.200 0.200 SCN
BT
-339.74 431.8850000000003 Td
+339.74 419.8850000000003 Td
/F3.0 11 Tf
<29> Tj
ET
@@ -19493,7 +19485,7 @@ ET
0.200 0.200 0.200 SCN
BT
-345.24 431.8850000000003 Td
+345.24 419.8850000000003 Td
/F3.0 11 Tf
<3b> Tj
ET
@@ -19504,7 +19496,7 @@ ET
0.600 0.600 1.000 SCN
BT
-59.24000000000001 417.14500000000027 Td
+59.24000000000001 405.14500000000027 Td
/F3.0 11 Tf
<40436f6c6c656374696f6e> Tj
ET
@@ -19515,7 +19507,7 @@ ET
0.600 0.600 1.000 SCN
BT
-59.24000000000001 402.40500000000026 Td
+59.24000000000001 390.40500000000026 Td
/F3.0 11 Tf
<40436f6c6c656374696f6e4c61796f7574> Tj
ET
@@ -19526,7 +19518,7 @@ ET
0.200 0.200 0.200 SCN
BT
-152.74 402.40500000000026 Td
+152.74 390.40500000000026 Td
/F3.0 11 Tf
<28> Tj
ET
@@ -19537,7 +19529,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24000000000001 387.66500000000025 Td
+59.24000000000001 375.66500000000025 Td
/F3.0 11 Tf
<ca202020> Tj
ET
@@ -19548,7 +19540,7 @@ ET
0.200 0.200 0.200 SCN
BT
-81.24000000000001 387.66500000000025 Td
+81.24000000000001 375.66500000000025 Td
/F3.0 11 Tf
<64656661756c7456696577> Tj
ET
@@ -19559,7 +19551,7 @@ ET
0.200 0.200 0.200 SCN
BT
-141.74 387.66500000000025 Td
+141.74 375.66500000000025 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -19570,7 +19562,7 @@ ET
0.200 0.200 0.200 SCN
BT
-147.24 387.66500000000025 Td
+147.24 375.66500000000025 Td
/F3.0 11 Tf
<3d> Tj
ET
@@ -19581,7 +19573,7 @@ ET
0.200 0.200 0.200 SCN
BT
-152.74 387.66500000000025 Td
+152.74 375.66500000000025 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -19592,7 +19584,7 @@ ET
0.800 0.200 0.000 SCN
BT
-158.24 387.66500000000025 Td
+158.24 375.66500000000025 Td
/F3.0 11 Tf
<22> Tj
ET
@@ -19603,7 +19595,7 @@ ET
0.800 0.200 0.000 SCN
BT
-163.74 387.66500000000025 Td
+163.74 375.66500000000025 Td
/F3.0 11 Tf
<7461626c65> Tj
ET
@@ -19614,7 +19606,7 @@ ET
0.800 0.200 0.000 SCN
BT
-191.24 387.66500000000025 Td
+191.24 375.66500000000025 Td
/F3.0 11 Tf
<22> Tj
ET
@@ -19625,7 +19617,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24000000000001 372.9250000000003 Td
+59.24000000000001 360.9250000000003 Td
/F3.0 11 Tf
<29> Tj
ET
@@ -19636,7 +19628,7 @@ ET
0.000 0.400 0.600 SCN
BT
-59.24000000000001 358.1850000000003 Td
+59.24000000000001 346.1850000000003 Td
/F3.0 11 Tf
<7075626c6963> Tj
ET
@@ -19647,7 +19639,7 @@ ET
0.200 0.200 0.200 SCN
BT
-92.24000000000001 358.1850000000003 Td
+92.24000000000001 346.1850000000003 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -19658,7 +19650,7 @@ ET
0.000 0.467 0.533 SCN
BT
-97.74000000000001 358.1850000000003 Td
+97.74000000000001 346.1850000000003 Td
/F3.0 11 Tf
<536574> Tj
ET
@@ -19669,7 +19661,7 @@ ET
0.200 0.200 0.200 SCN
BT
-114.24000000000001 358.1850000000003 Td
+114.24000000000001 346.1850000000003 Td
/F3.0 11 Tf
<3c> Tj
ET
@@ -19680,7 +19672,7 @@ ET
0.200 0.200 0.200 SCN
BT
-119.74000000000001 358.1850000000003 Td
+119.74000000000001 346.1850000000003 Td
/F3.0 11 Tf
<546f446f4974656d> Tj
ET
@@ -19691,7 +19683,7 @@ ET
0.200 0.200 0.200 SCN
BT
-163.74 358.1850000000003 Td
+163.74 346.1850000000003 Td
/F3.0 11 Tf
<3e> Tj
ET
@@ -19702,7 +19694,7 @@ ET
0.200 0.200 0.200 SCN
BT
-169.24 358.1850000000003 Td
+169.24 346.1850000000003 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -19713,7 +19705,7 @@ ET
0.200 0.200 0.200 SCN
BT
-174.74 358.1850000000003 Td
+174.74 346.1850000000003 Td
/F3.0 11 Tf
<676574446570656e64656e63696573> Tj
ET
@@ -19724,7 +19716,7 @@ ET
0.200 0.200 0.200 SCN
BT
-257.24 358.1850000000003 Td
+257.24 346.1850000000003 Td
/F3.0 11 Tf
<28> Tj
ET
@@ -19735,7 +19727,7 @@ ET
0.200 0.200 0.200 SCN
BT
-262.74 358.1850000000003 Td
+262.74 346.1850000000003 Td
/F3.0 11 Tf
<29> Tj
ET
@@ -19746,7 +19738,7 @@ ET
0.200 0.200 0.200 SCN
BT
-268.24 358.1850000000003 Td
+268.24 346.1850000000003 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -19757,7 +19749,7 @@ ET
0.200 0.200 0.200 SCN
BT
-273.74 358.1850000000003 Td
+273.74 346.1850000000003 Td
/F3.0 11 Tf
<7b> Tj
ET
@@ -19768,7 +19760,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24000000000001 343.4450000000003 Td
+59.24000000000001 331.4450000000003 Td
/F3.0 11 Tf
<ca202020> Tj
ET
@@ -19779,7 +19771,7 @@ ET
0.000 0.400 0.600 SCN
BT
-81.24000000000001 343.4450000000003 Td
+81.24000000000001 331.4450000000003 Td
/F3.0 11 Tf
<72657475726e> Tj
ET
@@ -19790,7 +19782,7 @@ ET
0.200 0.200 0.200 SCN
BT
-114.24000000000001 343.4450000000003 Td
+114.24000000000001 331.4450000000003 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -19801,7 +19793,7 @@ ET
0.200 0.200 0.200 SCN
BT
-119.74000000000001 343.4450000000003 Td
+119.74000000000001 331.4450000000003 Td
/F3.0 11 Tf
<646570656e64656e63696573> Tj
ET
@@ -19812,7 +19804,7 @@ ET
0.200 0.200 0.200 SCN
BT
-185.74 343.4450000000003 Td
+185.74 331.4450000000003 Td
/F3.0 11 Tf
<3b> Tj
ET
@@ -19823,7 +19815,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24000000000001 328.70500000000027 Td
+59.24000000000001 316.70500000000027 Td
/F3.0 11 Tf
<7d> Tj
ET
@@ -19834,7 +19826,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24000000000001 290.8260000000003 Td
+48.24000000000001 278.8260000000003 Td
/F1.0 10.5 Tf
[<416c7465726e61746976656c79> 89.84375 <2c2069742063616e206265207370656369666965642074686520>] TJ
ET
@@ -19845,7 +19837,7 @@ ET
0.694 0.129 0.275 SCN
BT
-229.24064062500003 290.8260000000003 Td
+229.24064062500003 278.8260000000003 Td
/F3.0 10.5 Tf
<5878782e6c61796f75742e786d6c> Tj
ET
@@ -19856,7 +19848,7 @@ ET
0.200 0.200 0.200 SCN
BT
-302.740640625 290.8260000000003 Td
+302.740640625 278.8260000000003 Td
/F1.0 10.5 Tf
<2066696c653a> Tj
ET
@@ -19865,28 +19857,28 @@ ET
0.000 0.000 0.000 scn
q
0.961 0.961 0.961 scn
-52.240 275.010 m
-543.040 275.010 l
-545.249 275.010 547.040 273.219 547.040 271.010 c
-547.040 198.050 l
-547.040 195.841 545.249 194.050 543.040 194.050 c
-52.240 194.050 l
-50.031 194.050 48.240 195.841 48.240 198.050 c
-48.240 271.010 l
-48.240 273.219 50.031 275.010 52.240 275.010 c
+52.240 263.010 m
+543.040 263.010 l
+545.249 263.010 547.040 261.219 547.040 259.010 c
+547.040 186.050 l
+547.040 183.841 545.249 182.050 543.040 182.050 c
+52.240 182.050 l
+50.031 182.050 48.240 183.841 48.240 186.050 c
+48.240 259.010 l
+48.240 261.219 50.031 263.010 52.240 263.010 c
h
f
0.800 0.800 0.800 SCN
0.75 w
-52.240 275.010 m
-543.040 275.010 l
-545.249 275.010 547.040 273.219 547.040 271.010 c
-547.040 198.050 l
-547.040 195.841 545.249 194.050 543.040 194.050 c
-52.240 194.050 l
-50.031 194.050 48.240 195.841 48.240 198.050 c
-48.240 271.010 l
-48.240 273.219 50.031 275.010 52.240 275.010 c
+52.240 263.010 m
+543.040 263.010 l
+545.249 263.010 547.040 261.219 547.040 259.010 c
+547.040 186.050 l
+547.040 183.841 545.249 182.050 543.040 182.050 c
+52.240 182.050 l
+50.031 182.050 48.240 183.841 48.240 186.050 c
+48.240 259.010 l
+48.240 261.219 50.031 263.010 52.240 263.010 c
h
S
Q
@@ -19894,7 +19886,7 @@ Q
0.200 0.200 0.200 SCN
BT
-59.24000000000001 252.18500000000031 Td
+59.24000000000001 240.18500000000031 Td
/F3.0 11 Tf
<3c> Tj
ET
@@ -19905,7 +19897,7 @@ ET
0.200 0.200 0.200 SCN
BT
-64.74000000000001 252.18500000000031 Td
+64.74000000000001 240.18500000000031 Td
/F3.0 11 Tf
<627333> Tj
ET
@@ -19916,7 +19908,7 @@ ET
0.200 0.200 0.200 SCN
BT
-81.24000000000001 252.18500000000031 Td
+81.24000000000001 240.18500000000031 Td
/F3.0 11 Tf
<3a> Tj
ET
@@ -19927,7 +19919,7 @@ ET
0.200 0.200 0.200 SCN
BT
-86.74000000000001 252.18500000000031 Td
+86.74000000000001 240.18500000000031 Td
/F3.0 11 Tf
<636f6c> Tj
ET
@@ -19938,7 +19930,7 @@ ET
0.200 0.200 0.200 SCN
BT
-103.24000000000001 252.18500000000031 Td
+103.24000000000001 240.18500000000031 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -19949,7 +19941,7 @@ ET
0.200 0.200 0.200 SCN
BT
-108.74000000000001 252.18500000000031 Td
+108.74000000000001 240.18500000000031 Td
/F3.0 11 Tf
<7370616e> Tj
ET
@@ -19960,7 +19952,7 @@ ET
0.200 0.200 0.200 SCN
BT
-130.74 252.18500000000031 Td
+130.74 240.18500000000031 Td
/F3.0 11 Tf
<3d> Tj
ET
@@ -19971,7 +19963,7 @@ ET
0.800 0.200 0.000 SCN
BT
-136.24 252.18500000000031 Td
+136.24 240.18500000000031 Td
/F3.0 11 Tf
<22> Tj
ET
@@ -19982,7 +19974,7 @@ ET
0.800 0.200 0.000 SCN
BT
-141.74 252.18500000000031 Td
+141.74 240.18500000000031 Td
/F3.0 11 Tf
<35> Tj
ET
@@ -19993,7 +19985,7 @@ ET
0.800 0.200 0.000 SCN
BT
-147.24 252.18500000000031 Td
+147.24 240.18500000000031 Td
/F3.0 11 Tf
<22> Tj
ET
@@ -20004,7 +19996,7 @@ ET
0.200 0.200 0.200 SCN
BT
-152.74 252.18500000000031 Td
+152.74 240.18500000000031 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -20015,7 +20007,7 @@ ET
0.200 0.200 0.200 SCN
BT
-158.24 252.18500000000031 Td
+158.24 240.18500000000031 Td
/F3.0 11 Tf
<637373436c617373> Tj
ET
@@ -20026,7 +20018,7 @@ ET
0.200 0.200 0.200 SCN
BT
-202.24 252.18500000000031 Td
+202.24 240.18500000000031 Td
/F3.0 11 Tf
<3d> Tj
ET
@@ -20037,7 +20029,7 @@ ET
0.800 0.200 0.000 SCN
BT
-207.74 252.18500000000031 Td
+207.74 240.18500000000031 Td
/F3.0 11 Tf
<22> Tj
ET
@@ -20048,7 +20040,7 @@ ET
0.800 0.200 0.000 SCN
BT
-213.24 252.18500000000031 Td
+213.24 240.18500000000031 Td
/F3.0 11 Tf
<637573746f6d2d70616464696e672d746f702d3230> Tj
ET
@@ -20059,7 +20051,7 @@ ET
0.800 0.200 0.000 SCN
BT
-328.74 252.18500000000031 Td
+328.74 240.18500000000031 Td
/F3.0 11 Tf
<22> Tj
ET
@@ -20070,7 +20062,7 @@ ET
0.200 0.200 0.200 SCN
BT
-334.24 252.18500000000031 Td
+334.24 240.18500000000031 Td
/F3.0 11 Tf
<3e> Tj
ET
@@ -20081,7 +20073,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24000000000001 237.44500000000033 Td
+59.24000000000001 225.44500000000033 Td
/F3.0 11 Tf
<ca202020> Tj
ET
@@ -20092,7 +20084,7 @@ ET
0.184 0.435 0.624 SCN
BT
-81.24000000000001 237.44500000000033 Td
+81.24000000000001 225.44500000000033 Td
/F3.0 11 Tf
<3c6370743a636f6c6c656374696f6e> Tj
ET
@@ -20103,7 +20095,7 @@ ET
0.200 0.200 0.200 SCN
BT
-163.74 237.44500000000033 Td
+163.74 225.44500000000033 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -20114,7 +20106,7 @@ ET
0.310 0.624 0.812 SCN
BT
-169.24 237.44500000000033 Td
+169.24 225.44500000000033 Td
/F3.0 11 Tf
<6964> Tj
ET
@@ -20125,7 +20117,7 @@ ET
0.200 0.200 0.200 SCN
BT
-180.24 237.44500000000033 Td
+180.24 225.44500000000033 Td
/F3.0 11 Tf
<3d> Tj
ET
@@ -20136,7 +20128,7 @@ ET
0.800 0.200 0.000 SCN
BT
-185.74 237.44500000000033 Td
+185.74 225.44500000000033 Td
/F3.0 11 Tf
<22> Tj
ET
@@ -20147,7 +20139,7 @@ ET
0.800 0.200 0.000 SCN
BT
-191.24 237.44500000000033 Td
+191.24 225.44500000000033 Td
/F3.0 11 Tf
<6e6f74596574436f6d706c657465> Tj
ET
@@ -20158,7 +20150,7 @@ ET
0.800 0.200 0.000 SCN
BT
-268.24 237.44500000000033 Td
+268.24 225.44500000000033 Td
/F3.0 11 Tf
<22> Tj
ET
@@ -20169,7 +20161,7 @@ ET
0.200 0.200 0.200 SCN
BT
-273.74 237.44500000000033 Td
+273.74 225.44500000000033 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -20180,7 +20172,7 @@ ET
0.310 0.624 0.812 SCN
BT
-279.24 237.44500000000033 Td
+279.24 225.44500000000033 Td
/F3.0 11 Tf
<64656661756c7456696577> Tj
ET
@@ -20191,7 +20183,7 @@ ET
0.200 0.200 0.200 SCN
BT
-339.74 237.44500000000033 Td
+339.74 225.44500000000033 Td
/F3.0 11 Tf
<3d> Tj
ET
@@ -20202,7 +20194,7 @@ ET
0.800 0.200 0.000 SCN
BT
-345.24 237.44500000000033 Td
+345.24 225.44500000000033 Td
/F3.0 11 Tf
<22> Tj
ET
@@ -20213,7 +20205,7 @@ ET
0.800 0.200 0.000 SCN
BT
-350.74 237.44500000000033 Td
+350.74 225.44500000000033 Td
/F3.0 11 Tf
<7461626c65> Tj
ET
@@ -20224,7 +20216,7 @@ ET
0.800 0.200 0.000 SCN
BT
-378.24 237.44500000000033 Td
+378.24 225.44500000000033 Td
/F3.0 11 Tf
<22> Tj
ET
@@ -20235,7 +20227,7 @@ ET
0.200 0.200 0.200 SCN
BT
-383.74 237.44500000000033 Td
+383.74 225.44500000000033 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -20246,7 +20238,7 @@ ET
0.184 0.435 0.624 SCN
BT
-389.24 237.44500000000033 Td
+389.24 225.44500000000033 Td
/F3.0 11 Tf
<2f3e> Tj
ET
@@ -20257,7 +20249,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24000000000001 222.70500000000033 Td
+59.24000000000001 210.70500000000033 Td
/F3.0 11 Tf
<ca202020> Tj
ET
@@ -20268,7 +20260,7 @@ ET
0.184 0.435 0.624 SCN
BT
-81.24000000000001 222.70500000000033 Td
+81.24000000000001 210.70500000000033 Td
/F3.0 11 Tf
<3c6370743a636f6c6c656374696f6e> Tj
ET
@@ -20279,7 +20271,7 @@ ET
0.200 0.200 0.200 SCN
BT
-163.74 222.70500000000033 Td
+163.74 210.70500000000033 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -20290,7 +20282,7 @@ ET
0.310 0.624 0.812 SCN
BT
-169.24 222.70500000000033 Td
+169.24 210.70500000000033 Td
/F3.0 11 Tf
<6964> Tj
ET
@@ -20301,7 +20293,7 @@ ET
0.200 0.200 0.200 SCN
BT
-180.24 222.70500000000033 Td
+180.24 210.70500000000033 Td
/F3.0 11 Tf
<3d> Tj
ET
@@ -20312,7 +20304,7 @@ ET
0.800 0.200 0.000 SCN
BT
-185.74 222.70500000000033 Td
+185.74 210.70500000000033 Td
/F3.0 11 Tf
<22> Tj
ET
@@ -20323,7 +20315,7 @@ ET
0.800 0.200 0.000 SCN
BT
-191.24 222.70500000000033 Td
+191.24 210.70500000000033 Td
/F3.0 11 Tf
<636f6d706c657465> Tj
ET
@@ -20334,7 +20326,7 @@ ET
0.800 0.200 0.000 SCN
BT
-235.24 222.70500000000033 Td
+235.24 210.70500000000033 Td
/F3.0 11 Tf
<22> Tj
ET
@@ -20345,7 +20337,7 @@ ET
0.200 0.200 0.200 SCN
BT
-240.74 222.70500000000033 Td
+240.74 210.70500000000033 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -20356,7 +20348,7 @@ ET
0.310 0.624 0.812 SCN
BT
-246.24 222.70500000000033 Td
+246.24 210.70500000000033 Td
/F3.0 11 Tf
<64656661756c7456696577> Tj
ET
@@ -20367,7 +20359,7 @@ ET
0.200 0.200 0.200 SCN
BT
-306.74 222.70500000000033 Td
+306.74 210.70500000000033 Td
/F3.0 11 Tf
<3d> Tj
ET
@@ -20378,7 +20370,7 @@ ET
0.800 0.200 0.000 SCN
BT
-312.24 222.70500000000033 Td
+312.24 210.70500000000033 Td
/F3.0 11 Tf
<22> Tj
ET
@@ -20389,7 +20381,7 @@ ET
0.800 0.200 0.000 SCN
BT
-317.74 222.70500000000033 Td
+317.74 210.70500000000033 Td
/F3.0 11 Tf
<7461626c65> Tj
ET
@@ -20400,7 +20392,7 @@ ET
0.800 0.200 0.000 SCN
BT
-345.24 222.70500000000033 Td
+345.24 210.70500000000033 Td
/F3.0 11 Tf
<22> Tj
ET
@@ -20411,7 +20403,7 @@ ET
0.184 0.435 0.624 SCN
BT
-350.74 222.70500000000033 Td
+350.74 210.70500000000033 Td
/F3.0 11 Tf
<2f3e> Tj
ET
@@ -20422,7 +20414,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24000000000001 207.96500000000032 Td
+59.24000000000001 195.96500000000032 Td
/F3.0 11 Tf
<3c> Tj
ET
@@ -20433,7 +20425,7 @@ ET
0.200 0.667 0.667 SCN
BT
-64.74000000000001 207.96500000000032 Td
+64.74000000000001 195.96500000000032 Td
/F3.0 11 Tf
<2f> Tj
ET
@@ -20444,7 +20436,7 @@ ET
0.200 0.667 0.667 SCN
BT
-70.24000000000001 207.96500000000032 Td
+70.24000000000001 195.96500000000032 Td
/F3.0 11 Tf
<627333636f6c3e> Tj
ET
@@ -20457,7 +20449,7 @@ ET
1.072 Tw
BT
-48.24000000000001 170.08600000000033 Td
+48.24000000000001 158.08600000000033 Td
/F1.0 10.5 Tf
<4974206d696768742062652074686f75676874207468617420636f6c6c656374696f6e732074686174206172652065616765726c792072656e64657265642073686f756c6420616c736f2062652065616765726c79206c6f616465642066726f6d> Tj
ET
@@ -20470,7 +20462,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24000000000001 154.30600000000032 Td
+48.24000000000001 142.30600000000032 Td
/F1.0 10.5 Tf
[<7468652064617461626173652062> 20.01953125 <7920656e61626c696e672074686520>] TJ
ET
@@ -20481,7 +20473,7 @@ ET
0.694 0.129 0.275 SCN
BT
-194.30529492187503 154.30600000000032 Td
+194.30529492187503 142.30600000000032 Td
/F3.0 10.5 Tf
<64656661756c74466574636847726f7570> Tj
ET
@@ -20492,7 +20484,7 @@ ET
0.200 0.200 0.200 SCN
BT
-283.55529492187503 154.30600000000032 Td
+283.55529492187503 142.30600000000032 Td
/F1.0 10.5 Tf
<206174747269627574653a> Tj
ET
@@ -20500,37 +20492,413 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
q
+0.000 0.000 0.000 scn
+0.000 0.000 0.000 SCN
+1 w
+0 J
+0 j
+[ ] 0 d
+/Stamp1 Do
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+535.978 14.388 Td
+/F1.0 9 Tf
+<3131> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+Q
+Q
+
+endstream
+endobj
+98 0 obj
+<< /Type /Page
+/Parent 3 0 R
+/MediaBox [0 0 595.28 841.89]
+/Contents 97 0 R
+/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
+/Font << /F2.0 20 0 R
+/F1.0 8 0 R
+/F3.0 28 0 R
+/F4.1 32 0 R
+/F6.0 101 0 R
+>>
+/XObject << /I1 106 0 R
+/Stamp1 475 0 R
+>>
+>>
+/Annots [99 0 R 100 0 R 102 0 R 103 0 R 104 0 R 108 0 R 109 0 R]
+>>
+endobj
+99 0 obj
+<< /Border [0 0 0]
+/A << /Type /Action
+/S /URI
+/URI (../rgant/rgant.pdf#_rgant-ParameterLayout_named)
+>>
+/Subtype /Link
+/Rect [217.50650040000002 767.577 343.50650040000005 778.077]
+/Type /Annot
+>>
+endobj
+100 0 obj
+<< /Border [0 0 0]
+/A << /Type /Action
+/S /URI
+/URI (../rgant/rgant.pdf#_rgant-ParameterLayout_describedAs)
+>>
+/Subtype /Link
+/Rect [383.77300080000003 767.577 541.2730008000001 778.077]
+/Type /Annot
+>>
+endobj
+101 0 obj
+<< /Type /Font
+/BaseFont /AAAAAV+mplus-1p-regular
+/Subtype /TrueType
+/FontDescriptor 551 0 R
+/FirstChar 32
+/LastChar 255
+/Widths 553 0 R
+/ToUnicode 552 0 R
+>>
+endobj
+102 0 obj
+<< /Border [0 0 0]
+/A << /Type /Action
+/S /URI
+/URI (http://platform.incode.org)
+>>
+/Subtype /Link
+/Rect [244.6054059606481 696.74 325.8679657841435 711.0200000000001]
+/Type /Annot
+>>
+endobj
+103 0 obj
+<< /Border [0 0 0]
+/A << /Type /Action
+/S /URI
+/URI (../../migration-notes/migration-notes.pdf#_migration-notes_1.8.0-to-1.9.0_upgrading-to-java8)
+>>
+/Subtype /Link
+/Rect [252.33166666666668 653.18 349.3199615885417 667.46]
+/Type /Annot
+>>
+endobj
+104 0 obj
+<< /Border [0 0 0]
+/A << /Type /Action
+/S /URI
+/URI (../ugbtb/ugbtb.pdf#_ugbtb_i18n)
+>>
+/Subtype /Link
+/Rect [85.62 605.62 175.668 619.9000000000001]
+/Type /Annot
+>>
+endobj
+105 0 obj
+[98 0 R /XYZ 0 592.8700000000001 null]
+endobj
+106 0 obj
+<< /Type /XObject
+/Subtype /Image
+/Height 793
+/Width 1266
+/BitsPerComponent 8
+/ColorSpace /DeviceRGB
+/SMask 107 0 R
+/Length 78104
+/Filter [/FlateDecode]
+/DecodeParms [<< /Predictor 15
+/Colors 3
+/BitsPerComponent 8
+/Columns 1266
+>>]
+>>
+stream
+x��yPT����{��x��}���N�:�8Dc�'��(�ǃJ�(�Ĩā�D ���1 �A�٨�N�� QT�6� �B�:��~{� v���t7��֧���k�=�6�k�Ճ���r `� ��� ��X�봙��!�� ��Z�8- �ځ��@k V
��G>G��� ���af��� �=�9���n�s��� g.v��A�}׀� �]�9k�����g'����;w�xn�>��gh�;� `��ϙ� �R^^�e��y_.
=TUU��ɓ��l�[�i7w���f:.���vۯ} ��Θ�d︐�����w4�v� � X5z�6��ڭ������ A]]��h���������Φ���A*@����_�~-��Eگ� � 0@k V�!Z�� =o�I�E����1�'f~�|��Ì�3���n߾��{o��{��}��%#3��Çv V�SZ;Ho̼'_���\N {�'�Z �Uc��+ݾ---����䵽��@&�
���yd���eee�{������D���]�� |�������?���օ�� X5�h-�vX�!4�PMM͞ ���������G� ��R1*<��/ H(�ϟ�`��ۏ��.�K���� � C��rZ�UTT�T*��͵sp|��ɵk�f]^^^YY�֪����wZ/h- ���%��/�y��mss��/_c�d]L쉗/_���?x��ѣG��n++/ ���s@�!�$ƒ���n?�S8���zAk V� ����k7w��9�f����q���
于��s\���Y`�p�|g�Ek�/�B ��` ��v }��w�̣�V2W� ,� ��#,~�&�ڴ�� ����cUZ�)� ����c=Zk]_�%�m��K�e � �
j!�z � Z�{��_nO��+-���\kݣ�� �v��y3���Z�
j!�z � Z ��C�ݒֶ<�Z��"K b���A- � ����Z�.�ˁk�k,mO�����j'o� ��M���7��<��:!V j!�N,�
��� ��h���gK�e<����7!V j!�N�a �Sz��+�BW-bH���<|�� 0�1Zk7&�/ݗq�� �}��iE���߮�����?}�[[[k �B�$7
+�Sk�6�ِ<S�F���
Iu�� ��h�]y���\�2s����֯�۱�:?��$���զǙWS"6oX�ЀY�ޭPk��a�Y�t��r�#�p�bٚc����i�+
+ `f���MgdK�e����CC�~�
��#+�n*<O4>sܻ�����&T�5�밥�ӥ-��Ur�j�����>����� f�8�u
��8r]����ƍ9��֮q�%���B��]i�B�֞�-�y��:�.�t $ϐ��D�uԶ�cd�! {��]�ve��ҁ j3�r��%��|N�Pk��h+��\ �5��Z�����2=CB+���e������J˻�٬� ]i��rS/�Kձ6�Ck+�G�� �l��Bk�oo�zK ��BmF��v}B�ˑ{��0���{�m|��/* �91Bk�"��w�R�{|�q�F7�����Ƕ_ͻM/� k,<1.4��H��]=T"��I q-h��B��� ʽ���j�Z� ~s�r��5�`W�);l�/��9� � �S���
+�C��]{��^��,
+���je�����^?-���DŽ�G� ~H�� *�t\|�YpGd?�A��7��$빵ׅ��0������5Ei��THY��.#y�
�9�~W���"#p1[��u�w���5�g�F�UY��$�����g�.9r�
+�
e�W\=��C�GM8� ��W� �'�1q���Z�_W �a�ֺG=q9p�y��y��������o��?��� x�$�G�'7�S�~�Q���j,�H��Ѻ�ZNc%jٕ߳���D�8�)�X�٬$r�������˗U��j�ϯP���V�<���f���j9�~����s/W�* ��� �V�^�v��V�+�_Z �`��.�q��[{��aK���ڒ����z`��̘��b kk�֊l8C��sr����
ӥ��.��q&ߩ�)�R�zu���u]U#�ڴu�B-��+T_'����k-���"�v%���D�k�);lŷ�� +�w� ��`�֮�{�t_���Z.YW2=\�_M W
+mS�����?o��X�;=W��n)--ձv����5��3�"�u��dIEE�ڬR����9�,V_S�֒�~�Uk�Q��Z��{=�#�:T�;��=���v�R+���oZ�δ��U�Vh����%�[�� �����7��<0�ynܸ�xl���Os�Hkk ����ԑ݉G�<����[ݫ�U���~�b�Ô��r� ~O�C�z �o�N� �(d;t+� �^o��l�,�R?��ڴ�C������A�=�2� �"jK���U��#�lݱ&��37������h� `��Z���qE�����ظf���$�27�B,������ � ��ܹ��o7�^U����
�wf(�ܧX>����d�!��Y��%�zzk����\O�١�韘�ƴ
ne-�w�8��.dg��ד��{�?�P+���>�~#�\v��SN �;�I��x ��v�Ệw�}������鵱�����<]�%
8ut�J�S'L��l���.� ����G-��������.Yqߔ �
9%L������ }M7Z�1�~龌ϻՕ��F�`�sg��Ls�rv�x`��O��L��n3�k���iSO�0~��Og/.))1�A!VjKԢ�]�g�tU���W ��lw&<���S�_` ����]�`Gt�!����;���Ў[�:n�j�/WF̚)�<�ݴ
vv�i�}:�ǯ�XC����Xm�EQ��7����n� } �oB���*u
Ϸ� �k�i�3���2.�Uto*��R����i�M��r�-X ?o���� bql�ɕ;~ ;k�����Z�k�(jWԺ��mCb��(�Pz���61�x���_` ��F�ֺ��{ �ni B`�]u�Jݒ��S���sz�W���:�Gl��/0 @_�Sk����s�,m@� �+�[z�*�Li0���i� ����Z��'�E�.Ժ� < �ޣ]k���-�q���� �P�6F-��� �_�Ek�4\��]\{^�`i�Al�uQ��� ���.ݗ��|O�"} jc�Һ�= 0
+��ZZpAAA�'��"� � � �8�ZAAA� Z� � � ���@k͚/^ܺu+%%% AAAd ����$>��,h�YCN������މ � � 2�"�ɲ���l��Y�Z�&%%N� � � � �T*%�1�gAk͚��xK�1AAA��
��9= Zk�@kAA���@kAA���� <x044�+BkAA鏑�1�p�����jo6�ݛGl{_��ɓ'i��Ћ��Z�}J^��i]�� �m�ZK
%99yǎ �&��5�� � � �(S^^NBB�s�7U]cc`�~���Ӓtm۶ʹ{CN+�Hzo�.\psss�-��8/�Y�ܺ����l�k-�n���%���nހAAA(QQQd����w�};�mV[[۳�<�X�gZ{��I�I�����Z��*;?M��ޛ-�+'����Bz��e�҃��N[ͦf�GkI\�6jm]���`nn��fS 7�ঁm����)4?��4�vM]n��ߗ� z��Ec�PLvek�
++C,�����T��b]�� �Wh�q��C� #��Mқ"_�M�a�[
+φi9S��J�H�]�Q}^��wLj � �Xc�iY����\R^^NfAjڃѠ�S�F� C��Lk{,k�im�:-�^�-���Ir��)����L�V�-c�V��RâݦF�\���-}Dt�?�����]R5�<+�
�)%�먾�hg`e�A����H��r!4��"�`�c�ֶ� �v-ے.�)�zR)�k����S�-.c�H��t�T楆2�ʯ���P|<�Q`h-� � � ,��i���֒�&%%[�H$�Ά^R�z{k��\zc�܉���lozk5����f�Kk�aQ%�~�.ZK �[���z�Vk �{*�R�c�$�7<W��-7E�1y FV�8U���G1Fk����
+W�`Åq�ړ ��)�O!~�D*Q��.;\�]Vv��=�� � �Յ�A׀ᨨ(��?d���L2�=[K/�b1��
+�Z�J��5��r��r�� {�L�5Jku9-��V��n߾=$$D��;v����J�{�~��I.�<����¸�f��,�-��,��)Jʗtjh�M�wL��#���}ul�U�x���R�&E��<+$3�I��/�T�Hk��P�²T��ϻ. �e�f� ���CF}�o�9��bke�b�sP�D�Cf�| �r�H_A�� �L�QF�jà�����_�8_��]���+ =[���lTvwǠ����A?�-����ܚ�+�~�5� � bu!wؽ{w'+���В��t~���( �T�j�fB���Qr�R��̭�572'�݆�^g�� ߇�o��ե��=�]zk;=�: Ok��x���J��t���e�����_z�3�j�qַ� �T3%�W�� ��Ҫ^i��I � ��- <F��wy���WҼ+y���{k�U�VK^�?�h�T�C��]���eTa��_^�.�P ���qk�֫ �E�!��<qn��úl�?m�UQ9[���l�Lj�!43`:&� G-͍�m�ՠ�<��j�Yy�����7�
���AMoT��[ �B��
+�AA� ��%V^^^� �њ5k��� �3���d��sN��1I+ �l��57r��Z:"���7Jź=|3h�M�`�T�Cy�1��j�r��U�٥��L^���w���O��������LӤurka\�J!c䲫�T�*̄?��#/��?z!��' �L��++��&}�7�b�� [U�x��2�s���C�0h�����ҩi��Ǚ�J1����+;�Se�庞*��"� ��3���%w�:H������c;�Gj����0ͅ�+��)��Cm����� deh����k� �ZC�1|���R��R�Q���C��� �����s���e�&k�Z��*�����p�����.N�ڴV�-�(߲n(a���%!c�Ff�Am
+d����S�0Ο��2EaU�������V}(0N-�T�62\1mj�{g�ֲ^�
+��Sy��CkAAޥ�;h~�g�z��� ����^Yz��~#�������ٌf�GSFq��)�5}����2��SU�J-;n�t�j,g?�=���j��UOo����ڄ*�<��� b�f \X�R7UF���C�B��)ʨl/�Zg%;"�PÊ � �a�.��J!W�F '�a^q�P�X-�ժu(u=T��2�^j��Xi� ��Z� � �.� ������-::Z,'''�[g�kli���� sSL)�1��k���r1���� ~֬Y�� ~�_i[ZZjT�}��2��v�?#T�ݾ};0� ~Z��&� |}�9�, ��lm�`����������Z�s�b�|6$��C>`����KɟO徊���d� ����侳G�Ff�����/
r.��ڊD�������:��e&`�U|�+3W�� ?L��q���d�jߙ��kL^]�utjmq�o�ٲ��j��LxL���Y����]��ZAA�w,�ܔ�dd����QQQ����XJ�9C�z粕Ǫ����Ͷ�N�E鮡����ȹ���[��x����
���M��9N���B��Aw�Q� ���e7 1o40o���=�3��q� z��f���Z�k�y���D˓\�7ݹe�.�B�rySF)g���dW*�Q5�ph�D5�������*�������y �ꤒT���/(�RY�ڇu���r�U�cJ�.�OIka*�3��]+�U(_G�γ�Gk�o�a
+�����yQ�-��"� � z���Y�� sV�Ć�D�K�� �� �l�ݞ���i�dee)O7?��N�l��d͖�퐐�d6�@vZ��iE���Z*]�A�e*�B+8bAA���3[�Ÿ���J�}o�n@��X�Q]�Q� �Glz�\h��9�&-�����=�^�4d�R�~��T�P~I������(�u�e�9 ���|+�� AAA�J�N˕���F ���zk���ݻW��8U�Z� �� }� z��L��� � bx���Z�7��"� � 2�� ȁ�"� � 2�� ȁ�"� � 2�� �IIIioo�tCAA�H�R sz�֬�u�֕+W^�ze閆 � � b��d��l��Y�Zs��6%%% AAAd ���ŋ�,h-� � � ҏ�EAAA�q��� � � H?�AAA�Ǒkm��t ��!��џ-���Z�� 3�d|�� �h- �~ � @?Z � � Џ�� ��@k �ct�kLL�)��Ә
�}��e����=e��Z�m�� ���rZ.��ڦ����??,˂� Џ ��e�}��'��|bf�
OiS � � �;�V��C�}��u�ͤ #>���v8}���A�^�Ak �B��z�WZ��훇Orc��|�='�g~��TL� � �+�ڦ����l �l�g$��,m�Z @+֢��ڢ��
+�m�%ML�
�������]�=�R��gӋ�o�j�ڏ�/���%z�����j���-��v� �2���� c�
+�moo;�-
+��
N��l�7qz`�m@���i;���++���=g��Z��?%���;FM�B�)�b���3��Ig/Ɵ��&����%n�?�$�?�=D5��G8j�<��� ` ay�}�������Ɏ���9=��v_�� ��c�y ��c��� ���ͫ�z�Z�;D�߿7o�ttt477+�xm�1t�L]�`�w;��W�^)˷���}�V����{����ozy�m绔�WR�%�e���c� 9 $,��u
ώ�^u �^x�>��̐T�Z��Q6;�?��2>��J�-�1��}[��Z;�S�������_8d�?�����m�rɿ��_�Ot�u
+8��t����_�&/� C�O�����5/��'v���i�^:k�Nŷ��lزc�͗�� ���3�k���Z+m�?��I�fP<�@����3��
+�v�ob��Q�>C�� +�1�d�К�����Z�� ����v̧��,��`����/]�e������^���ˈq��c�FD�z��0��S��/���
���+7���D����v�=IaNNΜ/��|�2>)e��|~�Is�O��+za�p��7��x~b�O��}�2�a����F�{|o�x��M�$�v���AJ�I�:k�=-�� �?����Φ{��>�����첏���W��\��,�o� p
+��)--/�Nv0z� ���rMMjygi��2zڛ���ֶ��%f��� ��za�/����]�LO� �x�*���^�sX��J�}���?�z�����dߡ��%�յ�ē��}�J{ԥ���ۖ������ѓ�c������ʪ?���VU��sg��V=�v�UGǑ#G���v�ڿ�>}��\�����t���Դ-?
+h��:�Y��\��ho ;�x�<}D�+� �:E�k�v .� �>�̼h���Z,�L�)!+͊^��
T;w�:; O����|@γ�h' �� )e����v��Ak�W6��rת�� *S
���?��4tv����:��� ��{t��Y�/ڊ��Q%����_���G��� ˸ \SyN�)ΞCBQSU���!�
���v������TڱfI�j�� Uu��t�D5k07h���fb,��o�}x���ya�s_�} �>��p�M�����G�������wx��IkKw -�����VY��Z���£� mmm�����oؼ��{� �[Qd�;fjb=Z;q���ҧuuus,�p�|���J� >���H�Q���II�ܥ:g�J>{�N��
+��gyx�uttlں���>�0{ٹK�jjj� ���� �B�
R鍛9cl�3���l�IɆ��N˜3�\��������W��?}���\EU����?D�����uU5mUY��X�b< �Fk�
+���6@���76Z�(�4Fk-I����gU��:��+���i 2�]Ӫ�5m�b��d�_l�1�u`�!�j3��ںN��JwM�����|XLkK* �_\q��ܰ�9����>��|��(�� 4�������j���~ �ԇ��G��^8�ivb���;: ��՞;�_�JNN 2t�_?�1�a�ݗ�Y�������_=ZK�I J��e+�FN���v�w��E�����q3�OtpY����>.>qĤٚ��^��ieUAA��G� 5� �y_K >��#�M�
+pZKgc�>�� A~h3�o���ֶ ~�=�SG�Z����l��i�`�����KW�+**�;��Ö��� �g��_=�K�䟪]Z�9��m����4qi{,�`>U��Mv?��CY�ą�
ٻ�0�(/*YaNQ �����h��ܮ��{��+/x��:F�� N�2n�%.� iQ���w����ϸ��� 4�! ���v�gg
+ۘ��{�{�tҔF�^e��J� ��x�O?8�T~3��6$�nf��hɳ�sUt������?f�1�������t�����'(]E�[[ys_���ݓ���M�D�=|��鬿����X���q�����K��6�`��xr +jS��[�V�_~���u9Һt�4o�L��~̝�Xm�(�\~Yx�����h*����
+��3_%�]� ]�.�����פ�mJ��%���~X 5�����m�l��1�V�֪�iwM�kW��N~�����~�+Ֆ��+�\Ɯ �֗�n���&��kkԠ��o��k洖jh(�Wö��� n j2�cQ����u�b�}!�
��zmnX�}�va�?���Q�`�,pd�`�t�/�|P����r��^�������b�96j�����m2��Z{29���e��ZQe��y��sӇ����ڻ
+�����ej>�����?�&��i��ҴK�d2ِc5��������������C�aQ �_�^���u�rZK���}�S>�֚�rC� �w��?z
+�����=QY�jO �y�W��5���ԑ���\3 �k��s�4��i��� �� /�Ϣ~�U�uY�������*W���b���oW�]0u9"�o��� ���GV{P��족6�Z�^x�]��0O�ż��g��3����"�� 0�ֺ{� ��F�����'�|L�^E�ƆQ�M���^vu~o�J�2J�ر�t7Bw l�r��i-� ���cUVM��3��X� S�T��w,>�S)����i�fnc�7��K�f�$�NE]�/��J��ɔ;�E��OVz/Ï�c��i�tJ��\����hN3?�Ѯ>��thmgM���N�����K&�ɿi���Ӌ�8۩�ćE�xj;]jc�H&5���&� �c��N�?�hk��Y��n�L��t�3��=B~/ �>���!��MM�h��lE���2�m�v�և.��|��3w�όV�Z��u�b�}�*;��="{��������mj��|4�mߨ?��l
+`��j��Gۇ�l��y��1K> ���ɘ�qcS�L,�+0Jko�Ϋ���=o��O �ef,rm�6��� o�Gk��X��ŋ_,Z6�ɍv>22r��w��[�kt"- ;nR�u��;%��@ � ��@�o���$�gf�z��_9��J8�������\�拯K�>��|6|�n�ޠ`��/qkmm۶m��L�Jkc�?�yɗ����Z�$�r�� �� L��l*�� �*�G���7zk�N2ϝ��b�\�Eܔ �!C��OV�~S0c��w�gֳffu���N��i���Z�J��0+��մ� ������`��P��H-�*�f �� x7 �;
+f�ov 3h���#�2���k��@:�WrCm�[E�'� n*�~F1��D.oj7r Fk۫�*٣����\��۰ˍ�h�O�黅��m����u�|�&��G�;���TGҦ��γ�؟/�2T�T�u ���պ�윢g�\�me��Fa�zk�k�>��S�j��Εȟ��o]^��]��+�ݩ��Q+�"����Au�)v������&��6��vt�_�Ć_�"�C�[I�'�� ��?�=hT���]#
+v|xm��s� '��G�� �&�O��I��)��'N w��I�!A�/_��9w �����r�(�/�eHk_44�u�4=Z������������8:���?y|�d�xc�ڰ�Z>��]�upZ[]SWVVvC=��
�e���p�|Nk333��� +W䴶��r�� ���_����� X��z{{�`�� �V��Z� d ��&�� �%���Om+��ۓ��N��WC-Wt��vDg�+���Ԝվ���UZ���ſ� <#R�� �]f���! ���
B�cR��1#�^� �1Z�>�����O/o*�ɢ�a;�
�Z��ۊ"��|h��Ҽq2��+�S�~?�=���2Q-�4��r}�YY�mZ&�2�!0?b�Q5<~s5��g�+ϕ �u�;-��^�4\k�;ܵ��Ǫ��֚� �]k ����Hxj����/�?~- �<���� Gg��$eɄ$�O��NL�:�����)�'O8;y�Jk�N.�E���j�֞g�����+���ڧ�v���wۧ�{�v�m��^��R-hW��X�Ut��Jն�����
�Oa�R��V֭��b)T*
+JE!j�)P*X@(�HH!r �;sI2I&$@`���ߣ!����$s�?�� )�+��?���~�u!=��۶m{�u� �v����ݩ��S yj�z{{�N�|�y����
<��9r�� ��ɺ ��/��O��3� ����s�S�T?��Oz����555S�=�_�5��n�|���Nk���?����n�;�s�ʕ�s��H^{s�0�3eπ���̸�l3��D� �woy�������b3 ��sB�sSS�/>T�f���rh�5�����(tgRݧ}S��M�B�n�]�B���k� �x�A����D]}�m���i,a����_�kIS�� c�GШH(�v�&���z��H� ��q���tdg�Gf'u4T���Ŧ�jq s�Q��~��-.��nm�l8SKo��@��ًB6y!/���#1�:}0��M�9��,�һ̾� ���w q��x�(.�G
5�Zx�2��q���daj��L��p� 6�ς~���o(������z��!����S�]�%I�Y�x�Ԋ��|�}�l�
��OU����g���L�?��ǜK�<.���0�#����'�l3=�pc�y �������X�=bOOOO\�3糽��.\�E�ם�� ��$��c�of̞��r�� ^v[����U�H���g�q�Yo�b������߯xE�\KVo�k��C� �5� �,|�F�PYY9��gL��( �����������)���h���w��Gv���_Owc��-�|y� V��a剌����O�<ͻ�#��Q~������
+���v+!5���*j�:'��sB!h�-�U��Z:�F�eֲ���4�k���^�ޭ,9n�� �BhG��Z��t����v�f��x����1�f��N��Q̵�jfN&ey:;��X.n���� ��.h�S��J��M�عy���{7P�?D�w���i���2����p���;9VA�f9
'� v�-�~�(��h�O�\?C��hI��Б �^��*���*T��Z�.�q'����c�y�ͱ��[���>u��e�SF��bW�\����JfSu�E��m*�7�D_l�z�*j���2���.��.�]�U�5'��墳��;go����l�r�����<$�^���x{�y{���t}���Jbm����C� y�o��KJ��ϒ6l� ~$�dW�611�!k�Һ���?��Tօ|�7Izܸ1����33<�����&���7�ã�o����-��\.��K�==�[�-o�Gb��#G ��n^��"�V��nfbm__��ꚝ��]�Ǝ�胵u������ʹ���=kI >q�
��w��|�����s߾�;�g�+h��4�v�� B!�X���3~u(? �V�R~�� [�pB4�"���5Y�?w�`#5�iv�ో<�5M�_� �XK����O�|���2�� ݲ���y�yν��~��87��1��ǜ,�3�3�e�uK��6gV�Y�g�~�� k��{��m�c-�{ٟ�$&k4�TU�����<6�)��T&�r�U!������ѣ>��~��L���,��vu��[�-*������ꀀ�_?����h]�_��]!��i�㜩��ww��9s��$֒� ��n���Տd��Ν{����>��B�n-)�Ht���� o���wtt�ٳ総���I!h��,�BB!��a*]ơ��M'ku����$}���2d'B�I��LDhkG k/��>:pt��OW�qh�����
��y͎�����[��ߴ}نw^Z�kɪ�W��h�n ���/F�_�1�_��?r� 5{n��u�`3!�~|h��Ou�N��s�|aE�e�/��W���/�=1g1�г WL���G����~�
������ z�Q�ܼ�����>/�!p����O���=}�S�,3g���L{|�ÿ�4Y�S��' <6s.��MMM�3�a��~���xx������.dcb����?1������=<�~�[dZ!�B!d �)�zzz�-��*����O�{���ywx��'7��~�s�y�7Ϻo;=7�Ԝ7N��vl֦/g��ŜW���yl����|�8r85�X;�O�[:�}ɓ^K����$뒼:�c�y� �� dkI�&����nS kg��H=�� w�+!�B!�c=r��۷�;��d��/}�ZtƼ�=��5��K���{�⼷D^a�=C�<�<��������ܐ�$��y=e�k_�ޒ� q��V1�X;�4���rc�ॅB!��q�X�Zzzz*�k�$��qG����<C�x��� =��f��� ���[��q|���H�u#e��� �:&F�u[�t����K�v��_n(Z���7}�b�K !�B!��P�c-C__�B�ʖ| ��Š�Tϭ�f��:w��tW���[S��Z��G}�: �U�3�LȎ�,��]�
��,xg�dz�)�E+ �}����
+!�B!���qk�㓻�Z�B-��� sjޖ�炿p{-� �LuՒX�v��rYYr��Z!�B!�#q �Z��ۆ�������?����ۦ/fmJ� 9��Em�[d�Z!�B!�.�6�2ܾ}�fk[~qELR�_���幫�����B!�B�u�e 9���G��))�jQ�d�D��B!�B�2f�B!�B!
k!�B!�:���B!�B X�����"b-�B!��1���Zf'}�|� �B!�:�#���L�M����B!�B'qD��$�ꓭ�{!�B!��I ~� �O� v� ��X ��A� �� � p`k 80�� �Z b- � ��X ��A� �� � p`k 80�� �Z b- � ��X ��A� �� � p`k 80�� �Z b- � ��X ��A� �� � p`k 80��`����
���R��A!tD�9���Q/@!d��^@��o�u�&�/B谒s89��+٢^�BG��z�L����m|%!��.9���99��^�B���^�XKJ���ZYY��� ���]�p� ֯_�gϞ��
+�Z=�j 8'�o���M�O �B;��F�� ���P/�]�mnn>p� ɱ��{� fL�<���s߾}r�|�U�QT75;nja��E�y�ɒ��i��/�ݨ��� #� C��х��A�
���^9^�v�� ]��Cv�Җ�d�X+�k
!��u�� �W
+*�1��W�^���2e
+b��n77�+V̝;W t�
r~~� �bS%���ũ�eU�Q �X;A�B�(.M�A�P�:t��u� %�Z!4w�� �W
+�qk����O�NR�w��������������� .�j��СC�?���I��bd�bm�� E�|��������
��q�/BGQ�f���r�k!��\�O�BU
+��k���G }���)S�lܸ���é���Cs�̙1cs��y���-[��w�}d�iӦ]�|�w�l��)L ��j�J.H�I�2���I����4_ ����
���(!�B�������T��Z�R���Ō.NHH +�ٳ� ���&��ݻ����'�Q__�������N�8�$�g�}V&��o�r�ei�f�1ɶ�ΖB��q�/BGQ����r�k!��\�O�BU
+*acm��#G�L�r�w�^���I�$�6 �$��?_z���br���k۶m�&M�<y��ݻ��F�k
e��h��V�9dk�!h�@ E��k�QB��Bs?� U)����7o�\�h� w���#� >|8""��իV+�����ǏϘ1��8{�l�m��}5��ն3%eF��ۧi�mǻ���M�s��*�^E��]�e���|��1+ k{բ���a�y���-qcmgcfa
+Ӎ<��&�տ�ś)J)�+R���� Q���`�B-|���*���7c�י�JуX !����
���(!�B�������T�����Jf8qLLLff�������/R�\�r% `���J��СCd�{���dI�b��@Ci��2��a��p�Eô�~�)���
+9��(*d��%���D%JէA� ���vI�b� 1��#������"&�A����<��;kb���l����F�fӎ0���SEf wɌ"�]�K��M�3�b� b-����7 ז��X !��
+~�RP k?��c�|�y��Ricc#w������>�Z����dɒ_������C��ɓ'��?�����k�L&ԏC.+����2
��٪�u�W�v���*6I��{z4e�2B$��&�{>�5��u�t��z�R�� l��#�wU��˷WQu����Ju}�}
+&�N��t��Q�&��9!�s�l�]�]/N�)Jͼ���թ[�����m�%�v4��@�����r�.��A[�ps+���k�Re���78i� �B�������T���
60�y �����BCC���H�����D$����� ��Y��dE[c�����x֧mm7-vYQ<��v����(��x�2oDE��ܸ���JZ]��Tf:����SE���?��O��59��*" ]¼B}��eG����
�I�^t?����:�^?�-�:�Ni���⡜S�Ѿ> f�o�'4�jH���]��\��]��[�&i�牏�K�D��/��D �z���d�[4=��x��ͫڞ �=��[S�os�} f cmMⶀ
�5�;�~�$�<Z��G)�7*W>����<#|�:wR)xx�{;&�f(e��$�;4Q*�G B8l-�W_��jzok��4��
+}� y��6�.\����+V��呌����?66��{���O~B2�[o�����<����$ᬬ��� �����M6kk�U��Z^�N]��ג� W�?dy�(��R�2���IiT��6���8坆�<-۰#�Xkzu1�<��qw� {� )֒�����X[wv����'wpZ0��� ��b�WocR~�Y�l6�� ��+���Z��8f���<��.�V�2��Q��N������ ��p�\z��jG �^�vg]��l*]�W�?��D��OZ9�Z0ck�]����k%qA�W��,�����L�ם�I�>�N�Y���_����YI=�gUV��c%�|�Y��j+�8��W�閪�����jr�G3����j;�
K*�5t�A�&����Aj��n��e<T
+*ac� H.
�DO<�w81��$��@{�]wmٲE�5l���>�>}��ӧYCV���2����M�v�ӌ�zEW����F��5̊�+4f�6��j�cn!֮/S�,��͘z�O7�c��O�����+� i-֖ ��S�s�,&�V/?��e۱��<�Yi���v ��Bh-eK�'8n��T����HR�F�K��D�M!��^��dt��wY�_�;�[����H�Xk����W���~ɝ>A��r�L+������'-�ɻ�3��'��Z�����CmR�Xk8���U�Z~ �,�ɢ��"##���F:���Z���*�sI��� ˉ"ӭu5��&R�[U ��M��Z��t� <I*��� 4��P� k7�ȥ���QN����������,4&���\ G��Bk܈Q���|�$r���6Z�&Fn�Ə-ٲ�l���+>[�#G�[B�2Pm���r������/n�9I?���OV�wJ���l�g�r�q��z�'�����K�^K3B���ra�d�� B8J�"�oK��m�T�lI�l1i���
�;��i��4���{���,�7J[�5t���'?_JoG[�죖�h���ݥG�i{e ��X�q�j���A7e�Z���V�yu������c��3RČ�?�����N���i%T�A����IJ�j���O�V�!���V��˺$ }��e�O�GE��$�E�����Գ�mH(�w��52�;�ZQ��̝��P[��\��P5X���e�a��<���Z�D�d�鹐����� ��>YC�݇4۸�B��={��\z����Tx"���
��y��{Y@*�����dE��{�g���τܣ�/Jv�DV�&[��*��b ���X^X� �k�XK��1�ڴ#���� �FU�����u[�_���ԗ�[b�^ܦ���bJ�U�Q��_`Sˇ&��� u�U}Tn u��m[>���zn�w����e m� ��Q����-�7�% [�F��.:�n��\W .�6˨�ev|]]n� �n3��/9�p4��"�6h�������6�ۯ6���JN������ Y����
h�����^
�Fq˸%S�-%�v��5�4Ks�jykeoO�翛���Ħ����S(n���@ǭ�Cl���� �gf���Zi[99��.Qџ?K�nqݙ���;���U�{kۘ�}�2�������~�e-?���[B�2P%$i�1t��� ߝ��,R��'pRkl>z�.-Y 쬜km��xK!Z˱V�[�t���[kV�ܮ��� ^���*o��V�N�DT'�삦;�l��T
+*acmEE�=��C��C�Ο?��,[�l�UV�^����,11�ȑ#d�ɓ'K$�e���������c�J�Z4�� ���5�GSV�J�Z ����>�V[��0 x(��m�[b�YW6�^8C���UL��~Q���Qwv� �d�,9��u?լ�kuC�w�0)4+��p%yh-�b��2p�b綇��g��7 /��,��S�k��l*:�d;J!
k���[�mV�����viG�Fۧ �1L�MWh���b���t��Z��C=$Utjt�e!'*��{4�}���Cb�z8Sn�1��/�6֒�'�Z�\��;Ǭ b�ߤ�� ��
kU-�����~W�_��c-��}N-�/��xcz㜪Ćڊ��B�� k��s>9��7H�p[CW�Ac-o
B-�ߩ!� kI���GW(�mO�%*�����͛�-"��G 9|���{�ڵ�W����#"" <���� `��M�4�%�60s'�f���w�XK���χ���Ly�SDT�Ո�l�2�� 4�v����ZUm�-��$��ar1�'��� �֨uB��
-����I3��
���2 )֒�����w���n��Pr�hh�E�s���|w����� ��d�jo��2���]R�;�ܣ�2�����(!XY+���Ѓ�����Z�8��{��Jjr��OY{c���3�X�4bi���X�F��WS� ;j��%ٳ�`����o���N�2�kM�j+�� �فZ�����A��[۫mV���|�R7~giJ�P!ۥRP k���I����{'M���+��5m��:::����뮻�����3����U���*�_a�~�0��=fk�^K�1��R� k>��,y�ͱ�����?6��ౖ�)��
bJ�;z�k��B\|\��[k�:��D��>�wuz�(����Co��w�d#<��6� B8�(�R�Di�Z��6h:�<��@Mk٧TwI��F���Z�R(�z�X[)���2W�^US��K��b.����a���-GI�X��^��0��Z�s���o+g�>A�W̿�Co�iUbCm�_r��Z:��Zݭ�pm�V�f>E�.�6�� J5= �V{<���ZR��;U�JA%l�%(
+77�;�cʔ)'N�����`)�<{��O�S�ʌ3̗� k{�Z�� f2�����Gz��0�1�����S�\�:���֊���I1U��� �}ZE�):�d�=��M���t�k" SHNg�~h��H�;�=���$z��hw�Z���u���X�l�Yb-3`���ڵ�� WU��u�sf�N��u�k����%����j�Q� �Dž���[���Z��ͫlt���!���0��&�Fr�Bwq�?3[���J!
Gk'�� %�b����ֆ��UM�uf4�*���װ"uq
?�S���'����Z���y�y�j+ޒC�V��P��J�XK��o }�Q&�������KVVV���k��w Yxڴi�/_�]�M���˙��� �&�*k4
�}�/�2�����O~K�.Nl������M�� rMaZ�!���X6���3�3a{�q0�p��%m�����.L� �y����s5�
+�)ֲ-�L����Y���%Ik�P�E 2� ��K��c�[�}�]|�#���<Y�F7�%y�-! ��-���X����FSVr=uWo^Mm�}��1�l��d�FW�<�Z�)9�p4��3��՚,>�%2�� c߂0ֲ�fB��Y������߇�y��ٗ�&#tl8��+ag�'O�=�X��Rl��wD��2�o��µ^[� B(������T�!�rss �qV'M�4cƌ��Xfnd=���G� y�g��.��C=t��9K[��Zs㗋Sc˪���٘&a'7v%�*�RP��tJ������� �O��Ug2e#�� j㽊�3!"�6E��^��Id�4T����8=S�R�Wd��M;b5�:�xJu�$a�� ���X��#o@�-Gi c���O�B T�O�BU
+�qk %%%�>���ɓ�!7��݃��֬Y���������&���ŋ#�Ȁ3����Z I��k�QB� ���NL?� U)��O�%477 8p`���˅]OO�}���O} �U���!t$o@�-G �B��.T��W�v��������>�`�ڵ������Z�z�{�'�Hd2�ȫ1���!to@�-G �B��.T��o��Q����4������8���WN��r�k!��� V��^)�k���� ��Q]W�;Q'xcB�%Պ���4+���Bh��Al�T���I@�B'���B�"�� �!�H"�B!�X �4_ �p"�X !��+b-p
+�|�$b-�B����)@�B'���B�"�� �!�H"�B!�X ���"t) �[�/VA� �Z�,�� �Z \k���� Lk pA���/ 0a@� ��8 h� ��� �Z�,�� �Z \k���� Lk pA���/ 0a@� ��8 h� ���֎� 8N�29�n�=>��8b-plo��1��k���� �3��v�!p���Ivs�8��A����͗��Ϸ�&����4��e�S� $[�$[ �-��v�!p���Ivs�8��A�� b�8�2�)x_�Z D.��D�c������~�Re���w��u�k��C�$/����q���0��o�5�����X;��}
+ޗ� �����CVVVCC��˗U*g�����oƀ�7G|u�}xeC��#8���ZY�y�������29�n�=>��q�cmwww��ӟ�H�Oҗ�"�h�i�V��v ��q�e�S� �� ��M:ȇ���wժU��������cm�%��U����U �l��vA(H�ޫ ejvܣ>�ڲwܗ�Ivs�8���� kI\<5A���U����v n���/b- r�����������¥K���� /^��ͥc�"'2����c��Ml�5�[e�[lvUDžQ�m�ΑSb-�}(�������-�
݅��+��
�֎� ��M�h�e�/����q��3;.d��}�p�q��t�R��p42b�8�2�)x_�Z ���}���4H���/H�ebm���]������-��Ư6�o:Y��v7eG���i3���a!=�Y[�� �KZ
q���_ɭ�M�X�H c��v�n��o�=�rIf��q��m��nV]x,"ȏ}Ƹ��FO�-ۻ!xw�
����`re�����(%Vz��6-
�Uf�(#��\�5i̋��̋__f� ?��J~��+'����� ˛�W�dy�.�Ϥ^��U��:�W�(++m�g���Hw���s1��I���C��ka�PJ$�1�2&o�Q���֗�x 1|Z���w�w!{kKЁ��v ��q�e�S� #��
9��9
�� k���[G2�?��Z:�^� �����#�Y�U���� ��K�Xr�B�ަQƬwY{��j,T��o�V�e�t�ӯU���L�Ԗ�_̤qS,��ړ�Ƒ��X۞ �8�L��LX`@���'�ڌyxb�8�]�%oSvܮ���<�5��N
1�85����s~� 1R
u�Os����| mٮ� ���7.1�Ͳ�x���V����g�!�Z<&\��6��-�Z�?���pBi��� k��B��-�qY��;�p�|<����lK��� ���,�cI��gZ�X,��/I�%�R]����I�e��H�B (?���V݂���� �(�i&��k�$Ѯ̵���v���B�y�;�2f ��� ��R ��$|�4���>Xߠ��F�`j
+�O��m�fN����CS�6���Mt1�F3��̔s�t@���yR���:�`�O� �>��ָ ��ځ����φ�S�� ��29i:wI�0n*m �S�$Inԟɱ��i�ԋ���qԊ�6�"�f}�2v]�:�C�)Hs| �'L 54�u��JR��7@mJ|*FL�ST5�&��"��L�+θ�;�����e����4�چk��[_R�5P+b� #5t{�]���0z�x���E���2��%���z���5��vs��0n�(5�^��C�ixs�����WS�N���W��(�D�����xL�w|x��#0O,�;o�b���ӟА���<j��R�&�O%�'���}Z
�_UX��U���ek�ch��48�ke2��]*��L����T|䭕�=�`��ʂVç�hЃ>�:�pk=֪dR�mʤւ��S� �bm�EӪ��Z�-K5=�N6��Ӵ�
+v�ؚm�aƈZ�Pj��$����`�bn ;&���/Y��� �% �RHD�����P%�XKm֬'�0�Ӣ��:9�/_����㐛�{��i�V[��9�BӮ,� ��ڽ���N6�is�
�.�7i����4z�.g�(5�[��2J������х����x��|H =��� xűZrK+��/�'�n&�� v=T6�퉥>�9ԧ�6a��_�I"|��R���Fr>�T�z�
���5ٸK��M����bj��V� �cz�>�f�����&��\Z��*j �k��bRr��Lq��
+��]Z}��*T����� dQFQ'gu6~\n%��D˳SDn?��1M=KJ&i)���̋[U*����:٦��j��i�����T=��v��B�Z��:���۳�3Ն�G� I��j����ԙ���$��CT@���G^�"��Ċ�cIuD�+����BNx����w�Om �?ůΫ�}��T6�-�b9�Z�T(��\�w���a
6QX��-�Gk�� &&&(��em� ����
+�@X�"q��!.��D�{z$���b�4��[]�h���Ow���<�Ϭ��Z2�ȸ2�]P�^�����e��6�}�
n�ʹ tm��k�]�ku ��:;[���^���s���Qi;��.L��>�=
� y k! #�:���_��QVJޒ4Np1��Ƽ?��Sepf| �u-OXK�rp�;�.(?�� ����D����w&B:�Ka�����߸q�K�w���V]s� �2��\w�������k�Lׯ�wi�[�ݯsѮ�������Z� ���� H�t��u� ֮t�1G���W]�,�����eđm�&��S^�L�8gT��6�q� � >XKO(�._ ������8 �Z__���O MNN�����lcL禥�R)��a�=��I)R����]�Lj�@JV�?��|���3f0΅,�(��Z��*9���l�km����Tr�Tzb-�SwS\���H,���Π�Z�AEqN�z9�j}���3�X�zk1���*�s슾W�oVϼT��n� �X�%p��������J��Z�
��\�@ߺ
��4���3�;�]�� ����f�?�%n�V��-������c7]���AZ���h��Q���3�e�J� ��~��m�l�Ï?:9�?b�M��sP�`+̴ �v�7|�JΕ�y��s���_e��i��^�O �ZH�H���
+ k�{� C����N����u����.���F�ڵ|�<Uթ�����P�j������m�"���F�a�̖���#I� �`j,I�j�@��� ��� ',�Ү�5�9����5��qG���b�v� f�; 9,��j�5�=K�6P��nI�$��~7�9�aic�>��$��%����t�!�T�AS\����R��d� g��U�� ��a���
O;��k�h�;x%e�ȵ(���>�`QDQ�Z4�ՕB�� ���Y<�Y���JO`"<c��k��ŵ�:�$�en=m�46?Q��`��*
umm!����.b���<�a*���n�� up*�����3��n&���3�rks��؞nG��]��-��V`�}4�o]�~�l�1{~"U歍k�E�T7��=�ç���*o�-��*Ǧ�mo�~�l���C|qn�c �c������??o���l�C9�k��<�_��nb�3��c̨[����W��x�S�w�߸Zw{kר��n�����a��[k=�J��s���V�n`���@T �
��0Ү�)�x�Z��чj
���ߥ�D�!`���,��x1md��~�L1�d� :�u��#e*n� �=���F�.� kWh�~�'��hWu��;�S�\� ���m�X�_�ha�m@Nq�3o�A�/킵x�$�)�&g� ����鰱i��B9��x�mCe�5Z��
}[!�Ҝ$�<�'��б�B� � d! O�}�� X�\Ii2%�Z[K��.´ij�rY�f�֤�����Tȵ�5��ft�aT����߄TV, -rZF1SZ�^���^[�gIԏY�^�$I�[�#!�� �?��¹���rz ��}�����7�ε�~����t�!$H2>�k���kk� kC��X]��:î�=�V��̝d���� ��lϪ���j9�ټ��fB
+�PC���t+� �niyVx�.�H�i�v��0�L�kp
O�!�_���.o�oz�;C�� �ۆ�t�!?�C�n ,�a�mm@���*�\���νZ9�?l�|�-�����$��� ���X&�=�p��w7� �|rO��k�V�B�P���}�Y���&0�X�������hԨZ�L����?�V7�0|��&P����x9"�=���j���wv�Z�"�D�����ɢt��i���mx�0w��e@�܅r�t�����ཱུ>BX�v9�����/�"��x��=��M�rΩ������,ˌ��wI�n�x�����U Xf���
�;$Y �4�n�룖"�"�ɆI�}�BK9���L� ����G&����P�ۻLS:���e��t;vڲ<��/�8��O�e��� Mφv���(�n��ڗ �KFM��g�Q��v��ow�7 �Y9�L9~>�z g4>D���3�
7;���A�[�Y-��`-,���%�C�x�S�3�pT�'>���Yo&�Ŋ%�a.�DdJ3��A�\S}!6
��Q�24��(� ��x��/�k�x/ޘ��]��9T�W�8X�I�Ѵ�3kFÊ�X+��Mkӷ��Շ� !D�5��=�7���%�m�`m�<��� a�� �����^�:�a�tH���ؚ���qmv��4�|5�dߚ{�y���v���Ěݶ<�F#�:���
Ka�O��M}Y�
���_��S������!��k��qĨ����M ��<l�;�U��F��g�o
� �%����rX�a�1X�xE5\���i���Y&p���6
we��p�%�s�0oX�A�� ya��������z)�W�HXˣ�!�t�H� [�m ��0��*0���0 nn-���(�2R4� ���>wZ���u�e��;k+�5�1��uam{=��:���c��y%�A/M�Zh�#B�[ J�C�Z(Ӧݾ�<�քl�`���o�8�Q�SwkM4�ѥ�����`m%G��X�Z>d�m ,�(
+X���p֝Nּ�7p�ڔ�����Ö�d�����^2�g>0OX�F�z�J[��z��Ļ� �]9z ��( �>�`-��F�D�M"13l��} k��ZD��[(Y��wT��e[�5ng)��- ��Q�nY0��Vm7�m�4��ֱep2*b����G �4c�`�Y% �Zj�:�چ8�Rk��FH }AX�CM*7/[��G�@�Z��}����>��tތv ֆW2`��Hs�F�`QD���,�y�f�JT�h:� I�T�إ�N.e��!��ȼ`��3{��V�'@�//�4��W�Xˣ�!�t�H� [�m ����g�Ȓ���#w
+��b[_wC�igM���
k99o�Z�s��p���L?V�,;&��m �s�Z�@������z�3o�����AR�?� kc�d�)�vGD���j߱�Є��"i� @����
+ � M$~r��iD�;��$�q��2�}�ւ�V���Q���H�I$f�-Ѷ`-_X��������2�3Pjպ�����6��}�X���`Q�r�laf*�?o-��85��� �MBv��
�U��E� k�(��_�7��6���=��8* ����^d��ɴ�˚
�/�cm-�jE���Z�$H� E7��A�Xˍ��/�]P��A)�ieV��͢��kk9X�X��դ��k����I�
+q�h;����������,��,�� 9���-j�7�� XFɀ��j����
+���j��j@����ֲL��^�ŴL��EB&�\?q��B�ZpՊ\�ܾ��/��.�Ѯhw���Dbf�m� �F(�c )bi��\��1X2�~�CDX��J���H�>�T��M)py&b-Y�{�y�^��6(�:Byo��@/ k�U+v��(��( K"�&���D�>��J���I���
+}
�-о+P_袪=����`Q\��\w�@XK�"'Gk�L;�i��W ���6T��4���K�c-�jA��<J�7�H�I$f�-Ѷ`-��J���� �V�`Q\y�b_�\9��my�0�?ֲq��2-9u� ��'Y>��OC�,-Hd�P�찍���V���Q��Q�D�M"13l��} k!�U�u8`-(v��
v�l֯�G��$ MK8�~Z^u��D���� ��g�5) Ӧ�W���,]�� h���d�Dj(/L>��}����S�E��,�J�{ �;���}6�3�j�-�Z %�eaI$�$3Öh��R\�]�SpւbU�Z�x5���Ѵi��݁����)�-'�"z�TMx�1�XKuʂ��/�Z1�1��r������3%���됅�]�$��$�"� f�(�X����˳���\�r��}�N���DQ���fD�+�eaI$�$3Ö����l!��b k��r��%�I
���` kA��~��\q��z���>P�T���W�^-..>���s�>�쳈�@BI7��̰��>����a~~�7>ډ�B�UU
~�X��x�N�y � *����ŗ kA�V\bmCCç�~���f�V)�2�---999=�7H�^M�ñCǥ8��>��\��mi����3X!k^�{1�`�t��z�׳Y'G5fr^���F�:�����֩��NG)l�^���yA�x��:���>\��=��W(C��ʯ����7�tֶ�;��)f h�����p
+.�ZP| �$j� �nmm�8q�����o >|x���/��rqq������)����KNr�l�J��K���T�nBtӜ+���j��� ����\�+�M+Fk �V�ⶏ�f��� ĴD����1Y XK��ɥ��_��_��Z�}}}����wfff||�����~��Z�>w����TDO ���6�.bX���BÜ���K����Z�����<����� :r���!ֺt������9D%��|���;Y=�5�}��q�����\�Z?
+��4=�t�|�7�c� �u��^=VQ{1�j�}�ғ諢�y�9s��
4M
֝�ݑ]�`���\���K���Q\������4w%�wϸ� Y}�jm~�[�]��q�}�.fh�f�67�pU�ߞA`�!+j�]���;�����&�e[=�Z�.�FE1� r�C��ʫ}t:]p�E�UU~%���A�� 7�?��������=(BYķgΜ����裏�fsDO퇗���/� O�D�wya-m�[��xq�֝�6�<cm7�����EwW� �v��弨f�nӵE���f;rr�)z�^vn+s.�� �֏v�Z����8����X���d{�?�+\�Z�� �_ �4� ����,֮v��r3DJ>kk��w+��H�̭�_"XK�ؓ�Ǜ&��
+Yt�p�b��Кl��Y� j�����!.��)J� W�rYG��@��=�_ �Ń kA (nOX�n����������{��-,,����vķ_}��_|�
+�uuE2���Z��W�(��u ș��dCX�T��v(��rn��p���W�[.e��!x���9)LB�����ܝ�K
��|x��_d_��D����� ��0 탵�5�7P�(������������8w��N2|���k���x��A��rc�GQ�d��yFC=�Ptw5�V�/��=�_ �Ń kA (nOX������Z�R���
���,((hllD ��?=y�$��K��,�2�,t��KO�N�_(��欼�XKj;U{�R��� .W+�f�;�f:r0u�c��=O�*��������v�;��U�r9ϋ��i�>���H�[�<=���t�aB�,��[[��� -����Z6C@�����̑��":�z������ZP<���F�������srrЍ����������#G�X��423�>m�I>"=��t�5Cx��pZ�S�K�s�_"�0��Z�H�v� ��ͽ�P�8�k;����Q���}����ZN�c��fV�H����+w/ K>�sm��Y[�? :
)+���\`d�Q�j)7(�/����M��^�c�pE��Y[{(��,*n�ƶ��u������c� jǩ���'����`-( X �@q�x�Z�Z��;� �}�W^}��������<}�tsss��N�������=�u�H^�g39��q&!����頞k=�y��[������ �� 2��OXk�٦�����k�T��o���E�[WW�� ���E��t� A=(/����q)���6ֺ�ק����W/�� �^��U��[{���R�T�����whxo-���'�%B�����J�a��[PP�XwN-^�D�M"13ly���`�(*Ӣ����UU~% �E�uj�$���ʮ�)� kA (nXEHB"�&�����g{{�-bW���N�����X�Z�/�\��9�I���=�F��e�@QU(?逵<
+@BI7��̰�}�N3����.�:�"E � (�:��+t���bG`Kl
+l�M�-1"����� $�n��aK��X )�Ү�)� k-�%6�Ħm `��K�7�H�I$f�-Ѷ`-��J�����������-1��($H� A�n���`-��H���������JH��s1���ԙ� �2E� NE�_6zK�^/ �=�]L��p�X��F�D�M"13l��} k!�U
+u�Pt��<T#� HL9��Uҩ�U�<�'[VZe) ��z�>�X�{)����e�,1%�#嵚�+~7�a�d�{)*��O�=����a�%X�a�������� �2�̳_�4��ZsW�(o[������c��2�h�m��$3
U����5Ô�<���2:W�:#`�� AI7��̰%����W)ԁ @��Z|��V��F�����n�B�X��&�q��b��s� AE9F+���x�e�^��^��m�)��! `~s�^yv� ֲb���b��Y��2V���Ѧ��h�ps����éNY
+`��� ���Dbf�m� �B�����h`-�
+Jnqݜ��?'W07�U�R�Ĵ7������G�M��:p��(�m�$I�!�:y�R�罙���vޚė=2�=yM���S^Ϭ��a���/dž�S.9ȱ�'�c���@��imm��S2�K�J��q-!�8' ��)W-2G-��HKHL;]�'�=s������E~�w��
�$y�-tu��Ã��u�O�ق�V2���g ����G�D�cDL[�� � k�_���H�I$f�-Ѷ`m����}�N�u��^JS�&�y�|<���A�p�bp�f�F�\�i�Dg�SL����h���R�?�������f���P |·�IyMZʶ�S��R2�� �x�ڌ�L������Մ�(����*���-����8u�i�%+6�^����f�{%� k�T����"��c5��-o����p!E��v�G��8Y� 3Y[�VbV�X�2�gS� (PY�=x�����M8X�}uk�Ӫ����i � c k +�2vr�RO~@M�1=�.lc�d�;���
+Z���H�I$f�-Ѷ`m���5 O�
�˽^;GL6+e���� ػL�P��{� [���@ �9`m�BF���rƙ��a ���+>�+֮0�W5��#KJG��6��V�$ɪ���C� �|ݵ�?֎^K��~a'O�+F+��&ڤ '���^�:�Qx��υ7 ��G��ڒ�
�:N�\��1��<ma��rq��)���YUY���%�{��moo������W�vww ���Ս�������7�H"�&�����ϯ���N�
+�6�� k�u�ݪ�����um�@ i�H�6�}gk��
eКhƵK[��?o��LVzǾ��aG���2i]巏Q�c;��ͅ�xO۠q� n��ʆ��K�˛���-�i �tsy�h��m���6ڑ�m�̽����l$ M'��q��x�j�ʸ��ė-�yBb��w�$�eȜ�q��M�Ѱ�����ڠڿI��ZV�[̺����$��sҴ�o:X˳�F� ~�����TUU���/...**��/"zޘjP ���Dbf��j �#�~7 ��Gh'�jￓ1"��'��vzsk %j��b��Y
�5�4�P�c SnC�(e���!L��>�>Zش� �3|� �����Y ��p6�m�ٛ>�@'�q86癒1�|�nXu��Fk'W:g)����b�� �Y��ĭ<�a�á�If'��� `����O�0�y�Z�}J�\˛-\S�=BV�&��/zLyK�c���j��p�dɭI�:3 ���q#�eݠ�K k���1VR�]�m6Cg1�`�IZ�6�%{��#�mz O����������^���mcc������� |�AD��
��h� LO=!ũ@�ǯ���@�2�����}�?
+�M'*W�^3I�g�:�k����6Ӧo*vڨ��V��7sC}�P�? � ��>\)���
+e�VU�`m���IȝZ�ñe`V�"j�L8sږ睜��Ȓ }����ʅ-3����.��ɂzy�Õ���� ��� L�~�o �F%���0� #���F�� �i�h����[U��Z�8��2J`X�_��J&dTbZr�b4��r^F�ق�E1�K�h�<� k}L�z���pm�l���
+�"C�X�0���&!�������� ��[�Y�|�4���yGي���Z��&q��'��:��D��� ������AcccFF�W_}e6�
+EKKKDO퇗��RK��䏗 k�� ���BJ/kxD����(�)��c�I�W�F�����f
+H�����_���1-� ��k#�|����n��)�k�Z<1��������ZĽ���~��v(��M�z�������C&�LQ��: k+����"�%6�Ħ���h��ɓ'G� XXX�j�� nݺ522RTT����� ����ĭ�2
���!RC�z��X�Hg�.�L�T�d�f���ddJSO�tb|E��<���Z�Xٙ*5
�[A���mN-���tƅ{���9@��r�-�A��1Z����g��7�פ�'I�G���k����LKOI2�vı��JQp�M�d�a�T0��3$�?T��[y��L�|Sg^I[W�d]���� j�[ E�{JΠ���਼�/y��N� ��(C��ʯ k#��"!O�Ŵ8.q�$��ԍ���$�[�f�
��ֺ������M�{��y���V��F�h�n�`a�Y�e����R;[ Jg s[vJ7
XH�����[bS��E�X[XXX__o0�"�={��F���������� Y���KG�ʊK2N�a������aQ�f���Y�@��
��������� �.���.FԲ��.Xk�����U�e����t �<P��sn��Q� ��LWu�8�k�=2Y�>�g��$7&�WN ����0��0�1T��GD#�l�q�"������^&����d�FX�J^�h�)dqa�OQy
+��<�W���� k����P�R+$ R�?� k-�%6�Ħm��v{{������/Z�V�R�L��ϟ߹s���_]]] �
+�%��d�퍵� c���_��7|�6-��$�Vd��q����ܝ�r�ځ:���?�8S�2;,Z�eyaa=y ������@��e��[���_I$NׄvCS&�箅 L��:R��Ѝ� E9�my�3����U�N" �
��6B ����� �ZA l�M�-�)A�"B�-//���A�PV���ӧ��>����}���<<< �
+�%m
����a�
U)K�Y��%8L�c-㭕I�4��.n��Z��Z���#c}��l�c�Y�
�>�Z[$�GyOB�ճt=���dQ��+j&i���k� ��aVf�͐�Et�� X<`-$a�P~ ��� ��B�I�'����|�� <�� <z��ŋ���z� �T =z��# �5h$d�u6��TR�\#w:�;$�u���Z���!��#!���
�)��r�q]�DV��H�kJU���y�FCs�֖JP�̼�!r`� 2j�&��ۗE}��&��J�:aI倅Y[�*+!��[g��km���y����
+m�>p�
���0R�?��[+h�-�)�%6%h[D��###��"�W^y��W_mmmE;wvvrrr�����a6���4yK6h_ cu �g39��q&!�J���^�H���k����$��� �ZA l�M�-�)A�"B����_����曓'O����N�B�[__��G mmm�C�j��^yIg��?�K��X�Ek]��, ?�k���?��D
k��r��%�I
���` k-�%6�Ħm����z��� "�}��w?������9u�4(�D�M"13ly���h�(*Ӣ�P�hU�_�:�"5u^�$���J�?� k-�%6�Ħm�h�6��F�D�M"13ly��C�j0t>B;�W{��� ki��y�����Q�&H1���@�d�13� k���� ��#c�9� ,�eB��ٱ��B��睝�ghJ���~�Ț�r�-h��������q�m�l��+��<�e��O�S ���|�� `h϶�F��Q��OZ�M� ��5Zݬnֽ�Q�8e�,M�8�v�� ���Dbf���>~���
�c���D{�\
+�o�5<�k76�� ��� ��Bȱ�b���5ӛ��Xµ�hkۆ�%�.D[А��ͮ[7ȷ<ȯ�mA;�K��h������4� ��m�����v;����i=�V��8pw����M km�5g��䅀��4� $�n��aK��#���Aq��?�� � ۋ�ϗ���ȝ:���@���Ҝa�L� �B�1᳙y�:�'Qh�<:�-h�M=�u=4��_ X����~ЈB���@� � ���i��uc�!L[ �� ��k� �vq�wv������Q4� $�n��aK��X �7X��Ύ}rz���ҊI=2�����&�qm!B7�?M�\�,j˶� ��2��
+k�+�����[k�i��3b�Pl��[��� �P�E�h�q��N�b-Q�c-� $H���x�� X ���"s�]�"��ܱ�5ӄfl ��Q"�-.����W] �h����䴞x���g�҅h�������8>261kX�癫��� K+B�Z"b��#`mx
+�� �B��*�v�H�I$f�-Ѷ`-�V<a-�ef~��?�f�ɤJ�ճ�y�*�-D^�Z�0mA�������+D[\�韑!义C���9�&�'!�9 ���W��� ��H�7�H�I$f�-Ѷ`-�V�`-ፅ�W�;�����d�i�B����B4gX\1�r�����g�_��E�/x�=�!�M�طŲn}63O����Q�
�k��+���XK$�eaI$�$3Öh��r+n�������A�8(�� �/�!���ڂȜ��"�ڂ�"n���<n@��3�mAd�P=2�zU���� ~�ڲ�m�q|J=<֯ A�C��2�
+OHS��% LO=Q�¡�k� ��( K"�&���D�>�� �[q��� l�M�-�)�%FX��퍲�$�n��aK��X �X+h�-�)�%6%h[Č������<++�ʕ+�����tKKKEmnnF��Q�D�M"13l�m ���N�
+�r �V�[bS`KlJж�k�z� |�R�Z[[�^�Z\\|���s��}��g=/�� $�n��a˫}���
�����Gh'�
+e�VU�`-�`���Ħ��ؔ�m3�644|��ki�n��(����Ғ����z���Մ? ;t\�S~�Sk�ŮO?]�{�@��u��k�^�f� �y�W�5뼖 D�fZ��;m ����{;��yA�x��:��j ��� @�+�!ZU�W�� �[�����[bS��E�X���u�ĉ����o�y���ɓ'���������ڦ�����/9�a�Q*�&/�tT4/�j ��t���\�|�GT34W�^௸��e��]Y~ �lZ1Z���}l6���\ �%������Ȁ� �[�����[bS��E�X���'�Hz{{gff��� ?~��ߪ��s��MMME��Ax�i��"��ዹ,� VȚ��
ٗ� C͵ +�c]ys�s�av�Ԃ��?���>6jh��l)b n���
��]Q[!;�>��]�=��ʽk`��R��K�NJ�� ��:��.�iR��5�kiz����n3M�t_:Fz��XG� ����
+5郾j)j��E ��gΜ�n���` �C����ϥ���}� �%H; >���LswQry����������8� �]Mm>3H�/ݝ���U��(�U={�q����vQ�)��#c�i��V������QQ��) �ѡ�]��>:�.8֢ Ѫ*������������-��ڏ?����݃"�E|{�̙������>��l6G��~x�HN��"��4Lx����ٌ�iݩk��q� ��bXx`�ne�10F�ዉ������I��X;���p�EO/ݖ�?��Ղ�.X��
+�����V��P� +R[�lL�+\�m�9��W1
�2r�8���ݹ�� ����Z��݊�#�7s����v3�QȘ�#�q�"�N���u�3�&�E}V4,5N����|���%c���A��#V' ����`-( X+h�-�)�%6%h[D���iyy���� �w����hlooG|��W_}����@^ZWW$�mo���}E���_�����K���� ��uSQ�)i�� ��h�{a��iL �
+.vL���ΘUH�Z�N�%���=^·��E���K�y���� �� ��>X�_���2�+�?{���ƕ��?��Su O��K���dO%�j��j\��"��dL��"�\Bd��AS��l�w0s���!` lƃ/ؑ���#�-�aYB`!�$S�YݭK��M �V��.J���o��՟���V�8ûs�x'/ ��<pP��h����w��
+kmĪ���U�w4�ە�7h�- Z���h-��Z�A:A:a:� ���/������ꚛ����?y�diiiSS�����Ozs�Z�4\ �Z�9�\�ߨ Xģ ��V�w���d���8�������)~q�J�,�Z�����(�wy2p;���{��ũ�g�
�[��6���u�*8��{�^X��w;}a�Z�Lf���N�c��8�O��H��Z+t� ����fXUk��7� ,T����z�@k��� �R Z�4�B'�B'Lg���*���_}Ϟ=����B�j�NLL����ݿ��b�o*]�I�|�O�⣦´��}G��VǦ��e�?-���4�塣�ػ+�� :pa��5��n�U �\_���*�U���"۸�ig{�{ �*�w��+�l�Iȱ����Zќ�o>��(ܡZ,<��z��@��³���{k+��9�*�1�����GF��rǺh콵o��+�������}��/.n*n�ಭ��NÉ��T��U>*=?�HZ�-�����Hh-� � �0�E�Zk0�
y� b�����k��v��%2��v��緶�&{�ބ)t��0נ���;��hd�[�)��#ꄼ6���`�Tہ���y���-~.@k���2
�� �� �Yd�� �gbb�믿V(o���'�|BD�
�}����B���MP$ ���۷��Ch�Z@k7F�Zj�>�o ?לl6�?d���h-��Z�A:A:a:� �V�\zZ,���N����nii)qݝٴL|�udRM2��0Q�c6� �jNKޚ��Nծn/�Z �@k�Y�Y��,����`�T�Lb<�,//�%��82��EfHծn/�Z �@k�Y�Y��,�ڝ"�2�&��L������4� ���Z�4�B'�B'Lg���< &�I5�$f�ȶ|�� ���2
�� �� �Y��;�l/��B&�$�� #���Z�4�B'�B'Lg�Pk�<0`��!�ö|.@k���2
�� �� �Y(�ZɃB`�T�Lb&�l�Z @h-� � �0�Z���@&�$�� #���Z�4�B'�B'Lg���<(&�I5�$f�ȶ|�� ���2
�� �� �Y��;
+� dRM2��0�- h- a6�� R�FN���m��2�&��Lٖ��0h�ed�d����Yk����Z��ÇϜ9���m6����\./��]�
+��L�I&1&n��|�r��Z @h-� � �0�E�Z;33��g��k����ouuu�� ***��˿�ꫤn��B �!�j�Ī�* r#�
���82�����$%@k�ed�d����Yk���O�:E������\�gϞ]�z��O?M�v# ��\��r��G��}�dnH�V�`27
��Ucݮ=��9
+~(�
8�uk�I㨰��u�-�;vM 'f�Ph��Q���ԾDb�K٦ED�W�ñ�
+�-2C�vu{��Z�4�B'�B'Lg��֒kЏ?�����MMM���J��ܹsv��������I�tT!<�,˼b�x��Y���n Z�1��=k�Jq��ݾ�Y�j�۶ouZ�6��y������jN+@f�Fodh- a$������mZ����Z��,�9y����Ϭf� i��j��1V�8��`�@��Ia�Yx<ƺ4U{�{l6��6�j������Ì�,�:���\m�%0M�Z{���������=}�t||��CKK�Ç���'''����B *[��(�g��B�)� wqg��q�\�����ו���
+hj�-c]vm��4�,~�O��*]�am�hm���$�����W���s��]qV�v�S�:��{�����lT�y��=��5�BO��k�ť�z��,R뉭���:��kw�*�؝IF�a���?51CZ3�Crq �K���N���3�}E��-N>�J��G x��ԍ�����sp���"�@R�/�ET�<~�xm�%3�jW�h- a$��^�6;p���+s�#�g���v.e��"ຫ-ѐOAֵv\� 5�a5 �ӯ�*i��'0�E�ٕ��*�#Y *E��IN\�@Ӑl��������l6�%~[TTd4M&��~�;�ӹ��[ �k�u�~�CrnY�q������(R�]��jq��F�vWm?7>Pz� >�pZ{�_��V�l�#��Q]���Y!ِ�?���.���/>٢m ۲�XGkI��"r ~[�� �Z��9ɇ)�!MA���� ��
q�A�Oվ�Y���*RU��A����L���Z'|Dy�jRh$ ���P[UV�%Ǟ�O� �� w���L����;�Q���6[h���@k�,����L���[�
�7�YDد糭� �G�L貏�,�BV��Í�,\S�J�1F|��l� � ����k�_����� Z�Z����p8~��ߎ��wuu�l�gϞ���'~���_���'{�¸.M���r��m~n� ����'��j-/`�/8��5��oЖ��c[k���VuU��c�C6�G��'_�� �1����Z��-'i��H�U]v���Sڲ��~�fc�6jsIcC���bFjmD rD�b\�]�e#' b��>Mm�����qW��O s�E�y6ֽ��x;�!�}��Z��<�Z $��a<}ڴ�!���,��Ҍ]o�4o�_"uXڕ|�0�Z;Ҙ�Fߧ�Tg��0���Y�JNQ~�"-����l� ή|�
��d��ir���'cWN�f*)imuu�N�#�P���� =�ӟ����_�t����7�H��+��VU!��r�2ez�?e���\�Zk� �����xCz@k�B��H�"���Z�B~�~�u7��2�S5$��6 l�������
+ߩWU��W�y�6E��1���d^�oHk�� ��;�e�֊�#�,�g�+�j5dAO�F�U�_��m�k-�Z[� ��J �ڵ��Y ���Z�9u���<��p8�5�犟�,�!M�k��6��_Ul�a�2Fu ���u��{X>Ƃ�4*T��sP�B�)�Օ�]�rjmnn�믿�gϞO?��{���&�irr�\Teeey��� ���-r��+�_�?ޚ���TU57�-c~kW�%W��������e���%�:���o�Wefq�6�&�Zsom�
+�}����*=��н�饺����N%|r�M��~h�lms���_��a�[��U���[�3���ΐZ��.Qw��w��ཱུ�ц�촜����h�'*N�*
+�<�����k�f���ƹ�6Jk��NXI+�u�֮=���k-�.9���,6S���ڦ*n�b1�Ǩ =�'}o�Y�2^<X�I���{���\9:J>�8���gղ��~]��M��KIk >|��;��}��W_{����62�ŋ���W�\ف ����Ȥ�d3a��k���@�Z�9��n�2��B4#/�����%�Zk���� �o�c4 �HxX�=xF���z�`$˨�PEl��]JZ���˩��o������o���C���666 9rdiiiv��B �"�j�Ī���=��)k��O�{�+{C���=���h�� �i�o~���cEA��Z�`c�p�ej�O���]�2� c��?'�gEY��1]O�"������n�߹s�h����矛L���4=� �@&�$�� U>333�c5�%o�R��� ��0R��U@:A:AJ��֦Ȥ�d3a�ʇ�Ĉ�����1��䭭�')Z @h-� � �0�Z���@&�$�� �|�v3�F���Z �@k�Y�Y��,�ڝ��2�&��
��Lٖ��0�Z�A:A:a: �v�A!0�L�I&1F��� ��i��N��N��B�֒y0`��Cj�m�\��) �ed�d���P��^�C
+!ջ �G&�$�� #���Z�4�B'�B'Lg���<��Pf �T�Lb&�l�Z @h-� � �0�Z����B�-dRM2��0�- h- a��L�,t�,t�th��#� e��I5�$f�ȶ|�� ���2
�� �� �Y��;�l/��B&�$�� #���Z�4�B'�B'Lg��֒���꼼����[�n=~�xvv��p���nW��l!�j�Ī�[> �g��Z @h-� � �0�E�Z;99�駟vuu����9s�������ǎ ������B$�@&�$�� U>���f�yzz�q d"y�̐�]�^�� ���2
�� �� �Y䬵/^�� �H���_�: ����˗/&u��"1xf���G�)�=�T��nv����3��s H�j����?R�C�Y�u[��8:h� �5�9�dtn��� ��NuqT�yh����
�N'p��NT�q%'��U o�R��� ��0�Z�A:A:a:�l�vii)''� ���7�|s�Ν���/�X,�ϟonnN�c}��bUq{�jx�������GkOGHQ+���
۷5s��kO�ou':��5�Ggz炣��l�k��㙚�Z�i�����Z @h-� � �0�E�Z��ӓ��y���'O� �����_�j0� ;666��M�����x����͊���`�Q](4� vx���]0r�L����y�{e<{0����ű���ֶ����GK۹5/�Vg��p&f�.?|���]U~�Z��C�t��v�DXSk�jz�x���}�}� ߄hb <s���/� "���^q��U���^p���n���xp�WG�Oߞu������2��� �s��;�хL� � �"�_�9_��Gx��g徏���>Z y� >qc������&���͔��V�*�Ǐ ���d�T���� ��i��N��N��"[������r
JT��mAA�Ç'&&� 9b�ۓ��xZkl��
+~+4|�o�*��Ƴ�O�.$���ʣ��'xD�#�Z�����I{aq��H,��]���������]�]]N6A����1n����t�:Z;{MQ|������mO� �. (7,����
�C/<�
��]M���^`A "���Z�x��..ϐ,�b>8������G���ŅG��QG��oU��WT�Ց�bw9Wb�{O+���)��[�\��) �ed�d����Pk�e��?���� y��ӧ333W�^%~{�ܹ���*�;_k���g/�V
+��;�� �.�.NL^�l{2�V|yr���phE!���^>q��J�QF@��{��_���'n����͌Dk�!Z�c�ƆZk�
'�� M�z��A]X|�� �Õ7��
��V� �p�/����\҈m���5H��<�8S
vw�g�M;\�'U ���T4��xfh�?��@
+@k�Y�Y��,2��/��������knn�����ɓ���MMMd��?��~�w`��r��� ��s��Z�w�^Q}��S_"�'ʏ��5�ڧ7TGy3y�^(8I������dq��ty� �]h��l�������Tne��I<���w�5�ƴ�:��C|�{k
���� Q"�%� ��wopܨ����="1�ֲ ��0�Z�A:A:a:� �V�T����{��),,$RV�ubbbll�������~��Z+�A�{k9�g3]�nY�>�|�?�=������f�^��ʋNk&z���͘{�r�p/�vm6�$��{k�k�h��7�̍]�6\|�w�YoT H;X��� ����g��������" �I�Ŋ@ң�oL,� Q"�
�$|�x��ꨃ���sh-�@k�ed�d����Pk
�;�C���W_}��.]�D&���������do_
+e�T�Lb& �v�� �Z ��L�,t�,t�tj��㙘����
+śo���'�ѽp��g�}�����{!� �j�Ī�����?b��@
+@k�Y�Y��,2�Zr�i�X:;;�־����uwf� &�I5�$f�D���lv8 �9-ykzz:U���@k�q� �B6rJ��֦�Ȥ�d3a��gyy��-q��1���-2C�vu{����L�,t�,t�th���`�T�Lb&L����X}�C@k�ed�d���@kw �Ȥ�d3ad[>�Z �@k�Y�Y��,�ڝG��l!�j�Ī�m�@k�ed�d���P�� �Z �Ե�ܡ�K�Q��4���I�dyn�e�.i����: ���[s78��, 措�]�C�qV�xF�zQ�e��M� c�,�9y�>�0��,�!M�^�10Fm��w�U{���Pd_��Ak $ ��ik�H�B�'��Щ,����c"ˌ�*��F��ҵ���L�KK�2�}��fN�tymsZ��k�fk�c��ze���v�
�S��"ຫ-��Q��qv~\��b��
Z ��@.HZk�
+��k�-d!�k���&��u��-�nW����,K�]��o�cMkc�xm&k�ޯy�!�W/!���YR��Yf:��;�3 %tkm���W���Q�Ak $ ��Ik�נ���:�5 ����Kv���t#
p�6Я��,!��Z��*��Ӧ� �w��8:J3v�U�l ����Ү�ГS��v�������7���'Ju�M�q � Z 䂤�����\QD������,+��"�d�Z�9u���;�Y8���:��x�4�5�����!�����s?� @B@k�\���
+�k�ƕ�Ҟ�j'dIk��]�~f��LfO�t�x�:�yKܰ7�,E��{�YV�~�߯��M��Z b��@.�@k����1|�;Y�W� ?2�G�Z�9��nd46�8:J�ǘS���rk�[km���3P����T7h- 1�Z $��#��i���)Ldl���ޝ�v�"���f�'^��2�:+c�+&U]�
+Fg��w�}eo�a��,�^���FFs�mL�XQ�,A��ژ�w 6� GT����&��@k ���� y��Y�Y�Y(Z ��@.@k�Y�Y��,�Z �rZ�4�B'�B'Lg�� H h-� �Z�A:A:a: � @@k�\��2
�� �� �Y�� Z ���i��N��N��� � �Z ��L�,t�,t�th- ���� �?�wKOj��q�[��S���ރk��f6Uw�Z ��L�,t�,t�th- �(l�)wZh�0��puSu�rZ�4�B'�B'Lg�� R�XzS��Za��]������� �ed�d���@k )$�B ���;h-� �Z�A:A:a: �Z�[����H�)Rw�=�!�[u��l��Q��of Ϩ.7Cc��� ������*��aE��ɵVo�eF��E�^]��'��}r�뻕�^����s��0ٳ���k�t,������\� �T��9R.��Zh- � �ed�d���P��ƺ̖��y�k���v�X�e���E�Z;P=%��SU��$ �-jr��m�a
�@Mf�h��L]�7`�_�X��Z �#�B �����Z�A:A:a: �Z;�KS��8C�Dk�4-%�\f���b���e
�.2� -�9����ru#�%r>l�(Q_��.�K�����m�^˭moƮ��*; �
y=��kjW��x#K�^�mzFX0G��2���_W�Q(U%��:�H=�
�B�V?C���j��d�M�����"Y��-�V��! �[{��9_lj�~W;�m����z V2a� =
�Q��n�|Gϥ�0=�}�cc�^/�\*�^��-��P0l�ւ #�B �����Z�A:A:a: �ZKLo�A���v������.�c�U4���;˔ V~�Q]���$�?s���JMf�Z��膵6]h���gk�<d)U7��S�52��(�Oqv�څ��i�Vx���ԐYj�%{Uc�w��p��}u���-�#��v(8y�6�։�#w����ն�nAk���7 �5|;� zp���aC���G. q�=C���;�7�L��ޥ�зK��+?Vv��ւ�"�B �����Z�A:A:a: �Z�Ү�Z_Â7X����W
���Dq����dn�j������'�����b�
hp�9�ܬ�B=������ki��nWH;�A�3�� tQqӫ�=�_p}��Hkm�g�g��~Z� ��AW����m�h˷w�=p��Z��V9����� :�cX�c������l��=�J��`�H��Bk�� ���i��N��N��B��z,�3¥
�NN�6���뷬�j�\�(�[��B�մ�o�We�(Uڮ�gA����ժ��������o
��m�����v�n���f�K�G�=�h��n����w�|w��Z�ǿL���p�j�t����Zh-�AR.��Zh- � �ed�d���P�����\�i��vFkm� ���y!���������.�6;]�V���KFQ殳ujUffEݩ+C�= o��RdVuͬro�s�N��6rm�����hm�7�$��=��n���c�6��Zn�����u?�s]�;E=������'*�k��Z�s�\h7����n`�����j�Z�sa���g����R���Z
Z�4�B'�B'Lg�Yk����o�嘹Rtj�� ����sv��~є��{f�(A}]u�՝�wEF˂��ؒ�Z�&�vº�d�ǽ |��� ڤd� �KXP�?2�]k�T�Ak�\��2
�� �� �Yd�����ܼ�3���>�3
8�?��� l�5���8g���6[�)��f��v��v�e�j�=w�G; >���;!��ח�֎�{<ӎ ���u��,�����6Uw�Z ��L�,t�,t�tyk- Ŭ&�'�����g��<������G���o������=��?�4z4A����ý�0�P'�o�O��>��lw_H�64���,�~Rnxm��;h-� �Z�A:A:a: � �BVo����a7�����������v��Ǭ�7ծ��:Z����Z��v��kl_"N�]��<�q�?T�lz�_���r[]�ڡo7��M� ��h-� � �0�Z H!k�{�Ƿ Oî;��s�۶�7خ��:Z���<ձy�݊����lILh���ް�nbm��;h-� �Z )d#�th- $"�IVW��kV
˘��_��M�|��U>s��/�W���`*1A��aSu�rA���$W/Y��,�Z @
+I��n��v�!�:
+� �@k� $W/Y��,�Z @
+I��&Ok�W^����<�q����*��}�a���{o˺��zO3����ez�\�Hd���@k )$�B��Zh- � �ez�\�Hd���@k )$�B �������F]��6{�D��.M�> eEk��2w�م�+
9҃�ۻ�OY���z��չ�� Ez�����j��C��e�)iw ���2��f����ά� ���: ���[s7��, 措�]�� btf�����"iY�f��*h- �\h���Z �AJZ;���,�Q�Dj��_�U�f O`Bkg�%����9!�
�s��5����ԋ�C�h0�/-�J�u�R��,��F��O��SYZ�g ��=3�]��P�� ����6U^�^r����3C]A�F[F����y�A��p �n�"�� �d�r���BkX i�k����]����J Jct��cAk{F��m�N��Z;Ҹ_���gFkc���U��0ο45dW���,��`m����g�x�3�ݞ�(RvX��롯�:�P4���`�kr��u�km����L��B�歺A��
�� �B��R��Zax���M� �� i�@�f�:K^�)��U��Eveb����s�YU#�QF��o����}cOƮ�Cp"�Y�mF���ٯ�@���^���`n���D�`�^��{�d��k����'�ۧM� .�� �r�3��
BkS>��p�����&Z 䂤�vT�A�N�Y�^�G�A��!�֎4 P��F٬��Y�niWf�F��lf�:�6W��(������3
+p��*͛�k�(Kf�6��{L�ʜ���%� @@k�\���i
+BO�rt��3��� *QS-�Zk�� �Kx:�YBx���iI5.C�H�,��lvB���
����v����� Z 䂤����'�
+:�5Y̷֎4���#���z�}���Vt&��Z2Eq��
����W�+��$f 'K�6��sN��q�Ak $��)i�` ��o��x;G��2�M��L���{k[?��v�+�D�EuNDS-+Z[/ ��U�v� c�Ð��Gųџe�Jޮ�2�r�Zea�~V��U��jNƮ=��9U]|
+���yO�z��W��lr硵 �@k�\���n&�v����E" �0�Z ��@.@k� $W/Y��,�Z �rZ�� �z��B'Lg�� H h-� �Z��ՋD@:a: � @@k�\��2=H�^$�� �Y�� Z ����Ar�"��N��� � �Z d�� ��et��Ҍ8K��- c�YX��,�Z �rA�Z�rm�֊�d�� '�Z1Lg�� H h-� �ZFh-�@k��,�Z �rZ�� ��h-�0�Z ��@.�]k����>�
+?��o�o�t����5g�g�5AkEH2 ���| CC��+���٬�)WVh-s@k $ ��h�? ����>��Ehm��dRS�l �����������++��9�� Z ��6�����n�ӓd�{�%d���vw�IN�_r�4 �Z��O �o���<q�e�g��_�,���6��n���m���ܪ��M�F-Ok?ַ -�K��nhm$��PY��V���-����w�5�sOMO������T���� Z�=��Ms���.8 /��e��م^=?@k7�Y�� Z ��ֿ�^�,�W����M�r���I���м6d\���
+i��S���~ZY�qߔ��{���-Eު X��ї��?YX��m[ +�F�Ձ�F �,|e���|Sӥ��e��~�{���K�)S�Ԋ�>����^e��Ok��/l֓�ڍ�th- ���� �
��枚��\�J��"�u�m�=)��8����z\��Q� �o�ؓ9U�ه~,m�}l���>��76��3� ZB�Y��*���-�p��{�L�� r����^�[�"�����"��u`: � @@k�\�ֆ��s^k}�7��=\|�k���|ӷB�D�]��kt��Mm?���_df�!7��^eɏ\��Y=��o�ν`�:b��� ���/��v�#���r���J����T�Z��ɘÏ��>��1����Ak��YvXk ϝ/VV�� ������ Z d�V�$���?�~�C�O�}� ���~�'�~:�Z^tC7Њ��V��Z�{���PX�;���{�(�V�$����m�������������`C��.89����
��)Zk�
+�YvRk_�|�t���\0[ `r'grr>'g����) w�������~?9O�ֆ�d�� '�Z1Lg�a���|�E�㹓� 0�8�s89���9��h�C��c����T;��!��t�t���Z?o�/^��z� lB���L������@@k ��4������
+� �2<�Ck���2:@kiZK'LgI�� ��Z ����Z���� �Y�� ��Hh-���f��t�th- �$�R ZF��� �]oh����7ۉ�1�����i��~�oZr�$��60[��S>��)����;.���/�� ��]�Z�� ����ZK3�Z IZ � �69���O>�@?����>⨂�p�S����2}[�[2j����/�F,���q3@k�ZK'Lg�� H�Z 䮵\{�Ϸ�^XZ�q�p��k��{\����S��n�����T������z������x7u�y��ӝfzz��g�%�9L�m:-ӳp�6iɶdS���@'iش�ӊ�@
+���E0�] cb���0`@� B�1�q�I�_$# ���E���s�$�͖lKֽ���� r�t�~�.�>���\��D|뢏c�eIn@��en�y�<(���
+��Fm������U �2�Y(�V�$km�-��9��� �:�wS� �t3�;�� �9?_��&�&��'ݴd��6G�ޕߴ�Z� �'��`-�r�m��v .��p�Zkk����������rc� Ub/�J�-S�5��v����U�b���G��je��S�d�Mwh��H�Z��\,W��%�~��c�#ֈ�_k�֒�f����#Z��eF��ɚ�6Ik�+�i���Z O@k�Z@�ZK�������Z�pυX��� )�9E�(q{9_��g���q�K�OS�M��biW*�6�����+��Z9��2�����t ўÇ�=3՛���}ͦ��
9:5�������`M��K�i��ּ��Z+[�� ���T��� ��O+c�� �N��k�j�aO�� 檓jY�Ç��sz;�R5�� 8��#���8mQ�m��֦��.�%�ӡZ�d��4�ZoOY=Ln'r3 �*��v���H�i��&��u�y�
z����#��Bk� � @��ւ��ʵ�v�1�|n�Z[��CC#
�`��Z�w���bq�cd�c�c��o/�)A_/#���9_s���{n�����3V�4�|\6�j���g1�M [[T'M��{�t���G��0gwh�n�a�� �v5��9�Y��I [���Z+o�� ���T��9
+���ڬ�:�V�(ṵ�oڤ\� ��Z O@k�Z Z����eB�U��%�Z9� ���M�e
��\�� �����
+
h��Q��fu�%�Pt.�Z yZ ��Z��V�@k剢s�� ��Z���*4��rZ+O���k-733�L�@ %�'���|�Ck�Z Z�Ѐ��h�<Qt.�������Z�@ �
� N�ɳ1[h-X �]k�<w�F��͋�JI��O�F��!���� ���CkWĚ�E���
��g��=�� ��D S��c��-y`��]��n_z�ya�ȑ���ZŰ�Z��_L?�T�@ J�MN��ɷ��_��Z�P��J������b6��&�fS��ZAh� �h�|��Ȳ�b�d.�*q{9�
z�u�2�Q������[T�)�I��6?�� ��\�&<�8;dYkx]A.Ik�8/�VI��֒#L=*��1�@� e����T��f�3F�e�A���mt-uz�+�1���%�"C Ik5m~��Ь��BkeN�N��.��N�0F^1[�P�NS�]V�K������?�D"ݾuS^�SKL5�Z���Z%��Z[��a��h�z����S�r��~��2�{�}z�Ϟe��Z�
+T��nC�G�! � 6��n�h����f�Z[�R-�V��Z�!�3n-QSn�a^/�o��[.�T+jmҾmN7#v7XXk3�Z� ����x�v��������.5�z�� �h�2wh-P��ڄj�����Y6D��� YLn��j��oL��2� �_���ʜ��K����&j-�3 )�V�n��} :C G�b��@n]�{�,����Y�Z� ����(���Vk�پu%�ܡ�@�\kӎ�M[:�E�֊z���Zh��I��8��-4>6��K?�u��骵Y�Z� ����(��Bk�/*�څfBN��}F[�͆.�vy�6�y�xJ��Z���: /<����ӗfF�
+�+����=֢�ݽLءK7Y�B��jm6��*h-�@�$
+���Z �ڵV���3xn�<Qt.�Z�XI\_�� �h�BZ+g���Dѹ@kb%Qp}���_��
+
h�����E��E ��D��Z @~Q��*�l��r&>���*����Z�@ +���+����r�Uz���e��\䉢s��֎ݮ��ꆍ[�m����������n��'[�#��BV��9��s(]� N? �����r�-xA ���E� � S��\ڱ�EM��%�>����c͓��%�Ak ����%k�.#��BVy�9��ώM�2sf������P(xl~K� �����$]��� ��t�ޝ�#�g��Ih- ������j
+�����"d��Cܕ�Rj��?�Z�@ ����vV��+���Z�0y/4{���h,Akcۇ��*���Uh@k� r�'��E�ZK�r�Ѧj��ۧ�~���L�u���E_ �����Mu6l���}�� tW��m������C<��t��E�ױ�1�Ř�ڛ+����������SR�g� dW�%ͮ�I/[
+�3�@�'�ڰ0)�J}����bZ;vdtV��8'����H��mwbZ;v���/���ɴ]��� �h�BZ+g��<Qt.r����ֽ�П�����o<� z��Ұc��D�ݰ���*nOͫ�~z���������놼��~{_CǃG��� ��ڞ�W)���\���6C�y|]�Z;٪���ۮ�Iw-pmB��E�V*�f[��vչ��R�w
+����6����_ �C�/���� ���m��+��j��k ��Z&��Z 2�v�u����b��٦��{�t
f�m�M5,��������E� ��,��ܶ��;��4 ٲ�]���z��8 ��i�TkM�oli���q��n�O�i{�� ���N:�����ߌNXe�}sw-
+�"�TkC�9���� �B8$��ω �j�}�1.����wB��O?�h�yV� 3�x��} �ژ٦uZh- �@k��[jt~��:��R*�v9 y�\d� ���Ԧ:!'
�%�� �$��ӃG_�8�!��X
+i���$l��Hg�I#�D������B _��� Z���\�!��O ��
q�g/ؗ� ��BN � hmTk����Y�Foi�x9_��Z��l�"i/.�p�w����b/k2�L5Ik�� �rX,iw����� ˓�OW���1^� �4Ck� r�'��E�Z��Q9����߲1�Z;���U_��j9)�"DJ,��/φ[�~��Z���N� f�g�B�e��tm(t�j���?����[ @ހ�
+�0C,�`o��(�3�����M_���φ��t��]�9����ﻑVk�Xv*&��6?ϸ�d��:¥j-9 =)Y���=�V� y��\d���\��7o�uh�? ���!� ��͠��Jo���]ͥ�6�b s]���#7#k��[\���a�h���;�q�g{�(��������1C2��E6�$�� �hm�Z[TN�4`,N.�]�q��L�sgLk���R�V�Bء��S�g6�uBN:]T��i�^� �V� y��\䩵4�nk���m���]*nGʭ�ۧv�(e&�LZ��ȱ�t��� �)�ڍ+��5���O�D���j��y���5q{ind�U�.:��� �������g�@ �z\_�� �hmLk� Ikiݕ�����֊uZ/���i�Z+Vk9r��h����
Y>4�:!'�����Wڸ�x��
+r�'��E�Z����Z�XA\_�� �hm�L���A�ήf �ʳ>#i- U+�L��U.Ek����C.6[Xq���'�.6����;�����E��E ��D��5�Z��.�����_���x�F6�Ck�*P��fզ���k%s#�>��r��E��E ��E��5�ZK����������]���� Z�1�GG8�"����9���"����(���Pk�ݿ�/�pxv���W���f� Z T�V���3�E�(:h-�@�$�� yꌭ���������B6�Ck�*��*4��r��E��E �X0>v��ba����ߞ��-����l��o,�� �Z�Ѐ���"O� ��@�3�a�k>��� �w������n��YW�6��U �Uh@k� r�'��Z�@ �1����IᙚF�v��چ W��'b����܆���w�i��&�-���km�<�;d�!����-y���<�'�[y����a���"����С�;Z�}�v�̼
�rBk��E�(:h-�PUĄ��x? ��w������C�!5B���fff&&\뾱��-�w�� kLh-P�ڌZ[��r�t&�^�8j���vv�*;ʼnϳն�9��`#Z; U ����4��e�!�u9hm�/!g y��\��B=sZ��t_������+�f[K�j�_�ǿ��p.�ï}������U ���X\e<�=A�f�����G.&ɤ��j��-��W�.�_�Ӕt�댮$�շ�Î6}�+�����Zb���B_B�@.�Dѹ@k�J"�i�x�nhvv�_kk�E�6�ocM
+�� Z����%�
;�/>�6�����[�P�%j:���Z�� )��9��T9#����"��B%�NϤ��q��ik���~�+_����?���@�@k���`��]���vvI&8-�f,�g��k:����#��*��
�lȒR�}� q }���ϳ.v�%��ǡ�
+��E��Z� �2��/�WP8 ������
������(�0;�K 1�u� J � ����6C�6�Z������eô�1-���T�Mu���&km�[����l�jm�/!g y��\�� 5�Z�333�@�����Ux�^��ϟ��/���{��mLYZ T�� �9~~�c�Y`M�y���xA����ޞ�4�W8G\�8&��RIf��>���� Z��5r� �Z ���vnn.
+�A�����U�*<�i[� � ��9��/
Z @Ԯ��a�g�]%Y�e�Z+g��<Qt.�Z ��� �p8��T�%����Y��*<����
w�������ݦ��@k���&�暏�;4�Vh��A.�Dѹ@k k�� ȏ ?��| �����x��}�{ #��Z T�V���3�E�(:h- `���R���i���3!;n�,��Ix�T��δ��RRz����b�F-���$��Z���
+
h��A.�Dѹ@k k���Z�� �w����s�N�O�ѽ_���[o�8��! ��s \�&n\ �%�Vsx�ރ�l91����|_Z��� �Uh@k� r�'��Z X�j���͍�zM�F� ���֦�pZK��45�2n�p��˯쑖��@-@k�Z9�\䉢s�֮>h�|��VUy���9���ayG��;.V� ,)}��tI��s�����~ ��~Y�ѓg�Ϟ�h���b���q���+���q�ܿ���_���<��f?���?��_Z ��Vz,�0��^&� ��(��Bk�r�'��Z�����[U��g$wZp\�*=[UZV�=�{���K����O_KW�%Z[RN5K��v���;^�m��Z�Z��37������U��~��
���G��6�������V��@-�]k�
� ��ܜ�����e=%2�V� y��\���! ��UU�~Fr���7�N�t��6�;+i���F�03�pι�[�� 2Vk�MG+Z��7�N�3���M�l���^:�{�o�������^�
��G�;��/m`�{Z ԂڵVw����N�%YkM�l�����
+�U(�E�(:h��F�*oU���� i��œWF����%b�����v��%�Z/��`I�#��Z/�[� )�F���֖]]v�+�\텿��7~�9�Y�="��ퟝ�����+��;�w*~Kh-P ��Z1��V����\���� �"O� �v�A#d����iwS'�0�k�UU��
+�o��Uk[��o
+Ҳ������ގ�-NAXϜhI� *���ܫ>^�'���;!wVjk{�1�^�s���q��������������g�s�����|N�0i3h-P ��4ZKV�]���� �"O� �v�A#d ђ�7^x���?�}�Q��^��<���z9�2j�V��g���U�?.�T��x����3��Rz YMEx����d�Ֆ G�����eiʨ�U��e\�
+�v�&i �J��H��v#���Z���e� g �u�Z+s��<Qt.�����
1-�"�ڭ�VUy�+$��:|� ΄�ۛ�/)��
+v݉��u��\nS(,�Z ��^�]AN�������xtD��Zh��A.�Dѹ�^k=��nY����?��^G�>��۰��)ND\ M�����ny�)���w�9r�ʞ��e$�"d*���{=Y�L���F��c���j�pf̗�� 3c��\��;i�+h�4���d8���Zɉ�Ϳ��?� ����"ۧ�Z3NÁ[g��
{�c�)�4���tߑ˫�+M?h�H/�~��@���uw�ǁ.�|�*����o6�Pk�9v��4�y;�� h�BZ+g��<Qt.��ZI;C=�����4?v����/%*k�6p��� ��@Zs]���ַ;i�6kR�!���
�-&
�4W �p�9S&f,�,�d�D�5���\� �� ������}B��W��7���M��n�g�K�#]'�%k���*�ϭ]�@kH Z�Ѐ���"O�����QDZ��W����f���<]t�.Ֆ���M����w iq ����b�w��� <� �5�M��6M� L�z����on/��Zוm�/y�O����uEW ���
�1i��M���
+��c�?MN���K�B�D�n�5�&^��bZ+��5Ҫc��J�n��(���ui���B���q�)�Z��Ʈ>q��H�E� ��h�z�-� ���n�&L��^�Wn7�<�g�|��#,�C�?���W�YҨ�jq�n�������"�'�j莱��dm 9"�n���gZ#G֎͗7��u��_Z����g��������'n���Lڰ9�W���/��V>��Xo���tu� �6l�� O>��nr�M��"6�sƻ^Im�M�x_�� h- @k�Z9�\䉢sQ��J���aw�]*b�w�m�I��%�qd���мa�>�S� mxi}�ye�K}�H u�њ ���x�ۛ���]���im��uNߏ?�y�&_wH�(z��__wDO��� `I��^�!�wYJ'� Z+H^:��Bsck@� �:_?�k�W�" �̈́���'�Pa�9�-d�֫��q�G��3�l�l}��B�?�@�Zz� M,9���P��}�h �VrL/� �W!"Ӓ���b��ت�ޞ@�O�+x_s}���Q
�|�g\�5��';Læ�b��
�k5�͞��bm ��i={fB����LႧ � ���?��J��t{xM��� ��9 )��RIj=f6�� h- �Ykm��Z9�\䉢sQ��- ��~f������F�64ڤ���-[���D��v�kk���l8r;U;��F:!�Cŝ��>�M��w��%�(K��H����|�Ik��}���̘�������?-�F����Ć7�_�N���7t��e�wc��C�*,��d�:!�j�����ӟ��ܗT�6�|��?0��T��'i(���D�L�k���� %�i����@Z����EKZ�N��)�_1�V�ķ :!/ h- �\k� k�sY# y��\������ݶ^��;T�m�X���Y��'b��
����XP�j�vI)�-ol:v[�� ��
+���7�TC�0�r$۱���p�b[|��Q�����j�t1��� �
$\C�������n��U��i& v� r3aaf��qO�Z�z� k��>�!���͟� ��t J��X�VNZK( ��(uBJ��دon���[k����k>_*��& M�ξ�3A�x�%�#m��n��4������3� �K�a�ko ���' w=z�Ю��6�����Wk�i��̶J%�z��%� �km������@.����h-�5�i��������[^�y"f���Ji�lM����2���ް�iM˃�!��h*����o�æ-O {�ж�fB���!�hE�o�rn���u���QkzDOt�'�� �W���k��r&�� ���)��=� �ӱ�ƚ'�+�l���M�����v�&I��\��/>�V^Z�%��;v}wdD���w�:B�&����U�S �����g���b�v�l��3N�}�l���3>�HCE�]s��0j4rb�~���ܿ��~�fh\����'�j�� ����Bo
��������V��%� 5km��Zr�'�E&�^ke �ڭ�˚yua�OpQ69mU_�����H�-ڥv��_ҋCF D��f)����KZ @�Z��V� y��\����\��OU�_�//hm>�m���W�j�S�>���b�� ���������V��%� h�BZ+g��<Qt.�����Tު*O?#��%� �k��-< �w�u/�0KF��>h�JA.���h��F�*oU�����hm�i���M ��\�.��@kH Z+��(jt~��:� ì����ڕ�\� r� �����Tު*O?#9�ځ:m�8��U��̉�K�@^�y���6���� Z @�ڨ� ��9�����M5��]�����|��jYg��Y�R�-�X��|��n� ���ۋ{]�X�
Y��Dw9�?��t�s�+�
]
f�k��rt�m�.*'g�G���Z+g��<Qt.�����Tު*O?#9��3��{t�י�.�l'o��_�=z<��s��Z ��Vsl��� �3%im��� v��v���PU�<
�1��1�4�H�֨-7��ogP���ͤC�/0�V3���5d����dw�U�j-r�'�E&�Pk�6��`|���w��t��c� ����%}����s ~�� �RZ� �Dk߿�V� � ��Vk���^>`,N�Z]�E ��2�ψU�w��l�m �&hmw�)�r<G$��L���T���no�p�}d/r4G���Z+g��<Qt.2��ٵi�B_�D孪��3B�lff�H�����| ø\����%}�%k��ܼR�
<TRUNCATED>
[32/39] isis-site git commit: ISIS-1810: updates docs for 2.0.0-M1
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/274edd1d/content/versions/2.0.0-M1/guides/rgant/rgant.pdf
----------------------------------------------------------------------
diff --git a/content/versions/2.0.0-M1/guides/rgant/rgant.pdf b/content/versions/2.0.0-M1/guides/rgant/rgant.pdf
index dc738b3..ceae323 100644
--- a/content/versions/2.0.0-M1/guides/rgant/rgant.pdf
+++ b/content/versions/2.0.0-M1/guides/rgant/rgant.pdf
@@ -4,16 +4,16 @@
<< /Title (Annotations)
/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:20180812182341+01'00')
-/ModDate (D:20180812182341+01'00')
+/CreationDate (D:20180814003721+02'00')
+/ModDate (D:20180814003721+02'00')
>>
endobj
2 0 obj
<< /Type /Catalog
/Pages 3 0 R
/Names 20 0 R
-/Outlines 2064 0 R
-/PageLabels 2225 0 R
+/Outlines 2060 0 R
+/PageLabels 2221 0 R
/PageMode /UseOutlines
/OpenAction [7 0 R /FitH 842.89]
/ViewerPreferences << /DisplayDocTitle true
@@ -22,8 +22,8 @@ endobj
endobj
3 0 obj
<< /Type /Pages
-/Count 183
-/Kids [7 0 R 10 0 R 12 0 R 14 0 R 16 0 R 18 0 R 42 0 R 45 0 R 66 0 R 81 0 R 109 0 R 154 0 R 156 0 R 158 0 R 172 0 R 182 0 R 185 0 R 198 0 R 203 0 R 205 0 R 211 0 R 214 0 R 218 0 R 231 0 R 233 0 R 239 0 R 249 0 R 256 0 R 262 0 R 266 0 R 272 0 R 274 0 R 295 0 R 303 0 R 310 0 R 317 0 R 334 0 R 345 0 R 353 0 R 369 0 R 375 0 R 383 0 R 392 0 R 407 0 R 413 0 R 416 0 R 432 0 R 439 0 R 446 0 R 450 0 R 463 0 R 479 0 R 495 0 R 502 0 R 514 0 R 524 0 R 530 0 R 533 0 R 541 0 R 549 0 R 556 0 R 558 0 R 563 0 R 577 0 R 582 0 R 598 0 R 625 0 R 631 0 R 634 0 R 647 0 R 660 0 R 666 0 R 671 0 R 677 0 R 681 0 R 684 0 R 690 0 R 700 0 R 705 0 R 713 0 R 725 0 R 737 0 R 743 0 R 749 0 R 756 0 R 763 0 R 767 0 R 774 0 R 795 0 R 801 0 R 808 0 R 825 0 R 835 0 R 841 0 R 858 0 R 868 0 R 881 0 R 893 0 R 904 0 R 910 0 R 916 0 R 926 0 R 931 0 R 941 0 R 948 0 R 957 0 R 963 0 R 969 0 R 980 0 R 989 0 R 992 0 R 995 0 R 1002 0 R 1006 0 R 1019 0 R 1025 0 R 1028 0 R 1034 0 R 1044 0 R 1051 0 R 1053 0 R 1057 0 R 1066 0 R 1072 0
R 1082 0 R 1091 0 R 1099 0 R 1103 0 R 1108 0 R 1110 0 R 1123 0 R 1136 0 R 1146 0 R 1161 0 R 1167 0 R 1172 0 R 1175 0 R 1188 0 R 1194 0 R 1205 0 R 1209 0 R 1218 0 R 1225 0 R 1230 0 R 1243 0 R 1253 0 R 1267 0 R 1275 0 R 1280 0 R 1284 0 R 1292 0 R 1298 0 R 1303 0 R 1317 0 R 1324 0 R 1332 0 R 1337 0 R 1342 0 R 1349 0 R 1352 0 R 1355 0 R 1361 0 R 1377 0 R 1393 0 R 1406 0 R 1423 0 R 1429 0 R 1441 0 R 1448 0 R 1454 0 R 1462 0 R 1465 0 R 1471 0 R 1476 0 R 1478 0 R 1484 0 R 1490 0 R 1507 0 R 1524 0 R 1543 0 R 1554 0 R 1559 0 R 1574 0 R]
+/Count 182
+/Kids [7 0 R 10 0 R 12 0 R 14 0 R 16 0 R 18 0 R 42 0 R 45 0 R 66 0 R 81 0 R 109 0 R 154 0 R 156 0 R 158 0 R 172 0 R 182 0 R 185 0 R 198 0 R 203 0 R 205 0 R 211 0 R 214 0 R 218 0 R 231 0 R 233 0 R 239 0 R 249 0 R 256 0 R 262 0 R 266 0 R 272 0 R 274 0 R 295 0 R 303 0 R 310 0 R 317 0 R 334 0 R 345 0 R 353 0 R 369 0 R 375 0 R 383 0 R 392 0 R 407 0 R 413 0 R 416 0 R 432 0 R 439 0 R 446 0 R 450 0 R 463 0 R 479 0 R 495 0 R 502 0 R 514 0 R 524 0 R 530 0 R 533 0 R 541 0 R 549 0 R 556 0 R 558 0 R 563 0 R 577 0 R 582 0 R 598 0 R 625 0 R 631 0 R 634 0 R 647 0 R 659 0 R 665 0 R 670 0 R 676 0 R 680 0 R 683 0 R 689 0 R 699 0 R 704 0 R 712 0 R 724 0 R 736 0 R 742 0 R 748 0 R 755 0 R 762 0 R 766 0 R 773 0 R 794 0 R 800 0 R 807 0 R 824 0 R 834 0 R 841 0 R 860 0 R 866 0 R 880 0 R 892 0 R 902 0 R 909 0 R 914 0 R 924 0 R 929 0 R 939 0 R 946 0 R 955 0 R 961 0 R 967 0 R 978 0 R 987 0 R 990 0 R 993 0 R 1000 0 R 1004 0 R 1017 0 R 1025 0 R 1028 0 R 1034 0 R 1044 0 R 1051 0 R 1053 0 R 1057 0 R 1066 0 R 1072 0
R 1082 0 R 1091 0 R 1099 0 R 1103 0 R 1108 0 R 1110 0 R 1123 0 R 1136 0 R 1146 0 R 1161 0 R 1167 0 R 1172 0 R 1175 0 R 1188 0 R 1194 0 R 1205 0 R 1214 0 R 1221 0 R 1226 0 R 1239 0 R 1249 0 R 1263 0 R 1271 0 R 1276 0 R 1280 0 R 1288 0 R 1294 0 R 1299 0 R 1313 0 R 1320 0 R 1328 0 R 1333 0 R 1338 0 R 1345 0 R 1348 0 R 1351 0 R 1357 0 R 1373 0 R 1389 0 R 1402 0 R 1419 0 R 1425 0 R 1437 0 R 1444 0 R 1450 0 R 1458 0 R 1461 0 R 1467 0 R 1472 0 R 1474 0 R 1480 0 R 1486 0 R 1503 0 R 1520 0 R 1539 0 R 1550 0 R 1555 0 R 1570 0 R]
>>
endobj
4 0 obj
@@ -80,11 +80,11 @@ endobj
<< /Type /Font
/BaseFont /AAAAAY+NotoSerif
/Subtype /TrueType
-/FontDescriptor 2227 0 R
+/FontDescriptor 2223 0 R
/FirstChar 32
/LastChar 255
-/Widths 2229 0 R
-/ToUnicode 2228 0 R
+/Widths 2225 0 R
+/ToUnicode 2224 0 R
>>
endobj
9 0 obj
@@ -1937,7 +1937,7 @@ endobj
/F3.0 40 0 R
>>
>>
-/Annots [1580 0 R 1581 0 R 1582 0 R 1583 0 R 1584 0 R 1585 0 R 1586 0 R 1587 0 R 1588 0 R 1589 0 R 1590 0 R 1591 0 R 1592 0 R 1593 0 R 1594 0 R 1595 0 R 1596 0 R 1597 0 R 1598 0 R 1599 0 R 1600 0 R 1601 0 R 1602 0 R 1603 0 R 1604 0 R 1605 0 R 1606 0 R 1607 0 R 1608 0 R 1609 0 R 1610 0 R 1611 0 R 1612 0 R 1613 0 R 1614 0 R 1615 0 R 1616 0 R 1617 0 R 1618 0 R 1619 0 R 1620 0 R 1621 0 R 1622 0 R 1623 0 R 1624 0 R 1625 0 R 1626 0 R 1627 0 R 1628 0 R 1629 0 R 1630 0 R 1631 0 R 1632 0 R 1633 0 R 1634 0 R 1635 0 R 1636 0 R 1637 0 R 1638 0 R 1639 0 R 1640 0 R 1641 0 R 1642 0 R 1643 0 R 1644 0 R 1645 0 R 1646 0 R 1647 0 R 1648 0 R 1649 0 R 1650 0 R 1651 0 R 1652 0 R 1653 0 R 1654 0 R 1655 0 R 1656 0 R 1657 0 R 1658 0 R 1659 0 R 1660 0 R 1661 0 R 1662 0 R 1663 0 R 1664 0 R 1665 0 R 1666 0 R 1667 0 R 1668 0 R 1669 0 R 1670 0 R 1671 0 R 1672 0 R 1673 0 R 1674 0 R 1675 0 R 1676 0 R 1677 0 R 1678 0 R 1679 0 R 1680 0 R 1681 0 R 1682 0 R]
+/Annots [1576 0 R 1577 0 R 1578 0 R 1579 0 R 1580 0 R 1581 0 R 1582 0 R 1583 0 R 1584 0 R 1585 0 R 1586 0 R 1587 0 R 1588 0 R 1589 0 R 1590 0 R 1591 0 R 1592 0 R 1593 0 R 1594 0 R 1595 0 R 1596 0 R 1597 0 R 1598 0 R 1599 0 R 1600 0 R 1601 0 R 1602 0 R 1603 0 R 1604 0 R 1605 0 R 1606 0 R 1607 0 R 1608 0 R 1609 0 R 1610 0 R 1611 0 R 1612 0 R 1613 0 R 1614 0 R 1615 0 R 1616 0 R 1617 0 R 1618 0 R 1619 0 R 1620 0 R 1621 0 R 1622 0 R 1623 0 R 1624 0 R 1625 0 R 1626 0 R 1627 0 R 1628 0 R 1629 0 R 1630 0 R 1631 0 R 1632 0 R 1633 0 R 1634 0 R 1635 0 R 1636 0 R 1637 0 R 1638 0 R 1639 0 R 1640 0 R 1641 0 R 1642 0 R 1643 0 R 1644 0 R 1645 0 R 1646 0 R 1647 0 R 1648 0 R 1649 0 R 1650 0 R 1651 0 R 1652 0 R 1653 0 R 1654 0 R 1655 0 R 1656 0 R 1657 0 R 1658 0 R 1659 0 R 1660 0 R 1661 0 R 1662 0 R 1663 0 R 1664 0 R 1665 0 R 1666 0 R 1667 0 R 1668 0 R 1669 0 R 1670 0 R 1671 0 R 1672 0 R 1673 0 R 1674 0 R 1675 0 R 1676 0 R 1677 0 R 1678 0 R]
>>
endobj
11 0 obj
@@ -4019,7 +4019,7 @@ endobj
/F3.0 40 0 R
>>
>>
-/Annots [1683 0 R 1684 0 R 1685 0 R 1686 0 R 1687 0 R 1688 0 R 1689 0 R 1690 0 R 1691 0 R 1692 0 R 1693 0 R 1694 0 R 1695 0 R 1696 0 R 1697 0 R 1698 0 R 1699 0 R 1700 0 R 1701 0 R 1702 0 R 1703 0 R 1704 0 R 1705 0 R 1706 0 R 1707 0 R 1708 0 R 1709 0 R 1710 0 R 1711 0 R 1712 0 R 1713 0 R 1714 0 R 1715 0 R 1716 0 R 1717 0 R 1718 0 R 1719 0 R 1720 0 R 1721 0 R 1722 0 R 1723 0 R 1724 0 R 1725 0 R 1726 0 R 1727 0 R 1728 0 R 1729 0 R 1730 0 R 1731 0 R 1732 0 R 1733 0 R 1734 0 R 1735 0 R 1736 0 R 1737 0 R 1738 0 R 1739 0 R 1740 0 R 1741 0 R 1742 0 R 1743 0 R 1744 0 R 1745 0 R 1746 0 R 1747 0 R 1748 0 R 1749 0 R 1750 0 R 1751 0 R 1752 0 R 1753 0 R 1754 0 R 1755 0 R 1756 0 R 1757 0 R 1758 0 R 1759 0 R 1760 0 R 1761 0 R 1762 0 R 1763 0 R 1764 0 R 1765 0 R 1766 0 R 1767 0 R 1768 0 R 1769 0 R 1770 0 R 1771 0 R 1772 0 R 1773 0 R 1774 0 R 1775 0 R 1776 0 R 1777 0 R 1778 0 R 1779 0 R 1780 0 R 1781 0 R 1782 0 R 1783 0 R 1784 0 R 1785 0 R 1786 0 R 1787 0 R 1788 0 R 1789 0 R 1790 0 R 1791 0 R 1792 0
R 1793 0 R 1794 0 R 1795 0 R 1796 0 R 1797 0 R 1798 0 R 1799 0 R 1800 0 R 1801 0 R 1802 0 R]
+/Annots [1679 0 R 1680 0 R 1681 0 R 1682 0 R 1683 0 R 1684 0 R 1685 0 R 1686 0 R 1687 0 R 1688 0 R 1689 0 R 1690 0 R 1691 0 R 1692 0 R 1693 0 R 1694 0 R 1695 0 R 1696 0 R 1697 0 R 1698 0 R 1699 0 R 1700 0 R 1701 0 R 1702 0 R 1703 0 R 1704 0 R 1705 0 R 1706 0 R 1707 0 R 1708 0 R 1709 0 R 1710 0 R 1711 0 R 1712 0 R 1713 0 R 1714 0 R 1715 0 R 1716 0 R 1717 0 R 1718 0 R 1719 0 R 1720 0 R 1721 0 R 1722 0 R 1723 0 R 1724 0 R 1725 0 R 1726 0 R 1727 0 R 1728 0 R 1729 0 R 1730 0 R 1731 0 R 1732 0 R 1733 0 R 1734 0 R 1735 0 R 1736 0 R 1737 0 R 1738 0 R 1739 0 R 1740 0 R 1741 0 R 1742 0 R 1743 0 R 1744 0 R 1745 0 R 1746 0 R 1747 0 R 1748 0 R 1749 0 R 1750 0 R 1751 0 R 1752 0 R 1753 0 R 1754 0 R 1755 0 R 1756 0 R 1757 0 R 1758 0 R 1759 0 R 1760 0 R 1761 0 R 1762 0 R 1763 0 R 1764 0 R 1765 0 R 1766 0 R 1767 0 R 1768 0 R 1769 0 R 1770 0 R 1771 0 R 1772 0 R 1773 0 R 1774 0 R 1775 0 R 1776 0 R 1777 0 R 1778 0 R 1779 0 R 1780 0 R 1781 0 R 1782 0 R 1783 0 R 1784 0 R 1785 0 R 1786 0 R 1787 0 R 1788 0
R 1789 0 R 1790 0 R 1791 0 R 1792 0 R 1793 0 R 1794 0 R 1795 0 R 1796 0 R 1797 0 R 1798 0 R]
>>
endobj
13 0 obj
@@ -6240,7 +6240,7 @@ ET
BT
529.4314999999999 73.95599999999956 Td
/F1.0 10.5 Tf
-<313336> Tj
+<313335> Tj
ET
0.000 0.000 0.000 SCN
@@ -6324,7 +6324,7 @@ ET
BT
529.4314999999999 55.47599999999957 Td
/F1.0 10.5 Tf
-<313337> Tj
+<313336> Tj
ET
0.000 0.000 0.000 SCN
@@ -6343,7 +6343,7 @@ endobj
/F3.0 40 0 R
>>
>>
-/Annots [1803 0 R 1804 0 R 1805 0 R 1806 0 R 1807 0 R 1808 0 R 1809 0 R 1810 0 R 1811 0 R 1812 0 R 1813 0 R 1814 0 R 1815 0 R 1816 0 R 1817 0 R 1818 0 R 1819 0 R 1820 0 R 1821 0 R 1822 0 R 1823 0 R 1824 0 R 1825 0 R 1826 0 R 1827 0 R 1828 0 R 1829 0 R 1830 0 R 1831 0 R 1832 0 R 1833 0 R 1834 0 R 1835 0 R 1836 0 R 1837 0 R 1838 0 R 1839 0 R 1840 0 R 1841 0 R 1842 0 R 1843 0 R 1844 0 R 1845 0 R 1846 0 R 1847 0 R 1848 0 R 1849 0 R 1850 0 R 1851 0 R 1852 0 R 1853 0 R 1854 0 R 1855 0 R 1856 0 R 1857 0 R 1858 0 R 1859 0 R 1860 0 R 1861 0 R 1862 0 R 1863 0 R 1864 0 R 1865 0 R 1866 0 R 1867 0 R 1868 0 R 1869 0 R 1870 0 R 1871 0 R 1872 0 R 1873 0 R 1874 0 R 1875 0 R 1876 0 R 1877 0 R 1878 0 R 1879 0 R 1880 0 R 1881 0 R 1882 0 R 1883 0 R 1884 0 R 1885 0 R 1886 0 R 1887 0 R 1888 0 R 1889 0 R 1890 0 R 1891 0 R 1892 0 R 1893 0 R 1894 0 R 1895 0 R 1896 0 R 1897 0 R 1898 0 R 1899 0 R 1900 0 R 1901 0 R 1902 0 R 1903 0 R 1904 0 R 1905 0 R 1906 0 R 1907 0 R 1908 0 R 1909 0 R 1910 0 R 1911 0 R 1912 0
R 1913 0 R 1914 0 R 1915 0 R 1916 0 R 1917 0 R 1918 0 R 1919 0 R 1920 0 R 1921 0 R 1922 0 R 1923 0 R 1924 0 R 1925 0 R 1926 0 R 1927 0 R 1928 0 R 1929 0 R 1930 0 R 1931 0 R 1932 0 R 1933 0 R 1934 0 R 1935 0 R 1936 0 R 1937 0 R 1938 0 R 1939 0 R 1940 0 R 1941 0 R 1942 0 R 1943 0 R 1944 0 R]
+/Annots [1799 0 R 1800 0 R 1801 0 R 1802 0 R 1803 0 R 1804 0 R 1805 0 R 1806 0 R 1807 0 R 1808 0 R 1809 0 R 1810 0 R 1811 0 R 1812 0 R 1813 0 R 1814 0 R 1815 0 R 1816 0 R 1817 0 R 1818 0 R 1819 0 R 1820 0 R 1821 0 R 1822 0 R 1823 0 R 1824 0 R 1825 0 R 1826 0 R 1827 0 R 1828 0 R 1829 0 R 1830 0 R 1831 0 R 1832 0 R 1833 0 R 1834 0 R 1835 0 R 1836 0 R 1837 0 R 1838 0 R 1839 0 R 1840 0 R 1841 0 R 1842 0 R 1843 0 R 1844 0 R 1845 0 R 1846 0 R 1847 0 R 1848 0 R 1849 0 R 1850 0 R 1851 0 R 1852 0 R 1853 0 R 1854 0 R 1855 0 R 1856 0 R 1857 0 R 1858 0 R 1859 0 R 1860 0 R 1861 0 R 1862 0 R 1863 0 R 1864 0 R 1865 0 R 1866 0 R 1867 0 R 1868 0 R 1869 0 R 1870 0 R 1871 0 R 1872 0 R 1873 0 R 1874 0 R 1875 0 R 1876 0 R 1877 0 R 1878 0 R 1879 0 R 1880 0 R 1881 0 R 1882 0 R 1883 0 R 1884 0 R 1885 0 R 1886 0 R 1887 0 R 1888 0 R 1889 0 R 1890 0 R 1891 0 R 1892 0 R 1893 0 R 1894 0 R 1895 0 R 1896 0 R 1897 0 R 1898 0 R 1899 0 R 1900 0 R 1901 0 R 1902 0 R 1903 0 R 1904 0 R 1905 0 R 1906 0 R 1907 0 R 1908 0
R 1909 0 R 1910 0 R 1911 0 R 1912 0 R 1913 0 R 1914 0 R 1915 0 R 1916 0 R 1917 0 R 1918 0 R 1919 0 R 1920 0 R 1921 0 R 1922 0 R 1923 0 R 1924 0 R 1925 0 R 1926 0 R 1927 0 R 1928 0 R 1929 0 R 1930 0 R 1931 0 R 1932 0 R 1933 0 R 1934 0 R 1935 0 R 1936 0 R 1937 0 R 1938 0 R 1939 0 R 1940 0 R]
>>
endobj
15 0 obj
@@ -6399,7 +6399,7 @@ ET
BT
529.4314999999999 794.6759999999999 Td
/F1.0 10.5 Tf
-<313338> Tj
+<313337> Tj
ET
0.000 0.000 0.000 SCN
@@ -6450,7 +6450,7 @@ ET
BT
529.4314999999999 776.1959999999999 Td
/F1.0 10.5 Tf
-<313339> Tj
+<313338> Tj
ET
0.000 0.000 0.000 SCN
@@ -6490,7 +6490,7 @@ ET
BT
529.4314999999999 757.7159999999999 Td
/F1.0 10.5 Tf
-<313431> Tj
+<313430> Tj
ET
0.000 0.000 0.000 SCN
@@ -6541,7 +6541,7 @@ ET
BT
529.4314999999999 739.2359999999999 Td
/F1.0 10.5 Tf
-<313435> Tj
+<313434> Tj
ET
0.000 0.000 0.000 SCN
@@ -6592,7 +6592,7 @@ ET
BT
529.4314999999999 720.7559999999999 Td
/F1.0 10.5 Tf
-<313438> Tj
+<313437> Tj
ET
0.000 0.000 0.000 SCN
@@ -6643,7 +6643,7 @@ ET
BT
529.4314999999999 702.2759999999998 Td
/F1.0 10.5 Tf
-<313438> Tj
+<313437> Tj
ET
0.000 0.000 0.000 SCN
@@ -6694,7 +6694,7 @@ ET
BT
529.4314999999999 683.7959999999998 Td
/F1.0 10.5 Tf
-<313439> Tj
+<313438> Tj
ET
0.000 0.000 0.000 SCN
@@ -6745,7 +6745,7 @@ ET
BT
529.4314999999999 665.3159999999998 Td
/F1.0 10.5 Tf
-<313530> Tj
+<313439> Tj
ET
0.000 0.000 0.000 SCN
@@ -6796,7 +6796,7 @@ ET
BT
529.4314999999999 646.8359999999998 Td
/F1.0 10.5 Tf
-<313531> Tj
+<313530> Tj
ET
0.000 0.000 0.000 SCN
@@ -6847,7 +6847,7 @@ ET
BT
529.4314999999999 628.3559999999998 Td
/F1.0 10.5 Tf
-<313532> Tj
+<313531> Tj
ET
0.000 0.000 0.000 SCN
@@ -6898,7 +6898,7 @@ ET
BT
529.4314999999999 609.8759999999997 Td
/F1.0 10.5 Tf
-<313533> Tj
+<313532> Tj
ET
0.000 0.000 0.000 SCN
@@ -6949,7 +6949,7 @@ ET
BT
529.4314999999999 591.3959999999997 Td
/F1.0 10.5 Tf
-<313536> Tj
+<313535> Tj
ET
0.000 0.000 0.000 SCN
@@ -7000,7 +7000,7 @@ ET
BT
529.4314999999999 572.9159999999997 Td
/F1.0 10.5 Tf
-<313537> Tj
+<313536> Tj
ET
0.000 0.000 0.000 SCN
@@ -7051,7 +7051,7 @@ ET
BT
529.4314999999999 554.4359999999997 Td
/F1.0 10.5 Tf
-<313538> Tj
+<313537> Tj
ET
0.000 0.000 0.000 SCN
@@ -7102,7 +7102,7 @@ ET
BT
529.4314999999999 535.9559999999997 Td
/F1.0 10.5 Tf
-<313539> Tj
+<313538> Tj
ET
0.000 0.000 0.000 SCN
@@ -7153,7 +7153,7 @@ ET
BT
529.4314999999999 517.4759999999997 Td
/F1.0 10.5 Tf
-<313539> Tj
+<313538> Tj
ET
0.000 0.000 0.000 SCN
@@ -7204,7 +7204,7 @@ ET
BT
529.4314999999999 498.9959999999997 Td
/F1.0 10.5 Tf
-<313631> Tj
+<313630> Tj
ET
0.000 0.000 0.000 SCN
@@ -7244,7 +7244,7 @@ ET
BT
529.4314999999999 480.5159999999997 Td
/F1.0 10.5 Tf
-<313632> Tj
+<313631> Tj
ET
0.000 0.000 0.000 SCN
@@ -7295,7 +7295,7 @@ ET
BT
529.4314999999999 462.03599999999966 Td
/F1.0 10.5 Tf
-<313633> Tj
+<313632> Tj
ET
0.000 0.000 0.000 SCN
@@ -7346,7 +7346,7 @@ ET
BT
529.4314999999999 443.55599999999964 Td
/F1.0 10.5 Tf
-<313633> Tj
+<313632> Tj
ET
0.000 0.000 0.000 SCN
@@ -7397,7 +7397,7 @@ ET
BT
529.4314999999999 425.0759999999996 Td
/F1.0 10.5 Tf
-<313634> Tj
+<313633> Tj
ET
0.000 0.000 0.000 SCN
@@ -7448,7 +7448,7 @@ ET
BT
529.4314999999999 406.5959999999996 Td
/F1.0 10.5 Tf
-<313635> Tj
+<313634> Tj
ET
0.000 0.000 0.000 SCN
@@ -7499,7 +7499,7 @@ ET
BT
529.4314999999999 388.1159999999996 Td
/F1.0 10.5 Tf
-<313635> Tj
+<313634> Tj
ET
0.000 0.000 0.000 SCN
@@ -7583,7 +7583,7 @@ ET
BT
529.4314999999999 369.63599999999957 Td
/F1.0 10.5 Tf
-<313637> Tj
+<313636> Tj
ET
0.000 0.000 0.000 SCN
@@ -7634,7 +7634,7 @@ ET
BT
529.4314999999999 351.15599999999955 Td
/F1.0 10.5 Tf
-<313638> Tj
+<313637> Tj
ET
0.000 0.000 0.000 SCN
@@ -7674,7 +7674,7 @@ ET
BT
529.4314999999999 332.67599999999953 Td
/F1.0 10.5 Tf
-<313638> Tj
+<313637> Tj
ET
0.000 0.000 0.000 SCN
@@ -7725,7 +7725,7 @@ ET
BT
529.4314999999999 314.1959999999995 Td
/F1.0 10.5 Tf
-<313730> Tj
+<313639> Tj
ET
0.000 0.000 0.000 SCN
@@ -7776,7 +7776,7 @@ ET
BT
529.4314999999999 295.7159999999995 Td
/F1.0 10.5 Tf
-<313732> Tj
+<313731> Tj
ET
0.000 0.000 0.000 SCN
@@ -7827,7 +7827,7 @@ ET
BT
529.4314999999999 277.2359999999995 Td
/F1.0 10.5 Tf
-<313733> Tj
+<313732> Tj
ET
0.000 0.000 0.000 SCN
@@ -7878,7 +7878,7 @@ ET
BT
529.4314999999999 258.75599999999946 Td
/F1.0 10.5 Tf
-<313733> Tj
+<313732> Tj
ET
0.000 0.000 0.000 SCN
@@ -7929,7 +7929,7 @@ ET
BT
529.4314999999999 240.27599999999947 Td
/F1.0 10.5 Tf
-<313734> Tj
+<313733> Tj
ET
0.000 0.000 0.000 SCN
@@ -7980,7 +7980,7 @@ ET
BT
529.4314999999999 221.79599999999948 Td
/F1.0 10.5 Tf
-<313734> Tj
+<313733> Tj
ET
0.000 0.000 0.000 SCN
@@ -8031,7 +8031,7 @@ ET
BT
529.4314999999999 203.3159999999995 Td
/F1.0 10.5 Tf
-<313735> Tj
+<313734> Tj
ET
0.000 0.000 0.000 SCN
@@ -8082,7 +8082,7 @@ ET
BT
529.4314999999999 184.8359999999995 Td
/F1.0 10.5 Tf
-<313735> Tj
+<313734> Tj
ET
0.000 0.000 0.000 SCN
@@ -8166,7 +8166,7 @@ ET
BT
529.4314999999999 166.3559999999995 Td
/F1.0 10.5 Tf
-<313736> Tj
+<313735> Tj
ET
0.000 0.000 0.000 SCN
@@ -8250,7 +8250,7 @@ ET
BT
529.4314999999999 147.87599999999952 Td
/F1.0 10.5 Tf
-<313737> Tj
+<313736> Tj
ET
0.000 0.000 0.000 SCN
@@ -8290,7 +8290,7 @@ ET
BT
529.4314999999999 129.39599999999953 Td
/F1.0 10.5 Tf
-<313737> Tj
+<313736> Tj
ET
0.000 0.000 0.000 SCN
@@ -8330,7 +8330,7 @@ ET
BT
529.4314999999999 110.91599999999954 Td
/F1.0 10.5 Tf
-<313738> Tj
+<313737> Tj
ET
0.000 0.000 0.000 SCN
@@ -8349,7 +8349,7 @@ endobj
/F3.0 40 0 R
>>
>>
-/Annots [1945 0 R 1946 0 R 1947 0 R 1948 0 R 1949 0 R 1950 0 R 1951 0 R 1952 0 R 1953 0 R 1954 0 R 1955 0 R 1956 0 R 1957 0 R 1958 0 R 1959 0 R 1960 0 R 1961 0 R 1962 0 R 1963 0 R 1964 0 R 1965 0 R 1966 0 R 1967 0 R 1968 0 R 1969 0 R 1970 0 R 1971 0 R 1972 0 R 1973 0 R 1974 0 R 1975 0 R 1976 0 R 1977 0 R 1978 0 R 1979 0 R 1980 0 R 1981 0 R 1982 0 R 1983 0 R 1984 0 R 1985 0 R 1986 0 R 1987 0 R 1988 0 R 1989 0 R 1990 0 R 1991 0 R 1992 0 R 1993 0 R 1994 0 R 1995 0 R 1996 0 R 1997 0 R 1998 0 R 1999 0 R 2000 0 R 2001 0 R 2002 0 R 2003 0 R 2004 0 R 2005 0 R 2006 0 R 2007 0 R 2008 0 R 2009 0 R 2010 0 R 2011 0 R 2012 0 R 2013 0 R 2014 0 R 2015 0 R 2016 0 R 2017 0 R 2018 0 R 2019 0 R 2020 0 R 2021 0 R 2022 0 R 2023 0 R 2024 0 R 2025 0 R 2026 0 R 2027 0 R 2028 0 R 2029 0 R 2030 0 R 2031 0 R 2032 0 R 2033 0 R 2034 0 R 2035 0 R 2036 0 R 2037 0 R 2038 0 R 2039 0 R 2040 0 R 2041 0 R 2042 0 R 2043 0 R 2044 0 R 2045 0 R 2046 0 R 2047 0 R 2048 0 R 2049 0 R 2050 0 R 2051 0 R 2052 0 R 2053 0 R 2054 0
R 2055 0 R 2056 0 R 2057 0 R 2058 0 R 2059 0 R 2060 0 R 2061 0 R 2062 0 R]
+/Annots [1941 0 R 1942 0 R 1943 0 R 1944 0 R 1945 0 R 1946 0 R 1947 0 R 1948 0 R 1949 0 R 1950 0 R 1951 0 R 1952 0 R 1953 0 R 1954 0 R 1955 0 R 1956 0 R 1957 0 R 1958 0 R 1959 0 R 1960 0 R 1961 0 R 1962 0 R 1963 0 R 1964 0 R 1965 0 R 1966 0 R 1967 0 R 1968 0 R 1969 0 R 1970 0 R 1971 0 R 1972 0 R 1973 0 R 1974 0 R 1975 0 R 1976 0 R 1977 0 R 1978 0 R 1979 0 R 1980 0 R 1981 0 R 1982 0 R 1983 0 R 1984 0 R 1985 0 R 1986 0 R 1987 0 R 1988 0 R 1989 0 R 1990 0 R 1991 0 R 1992 0 R 1993 0 R 1994 0 R 1995 0 R 1996 0 R 1997 0 R 1998 0 R 1999 0 R 2000 0 R 2001 0 R 2002 0 R 2003 0 R 2004 0 R 2005 0 R 2006 0 R 2007 0 R 2008 0 R 2009 0 R 2010 0 R 2011 0 R 2012 0 R 2013 0 R 2014 0 R 2015 0 R 2016 0 R 2017 0 R 2018 0 R 2019 0 R 2020 0 R 2021 0 R 2022 0 R 2023 0 R 2024 0 R 2025 0 R 2026 0 R 2027 0 R 2028 0 R 2029 0 R 2030 0 R 2031 0 R 2032 0 R 2033 0 R 2034 0 R 2035 0 R 2036 0 R 2037 0 R 2038 0 R 2039 0 R 2040 0 R 2041 0 R 2042 0 R 2043 0 R 2044 0 R 2045 0 R 2046 0 R 2047 0 R 2048 0 R 2049 0 R 2050 0
R 2051 0 R 2052 0 R 2053 0 R 2054 0 R 2055 0 R 2056 0 R 2057 0 R 2058 0 R]
>>
endobj
17 0 obj
@@ -9072,7 +9072,7 @@ endobj
/F1.0 8 0 R
/F3.0 40 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
/Annots [24 0 R 25 0 R 26 0 R 27 0 R 28 0 R 29 0 R 30 0 R 31 0 R 32 0 R 33 0 R 34 0 R 35 0 R 36 0 R 37 0 R 38 0 R]
@@ -9087,18 +9087,18 @@ endobj
>>
endobj
21 0 obj
-<< /Kids [225 0 R 329 0 R 486 0 R 547 0 R 668 0 R 776 0 R 997 0 R 1084 0 R 1153 0 R 1259 0 R 1460 0 R 1358 0 R 1551 0 R 226 0 R 1017 0 R 662 0 R 844 0 R]
+<< /Kids [225 0 R 329 0 R 486 0 R 547 0 R 667 0 R 775 0 R 995 0 R 1084 0 R 1153 0 R 1255 0 R 1456 0 R 1354 0 R 1547 0 R 226 0 R 1015 0 R 661 0 R 843 0 R]
>>
endobj
22 0 obj
<< /Type /Font
/BaseFont /AAAAAZ+NotoSerif-Bold
/Subtype /TrueType
-/FontDescriptor 2231 0 R
+/FontDescriptor 2227 0 R
/FirstChar 32
/LastChar 255
-/Widths 2233 0 R
-/ToUnicode 2232 0 R
+/Widths 2229 0 R
+/ToUnicode 2228 0 R
>>
endobj
23 0 obj
@@ -9276,11 +9276,11 @@ endobj
<< /Type /Font
/BaseFont /AAAABA+mplus1mn-regular
/Subtype /TrueType
-/FontDescriptor 2235 0 R
+/FontDescriptor 2231 0 R
/FirstChar 32
/LastChar 255
-/Widths 2237 0 R
-/ToUnicode 2236 0 R
+/Widths 2233 0 R
+/ToUnicode 2232 0 R
>>
endobj
41 0 obj
@@ -9643,7 +9643,7 @@ endobj
/F1.0 8 0 R
/F4.0 43 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
>>
@@ -9652,11 +9652,11 @@ endobj
<< /Type /Font
/BaseFont /AAAABB+mplus-1p-regular
/Subtype /TrueType
-/FontDescriptor 2239 0 R
+/FontDescriptor 2235 0 R
/FirstChar 32
/LastChar 255
-/Widths 2241 0 R
-/ToUnicode 2240 0 R
+/Widths 2237 0 R
+/ToUnicode 2236 0 R
>>
endobj
44 0 obj
@@ -12035,7 +12035,7 @@ endobj
/F5.1 48 0 R
/F6.0 50 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
/Annots [49 0 R 51 0 R 52 0 R 53 0 R 54 0 R 55 0 R 56 0 R 57 0 R 58 0 R 59 0 R 60 0 R 61 0 R 62 0 R 63 0 R 64 0 R]
@@ -12051,11 +12051,11 @@ endobj
<< /Type /Font
/BaseFont /AAAABC+FontAwesome
/Subtype /TrueType
-/FontDescriptor 2243 0 R
+/FontDescriptor 2239 0 R
/FirstChar 32
/LastChar 255
-/Widths 2245 0 R
-/ToUnicode 2244 0 R
+/Widths 2241 0 R
+/ToUnicode 2240 0 R
>>
endobj
49 0 obj
@@ -12073,11 +12073,11 @@ endobj
<< /Type /Font
/BaseFont /AAAABD+NotoSerif-Italic
/Subtype /TrueType
-/FontDescriptor 2247 0 R
+/FontDescriptor 2243 0 R
/FirstChar 32
/LastChar 255
-/Widths 2249 0 R
-/ToUnicode 2248 0 R
+/Widths 2245 0 R
+/ToUnicode 2244 0 R
>>
endobj
51 0 obj
@@ -14109,7 +14109,7 @@ endobj
/F6.0 50 0 R
/F5.1 48 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
/Annots [67 0 R 68 0 R 69 0 R 70 0 R 72 0 R 73 0 R 74 0 R 75 0 R 76 0 R 77 0 R 78 0 R]
@@ -16533,7 +16533,7 @@ endobj
/F2.0 22 0 R
/F3.0 40 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
/Annots [82 0 R 83 0 R 84 0 R 85 0 R 86 0 R 87 0 R 88 0 R 89 0 R 90 0 R 91 0 R 92 0 R 93 0 R 94 0 R 95 0 R 96 0 R 97 0 R 98 0 R 99 0 R 100 0 R 101 0 R 102 0 R 103 0 R 104 0 R 105 0 R 106 0 R]
@@ -19004,7 +19004,7 @@ endobj
/F2.0 22 0 R
/F3.0 40 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
/Annots [110 0 R 111 0 R 112 0 R 113 0 R 114 0 R 115 0 R 116 0 R 117 0 R 118 0 R 119 0 R 120 0 R 121 0 R 122 0 R 123 0 R 124 0 R 125 0 R 126 0 R 127 0 R 128 0 R 129 0 R 130 0 R 131 0 R 132 0 R 133 0 R 134 0 R 135 0 R 136 0 R 137 0 R 138 0 R 139 0 R 140 0 R 141 0 R 142 0 R 143 0 R 144 0 R 145 0 R 146 0 R 147 0 R 148 0 R 149 0 R 150 0 R 151 0 R]
@@ -20425,7 +20425,7 @@ endobj
/F3.0 40 0 R
/F1.0 8 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
>>
@@ -20833,7 +20833,7 @@ endobj
/F3.0 40 0 R
/F1.0 8 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
>>
@@ -22947,7 +22947,7 @@ endobj
/F1.0 8 0 R
/F6.0 50 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
/Annots [160 0 R 161 0 R 162 0 R 163 0 R 164 0 R 165 0 R 166 0 R 167 0 R 168 0 R 169 0 R 170 0 R]
@@ -25695,7 +25695,7 @@ endobj
/F4.0 43 0 R
/F3.1 179 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
/Annots [173 0 R 174 0 R 175 0 R 176 0 R 177 0 R 178 0 R]
@@ -25771,11 +25771,11 @@ endobj
<< /Type /Font
/BaseFont /AAAABE+mplus1mn-regular
/Subtype /TrueType
-/FontDescriptor 2251 0 R
+/FontDescriptor 2247 0 R
/FirstChar 32
/LastChar 255
-/Widths 2253 0 R
-/ToUnicode 2252 0 R
+/Widths 2249 0 R
+/ToUnicode 2248 0 R
>>
endobj
180 0 obj
@@ -27696,7 +27696,7 @@ endobj
/F6.0 50 0 R
/F4.0 43 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
>>
@@ -29479,7 +29479,7 @@ endobj
/F4.0 43 0 R
/F6.0 50 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
/Annots [187 0 R 189 0 R 190 0 R 191 0 R 192 0 R 193 0 R 194 0 R 195 0 R 196 0 R]
@@ -34113,7 +34113,7 @@ endobj
/F3.0 40 0 R
/F2.0 22 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
/Annots [199 0 R 200 0 R]
@@ -38922,13 +38922,13 @@ endobj
/F2.0 22 0 R
/F1.0 8 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
>>
endobj
204 0 obj
-<< /Length 26762
+<< /Length 26760
>>
stream
q
@@ -39178,7 +39178,7 @@ ET
BT
48.24 642.7160000000002 Td
/F1.0 10.5 Tf
-<51756172747a2e202053656520> Tj
+<51756172747a2e2053656520> Tj
ET
0.000 0.000 0.000 SCN
@@ -39187,7 +39187,7 @@ ET
0.259 0.545 0.792 SCN
BT
-110.316 642.7160000000002 Td
+107.5965 642.7160000000002 Td
/F1.0 10.5 Tf
<68657265> Tj
ET
@@ -39198,7 +39198,7 @@ ET
0.200 0.200 0.200 SCN
BT
-133.1535 642.7160000000002 Td
+130.434 642.7160000000002 Td
/F1.0 10.5 Tf
<20666f72206675727468657220696e666f726d6174696f6e206f6e207468697320746f7069632e> Tj
ET
@@ -40711,7 +40711,7 @@ endobj
/F2.0 22 0 R
/F3.1 179 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
/Annots [207 0 R 208 0 R]
@@ -40738,7 +40738,7 @@ endobj
/URI (../ugbtb/ugbtb.pdf#_ugbtb_headless-access_BackgroundCommandExecution)
>>
/Subtype /Link
-/Rect [110.316 639.6500000000002 133.1535 653.9300000000003]
+/Rect [107.5965 639.6500000000002 130.434 653.9300000000003]
/Type /Annot
>>
endobj
@@ -43271,7 +43271,7 @@ endobj
/F5.1 48 0 R
/F2.0 22 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
>>
@@ -45530,7 +45530,7 @@ endobj
/F2.0 22 0 R
/F1.0 8 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
>>
@@ -47151,7 +47151,7 @@ endobj
/F5.1 48 0 R
/F2.0 22 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
/Annots [219 0 R 220 0 R 221 0 R 222 0 R 223 0 R 227 0 R 228 0 R 229 0 R]
@@ -47222,7 +47222,7 @@ endobj
endobj
226 0 obj
<< /Limits [(_rgant_aaa_other) (default-doop-and-noop-events-12)]
-/Names [(_rgant_aaa_other) 71 0 R (_rgant_aaa_partial) 152 0 R (alternative-syntaxes) 1016 0 R (code-autocompleteaction-code) 632 0 R (code-commanddtoprocessor-code) 209 0 R (code-commanddtoprocessor-code-2) 1281 0 R (code-commandexecutein-code) 206 0 R (code-commandexecutein-code-2) 1276 0 R (default-doop-and-noop-events) 234 0 R (default-doop-and-noop-events-10) 842 0 R (default-doop-and-noop-events-11) 869 0 R (default-doop-and-noop-events-12) 911 0 R]
+/Names [(_rgant_aaa_other) 71 0 R (_rgant_aaa_partial) 152 0 R (alternative-syntaxes) 1014 0 R (code-autocompleteaction-code) 632 0 R (code-commanddtoprocessor-code) 209 0 R (code-commanddtoprocessor-code-2) 1277 0 R (code-commandexecutein-code) 206 0 R (code-commandexecutein-code-2) 1272 0 R (default-doop-and-noop-events) 234 0 R (default-doop-and-noop-events-10) 839 0 R (default-doop-and-noop-events-11) 867 0 R (default-doop-and-noop-events-12) 907 0 R]
>>
endobj
227 0 obj
@@ -48729,7 +48729,7 @@ endobj
/F1.0 8 0 R
/F5.1 48 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
>>
@@ -50252,7 +50252,7 @@ endobj
/F1.0 8 0 R
/F2.0 22 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
/Annots [236 0 R 237 0 R]
@@ -51358,7 +51358,7 @@ endobj
/F1.0 8 0 R
/F5.1 48 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
/Annots [241 0 R 242 0 R 243 0 R 244 0 R 245 0 R 246 0 R]
@@ -53246,7 +53246,7 @@ endobj
/F5.1 48 0 R
/F2.0 22 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
/Annots [251 0 R 252 0 R 253 0 R 254 0 R]
@@ -55300,7 +55300,7 @@ endobj
/F3.1 179 0 R
/F2.0 22 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
/Annots [257 0 R 258 0 R 260 0 R]
@@ -56810,7 +56810,7 @@ endobj
/F3.0 40 0 R
/F6.0 50 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
/Annots [264 0 R]
@@ -59556,7 +59556,7 @@ endobj
/F4.0 43 0 R
/F2.0 22 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
/Annots [267 0 R 268 0 R 270 0 R]
@@ -60262,7 +60262,7 @@ endobj
/F5.1 48 0 R
/F1.0 8 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
>>
@@ -62340,7 +62340,7 @@ endobj
/F1.0 8 0 R
/F6.0 50 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
/Annots [276 0 R 277 0 R 278 0 R 279 0 R 280 0 R 281 0 R 282 0 R 283 0 R 284 0 R 285 0 R 286 0 R 287 0 R 288 0 R 289 0 R 290 0 R 291 0 R 292 0 R 293 0 R]
@@ -63924,7 +63924,7 @@ endobj
/F5.1 48 0 R
/F2.0 22 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
/Annots [296 0 R 298 0 R 299 0 R 300 0 R]
@@ -65273,7 +65273,7 @@ endobj
/Contents 302 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/XObject << /I1 301 0 R
-/Stamp1 2063 0 R
+/Stamp1 2059 0 R
>>
/Font << /F5.1 48 0 R
/F1.0 8 0 R
@@ -67420,7 +67420,7 @@ endobj
/F2.0 22 0 R
/F6.0 50 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
/Annots [312 0 R 313 0 R 314 0 R 315 0 R]
@@ -69135,7 +69135,7 @@ endobj
/F6.0 50 0 R
/F2.0 22 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
/Annots [319 0 R 320 0 R 321 0 R 322 0 R 323 0 R 324 0 R 325 0 R 326 0 R 327 0 R 330 0 R 331 0 R 332 0 R]
@@ -71461,7 +71461,7 @@ endobj
/F5.1 48 0 R
/F2.0 22 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
/Annots [335 0 R 336 0 R 338 0 R 339 0 R 340 0 R 341 0 R 342 0 R 343 0 R]
@@ -73285,7 +73285,7 @@ endobj
/F5.1 48 0 R
/F2.0 22 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
/Annots [346 0 R 348 0 R 349 0 R 350 0 R 351 0 R]
@@ -75071,7 +75071,7 @@ endobj
/F3.0 40 0 R
/F2.0 22 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
/Annots [354 0 R 355 0 R 357 0 R 358 0 R 359 0 R 360 0 R 361 0 R 362 0 R 363 0 R 364 0 R 365 0 R 367 0 R]
@@ -76856,7 +76856,7 @@ endobj
/F3.1 179 0 R
>>
/XObject << /I2 371 0 R
-/Stamp1 2063 0 R
+/Stamp1 2059 0 R
>>
>>
/Annots [370 0 R 372 0 R]
@@ -77632,7 +77632,7 @@ endobj
/XObject << /I3 373 0 R
/I4 377 0 R
/I5 379 0 R
-/Stamp1 2063 0 R
+/Stamp1 2059 0 R
>>
/Font << /F1.0 8 0 R
/F3.0 40 0 R
@@ -80349,7 +80349,7 @@ endobj
/F6.0 50 0 R
/F3.1 179 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
/Annots [385 0 R 386 0 R 387 0 R 388 0 R 389 0 R 390 0 R]
@@ -81776,7 +81776,7 @@ endobj
/F2.0 22 0 R
/F6.0 50 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
/Annots [393 0 R 394 0 R 395 0 R 396 0 R 397 0 R 399 0 R 400 0 R 401 0 R 402 0 R 403 0 R 404 0 R 405 0 R]
@@ -84248,7 +84248,7 @@ endobj
/F5.1 48 0 R
/F2.0 22 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
/Annots [409 0 R 410 0 R 411 0 R]
@@ -85752,7 +85752,7 @@ endobj
/F3.0 40 0 R
/F2.0 22 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
>>
@@ -86909,7 +86909,7 @@ endobj
/F5.1 48 0 R
/F4.0 43 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
/Annots [418 0 R 419 0 R 421 0 R 422 0 R 423 0 R 424 0 R 425 0 R 426 0 R 427 0 R 428 0 R 429 0 R 430 0 R]
@@ -88578,7 +88578,7 @@ endobj
/F6.0 50 0 R
/F2.0 22 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
/Annots [434 0 R 435 0 R 436 0 R 437 0 R]
@@ -90638,7 +90638,7 @@ endobj
/F6.0 50 0 R
/F3.1 179 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
/Annots [440 0 R 441 0 R 443 0 R 444 0 R]
@@ -91700,7 +91700,7 @@ endobj
/F1.0 8 0 R
/F5.1 48 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
/Annots [448 0 R]
@@ -93394,7 +93394,7 @@ endobj
/F1.0 8 0 R
/F6.0 50 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
/Annots [452 0 R 453 0 R 454 0 R 455 0 R 456 0 R 457 0 R 458 0 R 459 0 R 460 0 R 461 0 R]
@@ -95522,7 +95522,7 @@ endobj
/F1.0 8 0 R
/F2.0 22 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
/Annots [464 0 R 465 0 R 466 0 R 467 0 R 468 0 R 469 0 R 471 0 R 472 0 R 473 0 R 474 0 R 475 0 R 476 0 R 477 0 R]
@@ -97454,7 +97454,7 @@ endobj
/F1.0 8 0 R
/F5.1 48 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
/Annots [481 0 R 482 0 R 483 0 R 484 0 R 487 0 R 488 0 R 489 0 R 490 0 R 491 0 R 492 0 R 493 0 R]
@@ -99330,7 +99330,7 @@ endobj
/F5.1 48 0 R
/F2.0 22 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
/Annots [496 0 R 498 0 R 499 0 R 500 0 R]
@@ -100916,7 +100916,7 @@ endobj
/F5.1 48 0 R
/F2.0 22 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
/Annots [503 0 R 505 0 R 506 0 R 507 0 R 508 0 R 509 0 R 510 0 R 511 0 R 512 0 R]
@@ -102608,7 +102608,7 @@ endobj
/F2.0 22 0 R
/F6.0 50 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
/Annots [515 0 R 517 0 R 518 0 R 519 0 R 520 0 R 521 0 R 522 0 R]
@@ -104509,7 +104509,7 @@ endobj
/F5.1 48 0 R
>>
/XObject << /I6 526 0 R
-/Stamp1 2063 0 R
+/Stamp1 2059 0 R
>>
>>
/Annots [527 0 R 528 0 R]
@@ -105080,7 +105080,7 @@ endobj
/F5.1 48 0 R
/F3.0 40 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
/Annots [531 0 R]
@@ -106655,7 +106655,7 @@ endobj
/F1.0 8 0 R
/F5.1 48 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
/Annots [535 0 R 537 0 R 538 0 R]
@@ -109945,7 +109945,7 @@ endobj
/F6.0 50 0 R
/F4.0 43 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
/Annots [542 0 R 544 0 R]
@@ -113426,7 +113426,7 @@ endobj
/F3.0 40 0 R
/F2.0 22 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
/Annots [550 0 R 552 0 R 553 0 R 554 0 R]
@@ -115141,7 +115141,7 @@ endobj
/Font << /F3.0 40 0 R
/F1.0 8 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
>>
@@ -116525,7 +116525,7 @@ endobj
/F1.0 8 0 R
/F3.1 179 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
/Annots [560 0 R 561 0 R]
@@ -117894,7 +117894,7 @@ endobj
/F1.0 8 0 R
/F5.1 48 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
/Annots [565 0 R 566 0 R 567 0 R 568 0 R 569 0 R 570 0 R 571 0 R 572 0 R 573 0 R]
@@ -118491,7 +118491,7 @@ endobj
/F3.0 40 0 R
/F5.1 48 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
/Annots [578 0 R 579 0 R 580 0 R]
@@ -120519,7 +120519,7 @@ endobj
/F1.0 8 0 R
/F6.0 50 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
/Annots [584 0 R 585 0 R 586 0 R 587 0 R 588 0 R 589 0 R 590 0 R 591 0 R 592 0 R 593 0 R 594 0 R 595 0 R 596 0 R]
@@ -122834,7 +122834,7 @@ endobj
/F1.0 8 0 R
/F3.1 179 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
/Annots [599 0 R 600 0 R 601 0 R 602 0 R 603 0 R 604 0 R 605 0 R 606 0 R 607 0 R 608 0 R 609 0 R 610 0 R 611 0 R 612 0 R 613 0 R 614 0 R 615 0 R 616 0 R 617 0 R 618 0 R 619 0 R 620 0 R 622 0 R 623 0 R]
@@ -124029,7 +124029,7 @@ endobj
/F5.1 48 0 R
/F4.0 43 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
/Annots [627 0 R 628 0 R 629 0 R]
@@ -125933,7 +125933,7 @@ endobj
/F3.1 179 0 R
/F2.0 22 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
>>
@@ -127500,7 +127500,7 @@ endobj
/F3.1 179 0 R
/F4.0 43 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
/Annots [635 0 R 636 0 R 637 0 R 638 0 R 639 0 R 641 0 R 642 0 R 643 0 R 644 0 R 645 0 R]
@@ -127620,7 +127620,7 @@ endobj
>>
endobj
646 0 obj
-<< /Length 20762
+<< /Length 21494
>>
stream
q
@@ -127655,12 +127655,12 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-7.772 Tw
+0.161 Tw
BT
48.24 742.866 Td
/F1.0 10.5 Tf
-<226372656174656422206c6966656379636c65206576656e742069732066697265642e202054686973206973207479706963616c6c79207768656e2074686520> Tj
+<226372656174656422206c6966656379636c65206576656e742069732066697265642e2054686973206973207479706963616c6c79207768656e2074686520> Tj
ET
@@ -127670,12 +127670,12 @@ ET
0.694 0.129 0.275 scn
0.694 0.129 0.275 SCN
-7.772 Tw
+0.161 Tw
BT
-429.74449999999996 742.866 Td
+343.1418846153846 742.866 Td
/F3.0 10.5 Tf
-<446f6d61696e4f626a656374436f6e7461696e6572> Tj
+<466163746f727953657276696365> Tj
ET
@@ -127685,12 +127685,12 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-7.772 Tw
+0.161 Tw
BT
-539.9944999999999 742.866 Td
+416.6418846153846 742.866 Td
/F1.0 10.5 Tf
-<2773> Tj
+<277320> Tj
ET
@@ -127700,12 +127700,12 @@ ET
0.694 0.129 0.275 scn
0.694 0.129 0.275 SCN
-0.268 Tw
+0.161 Tw
BT
-48.24 727.086 Td
+426.56742307692303 742.866 Td
/F3.0 10.5 Tf
-<6e65775472616e7369656e74496e7374616e63652829> Tj
+<696e7374616e74696174652829> Tj
ET
@@ -127715,42 +127715,38 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-0.268 Tw
+0.161 Tw
BT
-163.74 727.086 Td
+494.81742307692303 742.866 Td
/F1.0 10.5 Tf
-<2069732063616c6c65643b2069742077696c6c20616c736f2068617070656e20696620746865206f626a6563742069732073696d706c7920696e7374616e746961746564207769746820> Tj
+<206d6574686f64206973> 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
-
-0.268 Tw
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
-507.66499999999996 727.086 Td
-/F3.0 10.5 Tf
-<6e657728> Tj
+48.24 727.086 Td
+/F1.0 10.5 Tf
+<63616c6c65642e> 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
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
-0.268 Tw
+1.098 Tw
BT
-528.665 727.086 Td
-/F4.0 10.5 Tf
-<c9> Tj
+48.24 699.3059999999999 Td
+/F1.0 10.5 Tf
+<537562736372696265727320737562736372696265207468726f7567682074686520> Tj
ET
@@ -127760,12 +127756,12 @@ ET
0.694 0.129 0.275 scn
0.694 0.129 0.275 SCN
-0.268 Tw
+1.098 Tw
BT
-539.165 727.086 Td
+226.6057857142857 699.3059999999999 Td
/F3.0 10.5 Tf
-<29> Tj
+<4576656e7442757353657276696365> Tj
ET
@@ -127775,12 +127771,12 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-0.268 Tw
+1.098 Tw
BT
-544.415 727.086 Td
+305.35578571428573 699.3059999999999 Td
/F1.0 10.5 Tf
-<2c> Tj
+<20616e642063616e2075736520746865206576656e7420746f206f627461696e2061207265666572656e636520746f> Tj
ET
@@ -127790,65 +127786,47 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
+1.575 Tw
+
BT
-48.24 711.306 Td
+48.24 683.526 Td
/F1.0 10.5 Tf
-<616e64207468656e2074686520> Tj
+<746865206f626a656374206a75737420637265617465642e20546865207375627363726962657220636f756c64207468656e2c20666f72206578616d706c652c2075706461746520746865206f626a6563742c206567206c6f6f6b696e67207570> Tj
ET
-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
-
-BT
-114.22200000000001 711.306 Td
-/F3.0 10.5 Tf
-<536572766963655265676973747279> 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
BT
-192.972 711.306 Td
+48.24 667.746 Td
/F1.0 10.5 Tf
-<277320> Tj
-ET
-
-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
-
-BT
-202.73700000000002 711.306 Td
-/F3.0 10.5 Tf
-<696e6a6563745365727669636573496e746f28> Tj
+<73746174652066726f6d20736f6d652065787465726e616c206461746173746f72652e> Tj
ET
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
-
-BT
-302.487 711.306 Td
-/F4.0 10.5 Tf
-<c9> Tj
-ET
-
+q
+0.5 w
+0.933 0.933 0.933 SCN
+113.807 596.590 m
+113.807 651.930 l
+S
+Q
+0.067 0.067 0.067 scn
+0.067 0.067 0.067 SCN
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
+0.067 0.067 0.067 scn
+0.067 0.067 0.067 SCN
BT
-312.987 711.306 Td
-/F3.0 10.5 Tf
-<29> Tj
+80.17133333333334 615.68 Td
+/F5.1 24 Tf
+<21> Tj
ET
0.000 0.000 0.000 SCN
@@ -127856,23 +127834,27 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
+2.694 Tw
+
BT
-318.237 711.306 Td
+125.80666666666667 635.9659999999999 Td
/F1.0 10.5 Tf
-<206d6574686f642069732063616c6c65642e> Tj
+<4974d57320706f737369626c6520746f20696e7374616e7469617465206f626a6563747320776974686f757420666972696e672074686973206c6966656379636c653b206a75737420696e7374616e7469617465> 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
-1.098 Tw
+11.301 Tw
BT
-48.24 683.526 Td
+125.80666666666667 620.1859999999999 Td
/F1.0 10.5 Tf
-<537562736372696265727320737562736372696265207468726f7567682074686520> Tj
+<7573696e672069747320726567756c617220636f6e7374727563746f722c20616e64207468656e207573652074686520> Tj
ET
@@ -127882,12 +127864,12 @@ ET
0.694 0.129 0.275 scn
0.694 0.129 0.275 SCN
-1.098 Tw
+11.301 Tw
BT
-226.6057857142857 683.526 Td
+449.24449999999996 620.1859999999999 Td
/F3.0 10.5 Tf
-<4576656e7442757353657276696365> Tj
+<536572766963655265676973747279> Tj
ET
@@ -127897,40 +127879,58 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-1.098 Tw
+11.301 Tw
BT
-305.35578571428573 683.526 Td
+527.9945 620.1859999999999 Td
/F1.0 10.5 Tf
-<20616e642063616e2075736520746865206576656e7420746f206f627461696e2061207265666572656e636520746f> Tj
+<2773> 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
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
+
+BT
+125.80666666666667 604.406 Td
+/F3.0 10.5 Tf
+<696e6a6563745365727669636573496e746f28> Tj
+ET
-1.306 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
BT
-48.24 667.746 Td
-/F1.0 10.5 Tf
-<746865206f626a656374206a75737420637265617465642e2020546865207375627363726962657220636f756c64207468656e2c20666f72206578616d706c652c2075706461746520746865206f626a6563742c206567206c6f6f6b696e67207570> Tj
+225.55666666666667 604.406 Td
+/F4.0 10.5 Tf
+<c9> Tj
ET
+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
+
+BT
+236.05666666666667 604.406 Td
+/F3.0 10.5 Tf
+<29> 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
BT
-48.24 651.966 Td
+241.30666666666667 604.406 Td
/F1.0 10.5 Tf
-<73746174652066726f6d20736f6d652065787465726e616c206461746173746f72652e> Tj
+[<20746f206d616e75616c6c7920696e6a65637420616e> 20.01953125 <7920726571756972656420646f6d61696e2073657276696365732e>] TJ
ET
0.000 0.000 0.000 SCN
@@ -127939,7 +127939,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24 624.1859999999999 Td
+48.24000000000001 572.6259999999999 Td
/F1.0 10.5 Tf
[<42> 20.01953125 <792064656661756c7420746865206576656e742072> 20.01953125 <616973656420697320>] TJ
ET
@@ -127950,7 +127950,7 @@ ET
0.694 0.129 0.275 SCN
BT
-195.17658984375 624.1859999999999 Td
+195.17658984375 572.6259999999999 Td
/F3.0 10.5 Tf
<4f626a656374437265617465644576656e742e44656661756c74> Tj
ET
@@ -127961,7 +127961,7 @@ ET
0.200 0.200 0.200 SCN
BT
-331.67658984375 624.1859999999999 Td
+331.67658984375 572.6259999999999 Td
/F1.0 10.5 Tf
[<2e2046> 40.0390625 <6f72206578616d706c653a>] TJ
ET
@@ -127970,28 +127970,28 @@ ET
0.000 0.000 0.000 scn
q
0.961 0.961 0.961 scn
-52.240 608.370 m
-543.040 608.370 l
-545.249 608.370 547.040 606.579 547.040 604.370 c
-547.040 531.410 l
-547.040 529.201 545.249 527.410 543.040 527.410 c
-52.240 527.410 l
-50.031 527.410 48.240 529.201 48.240 531.410 c
-48.240 604.370 l
-48.240 606.579 50.031 608.370 52.240 608.370 c
+52.240 556.810 m
+543.040 556.810 l
+545.249 556.810 547.040 555.019 547.040 552.810 c
+547.040 479.850 l
+547.040 477.641 545.249 475.850 543.040 475.850 c
+52.240 475.850 l
+50.031 475.850 48.240 477.641 48.240 479.850 c
+48.240 552.810 l
+48.240 555.019 50.031 556.810 52.240 556.810 c
h
f
0.800 0.800 0.800 SCN
0.75 w
-52.240 608.370 m
-543.040 608.370 l
-545.249 608.370 547.040 606.579 547.040 604.370 c
-547.040 531.410 l
-547.040 529.201 545.249 527.410 543.040 527.410 c
-52.240 527.410 l
-50.031 527.410 48.240 529.201 48.240 531.410 c
-48.240 604.370 l
-48.240 606.579 50.031 608.370 52.240 608.370 c
+52.240 556.810 m
+543.040 556.810 l
+545.249 556.810 547.040 555.019 547.040 552.810 c
+547.040 479.850 l
+547.040 477.641 545.249 475.850 543.040 475.850 c
+52.240 475.850 l
+50.031 475.850 48.240 477.641 48.240 479.850 c
+48.240 552.810 l
+48.240 555.019 50.031 556.810 52.240 556.810 c
h
S
Q
@@ -127999,7 +127999,7 @@ Q
0.600 0.600 1.000 SCN
BT
-59.24 585.545 Td
+59.24000000000001 533.9849999999999 Td
/F3.0 11 Tf
<40446f6d61696e4f626a656374> Tj
ET
@@ -128010,7 +128010,7 @@ ET
0.000 0.400 0.600 SCN
BT
-59.24 570.805 Td
+59.24000000000001 519.2449999999999 Td
/F3.0 11 Tf
<7075626c6963> Tj
ET
@@ -128021,7 +128021,7 @@ ET
0.200 0.200 0.200 SCN
BT
-92.24000000000001 570.805 Td
+92.24000000000001 519.2449999999999 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -128032,7 +128032,7 @@ ET
0.000 0.467 0.533 SCN
BT
-97.74000000000001 570.805 Td
+97.74000000000001 519.2449999999999 Td
/F3.0 11 Tf
<636c617373> Tj
ET
@@ -128043,7 +128043,7 @@ ET
0.200 0.200 0.200 SCN
BT
-125.24000000000001 570.805 Td
+125.24000000000001 519.2449999999999 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -128054,7 +128054,7 @@ ET
0.000 0.667 0.533 SCN
BT
-130.74 570.805 Td
+130.74 519.2449999999999 Td
/F3.0 11 Tf
<546f446f4974656d44746f> Tj
ET
@@ -128065,7 +128065,7 @@ ET
0.200 0.200 0.200 SCN
BT
-191.24 570.805 Td
+191.24 519.2449999999999 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -128076,7 +128076,7 @@ ET
0.200 0.200 0.200 SCN
BT
-196.74 570.805 Td
+196.74 519.2449999999999 Td
/F3.0 11 Tf
<7b> Tj
ET
@@ -128087,7 +128087,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 556.065 Td
+59.24000000000001 504.50499999999994 Td
/F3.0 11 Tf
<ca202020> Tj
ET
@@ -128098,7 +128098,7 @@ ET
0.200 0.200 0.200 SCN
BT
-81.24000000000001 556.065 Td
+81.24000000000001 504.50499999999994 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -128109,7 +128109,7 @@ ET
0.200 0.200 0.200 SCN
BT
-86.74000000000001 556.065 Td
+86.74000000000001 504.50499999999994 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -128120,7 +128120,7 @@ ET
0.200 0.200 0.200 SCN
BT
-92.24000000000001 556.065 Td
+92.24000000000001 504.50499999999994 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -128131,7 +128131,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 541.325 Td
+59.24000000000001 489.76499999999993 Td
/F3.0 11 Tf
<7d> Tj
ET
@@ -128144,7 +128144,7 @@ ET
1.180 Tw
BT
-48.24 503.44599999999997 Td
+48.24000000000001 451.8859999999999 Td
/F1.0 10.5 Tf
<54686520707572706f7365206f662074686520> Tj
ET
@@ -128159,7 +128159,7 @@ ET
1.180 Tw
BT
-149.3302857142857 503.44599999999997 Td
+149.3302857142857 451.8859999999999 Td
/F3.0 10.5 Tf
<637265617465644c6966656379636c654576656e742829> Tj
ET
@@ -128174,7 +128174,7 @@ ET
1.180 Tw
BT
-270.0802857142857 503.44599999999997 Td
+270.0802857142857 451.8859999999999 Td
/F1.0 10.5 Tf
<2061747472696275746520697320746f20616c6c6f7773206120637573746f6d20737562636c61737320746f20626520656d6974746564> Tj
ET
@@ -128187,9 +128187,9 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24 487.66599999999994 Td
+48.24000000000001 436.1059999999999 Td
/F1.0 10.5 Tf
-<696e73746561642e2020412073696d696c61722061747472696275746520697320617661696c61626c6520666f72206f74686572206c6966656379636c65206576656e74732e> Tj
+<696e73746561642e20412073696d696c61722061747472696275746520697320617661696c61626c6520666f72206f74686572206c6966656379636c65206576656e74732e> Tj
ET
0.000 0.000 0.000 SCN
@@ -128198,7 +128198,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24 459.88599999999997 Td
+48.24000000000001 408.3259999999999 Td
/F1.0 10.5 Tf
[<46> 40.0390625 <6f72206578616d706c653a>] TJ
ET
@@ -128207,28 +128207,28 @@ ET
0.000 0.000 0.000 scn
q
0.961 0.961 0.961 scn
-52.240 444.070 m
-543.040 444.070 l
-545.249 444.070 547.040 442.279 547.040 440.070 c
-547.040 293.410 l
-547.040 291.201 545.249 289.410 543.040 289.410 c
-52.240 289.410 l
-50.031 289.410 48.240 291.201 48.240 293.410 c
-48.240 440.070 l
-48.240 442.279 50.031 444.070 52.240 444.070 c
+52.240 392.510 m
+543.040 392.510 l
+545.249 392.510 547.040 390.719 547.040 388.510 c
+547.040 241.850 l
+547.040 239.641 545.249 237.850 543.040 237.850 c
+52.240 237.850 l
+50.031 237.850 48.240 239.641 48.240 241.850 c
+48.240 388.510 l
+48.240 390.719 50.031 392.510 52.240 392.510 c
h
f
0.800 0.800 0.800 SCN
0.75 w
-52.240 444.070 m
-543.040 444.070 l
-545.249 444.070 547.040 442.279 547.040 440.070 c
-547.040 293.410 l
-547.040 291.201 545.249 289.410 543.040 289.410 c
-52.240 289.410 l
-50.031 289.410 48.240 291.201 48.240 293.410 c
-48.240 440.070 l
-48.240 442.279 50.031 444.070 52.240 444.070 c
+52.240 392.510 m
+543.040 392.510 l
+545.249 392.510 547.040 390.719 547.040 388.510 c
+547.040 241.850 l
+547.040 239.641 545.249 237.850 543.040 237.850 c
+52.240 237.850 l
+50.031 237.850 48.240 239.641 48.240 241.850 c
+48.240 388.510 l
+48.240 390.719 50.031 392.510 52.240 392.510 c
h
S
Q
@@ -128236,7 +128236,7 @@ Q
0.600 0.600 1.000 SCN
BT
-59.24 421.24499999999995 Td
+59.24000000000001 369.6849999999999 Td
/F3.0 11 Tf
<40446f6d61696e4f626a6563744c61796f7574> Tj
ET
@@ -128247,7 +128247,7 @@ ET
0.200 0.200 0.200 SCN
BT
-163.74 421.24499999999995 Td
+163.74 369.6849999999999 Td
/F3.0 11 Tf
<28> Tj
ET
@@ -128258,7 +128258,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 406.50499999999994 Td
+59.24000000000001 354.9449999999999 Td
/F3.0 11 Tf
<ca202020> Tj
ET
@@ -128269,7 +128269,7 @@ ET
0.200 0.200 0.200 SCN
BT
-81.24000000000001 406.50499999999994 Td
+81.24000000000001 354.9449999999999 Td
/F3.0 11 Tf
<637265617465644c6966656379636c654576656e74> Tj
ET
@@ -128280,7 +128280,7 @@ ET
0.200 0.200 0.200 SCN
BT
-196.74 406.50499999999994 Td
+196.74 354.9449999999999 Td
/F3.0 11 Tf
<3d> Tj
ET
@@ -128291,7 +128291,7 @@ ET
0.200 0.200 0.200 SCN
BT
-202.24 406.50499999999994 Td
+202.24 354.9449999999999 Td
/F3.0 11 Tf
<546f446f4974656d> Tj
ET
@@ -128302,7 +128302,7 @@ ET
0.200 0.200 0.200 SCN
BT
-246.24 406.50499999999994 Td
+246.24 354.9449999999999 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -128313,7 +128313,7 @@ ET
0.200 0.200 0.200 SCN
BT
-251.74 406.50499999999994 Td
+251.74 354.9449999999999 Td
/F3.0 11 Tf
<437265617465644576656e74> Tj
ET
@@ -128324,7 +128324,7 @@ ET
0.200 0.200 0.200 SCN
BT
-317.74 406.50499999999994 Td
+317.74 354.9449999999999 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -128335,7 +128335,7 @@ ET
0.200 0.200 0.200 SCN
BT
-323.24 406.50499999999994 Td
+323.24 354.9449999999999 Td
/F3.0 11 Tf
<636c617373> Tj
ET
@@ -128346,7 +128346,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 391.76499999999993 Td
+59.24000000000001 340.20499999999987 Td
/F3.0 11 Tf
<29> Tj
ET
@@ -128357,7 +128357,7 @@ ET
0.000 0.400 0.600 SCN
BT
-59.24 377.0249999999999 Td
+59.24000000000001 325.46499999999986 Td
/F3.0 11 Tf
<7075626c6963> Tj
ET
@@ -128368,7 +128368,7 @@ ET
0.200 0.200 0.200 SCN
BT
-92.24000000000001 377.0249999999999 Td
+92.24000000000001 325.46499999999986 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -128379,7 +128379,7 @@ ET
0.000 0.467 0.533 SCN
BT
-97.74000000000001 377.0249999999999 Td
+97.74000000000001 325.46499999999986 Td
/F3.0 11 Tf
<636c617373> Tj
ET
@@ -128390,7 +128390,7 @@ ET
0.200 0.200 0.200 SCN
BT
-125.24000000000001 377.0249999999999 Td
+125.24000000000001 325.46499999999986 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -128401,7 +128401,7 @@ ET
0.000 0.667 0.533 SCN
BT
-130.74 377.0249999999999 Td
+130.74 325.46499999999986 Td
/F3.0 11 Tf
<546f446f4974656d> Tj
ET
@@ -128412,7 +128412,7 @@ ET
0.200 0.200 0.200 SCN
BT
-174.74 377.0249999999999 Td
+174.74 325.46499999999986 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -128423,7 +128423,7 @@ ET
0.200 0.200 0.200 SCN
BT
-180.24 377.0249999999999 Td
+180.24 325.46499999999986 Td
/F3.0 11 Tf
<7b> Tj
ET
@@ -128434,7 +128434,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 362.2849999999999 Td
+59.24000000000001 310.72499999999985 Td
/F3.0 11 Tf
<ca202020> Tj
ET
@@ -128445,7 +128445,7 @@ ET
0.000 0.400 0.600 SCN
BT
-81.24000000000001 362.2849999999999 Td
+81.24000000000001 310.72499999999985 Td
/F3.0 11 Tf
<7075626c6963> Tj
ET
@@ -128456,7 +128456,7 @@ ET
0.200 0.200 0.200 SCN
BT
-114.24000000000001 362.2849999999999 Td
+114.24000000000001 310.72499999999985 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -128467,7 +128467,7 @@ ET
0.000 0.400 0.600 SCN
BT
-119.74000000000001 362.2849999999999 Td
+119.74000000000001 310.72499999999985 Td
/F3.0 11 Tf
<737461746963> Tj
ET
@@ -128478,7 +128478,7 @@ ET
0.200 0.200 0.200 SCN
BT
-152.74 362.2849999999999 Td
+152.74 310.72499999999985 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -128489,7 +128489,7 @@ ET
0.000 0.467 0.533 SCN
BT
-158.24 362.2849999999999 Td
+158.24 310.72499999999985 Td
/F3.0 11 Tf
<636c617373> Tj
ET
@@ -128500,7 +128500,7 @@ ET
0.200 0.200 0.200 SCN
BT
-185.74 362.2849999999999 Td
+185.74 310.72499999999985 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -128511,7 +128511,7 @@ ET
0.000 0.667 0.533 SCN
BT
-191.24 362.2849999999999 Td
+191.24 310.72499999999985 Td
/F3.0 11 Tf
<437265617465644576656e74> Tj
ET
@@ -128522,7 +128522,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 347.54499999999996 Td
+59.24000000000001 295.9849999999999 Td
/F3.0 11 Tf
<ca20202020202020> Tj
ET
@@ -128533,7 +128533,7 @@ ET
0.000 0.400 0.600 SCN
BT
-103.24000000000001 347.54499999999996 Td
+103.24000000000001 295.9849999999999 Td
/F3.0 11 Tf
<657874656e6473> Tj
ET
@@ -128544,7 +128544,7 @@ ET
0.200 0.200 0.200 SCN
BT
-141.74 347.54499999999996 Td
+141.74 295.9849999999999 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -128555,7 +128555,7 @@ ET
0.200 0.200 0.200 SCN
BT
-147.24 347.54499999999996 Td
+147.24 295.9849999999999 Td
/F3.0 11 Tf
<6f7267> Tj
ET
@@ -128566,7 +128566,7 @@ ET
0.200 0.200 0.200 SCN
BT
-163.74 347.54499999999996 Td
+163.74 295.9849999999999 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -128577,7 +128577,7 @@ ET
0.200 0.200 0.200 SCN
BT
-169.24 347.54499999999996 Td
+169.24 295.9849999999999 Td
/F3.0 11 Tf
<617061636865> Tj
ET
@@ -128588,7 +128588,7 @@ ET
0.200 0.200 0.200 SCN
BT
-202.24 347.54499999999996 Td
+202.24 295.9849999999999 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -128599,7 +128599,7 @@ ET
0.200 0.200 0.200 SCN
BT
-207.74 347.54499999999996 Td
+207.74 295.9849999999999 Td
/F3.0 11 Tf
<69736973> Tj
ET
@@ -128610,7 +128610,7 @@ ET
0.200 0.200 0.200 SCN
BT
-229.74 347.54499999999996 Td
+229.74 295.9849999999999 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -128621,7 +128621,7 @@ ET
0.200 0.200 0.200 SCN
BT
-235.24 347.54499999999996 Td
+235.24 295.9849999999999 Td
/F3.0 11 Tf
<6170706c6962> Tj
ET
@@ -128632,7 +128632,7 @@ ET
0.200 0.200 0.200 SCN
BT
-268.24 347.54499999999996 Td
+268.24 295.9849999999999 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -128643,7 +128643,7 @@ ET
0.200 0.200 0.200 SCN
BT
-273.74 347.54499999999996 Td
+273.74 295.9849999999999 Td
/F3.0 11 Tf
<6576656e7473> Tj
ET
@@ -128654,7 +128654,7 @@ ET
0.200 0.200 0.200 SCN
BT
-306.74 347.54499999999996 Td
+306.74 295.9849999999999 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -128665,7 +128665,7 @@ ET
0.200 0.200 0.200 SCN
BT
-312.24 347.54499999999996 Td
+312.24 295.9849999999999 Td
/F3.0 11 Tf
<6c6966656379636c65> Tj
ET
@@ -128676,7 +128676,7 @@ ET
0.200 0.200 0.200 SCN
BT
-361.74 347.54499999999996 Td
+361.74 295.9849999999999 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -128687,7 +128687,7 @@ ET
0.200 0.200 0.200 SCN
BT
-367.24 347.54499999999996 Td
+367.24 295.9849999999999 Td
/F3.0 11 Tf
<4f626a656374437265617465644576656e74> Tj
ET
@@ -128698,7 +128698,7 @@ ET
0.200 0.200 0.200 SCN
BT
-466.24 347.54499999999996 Td
+466.24 295.9849999999999 Td
/F3.0 11 Tf
<3c> Tj
ET
@@ -128709,7 +128709,7 @@ ET
0.200 0.200 0.200 SCN
BT
-471.74 347.54499999999996 Td
+471.74 295.9849999999999 Td
/F3.0 11 Tf
<546f446f4974656d> Tj
ET
@@ -128720,7 +128720,7 @@ ET
0.200 0.200 0.200 SCN
BT
-515.74 347.54499999999996 Td
+515.74 295.9849999999999 Td
/F3.0 11 Tf
<3e> Tj
ET
@@ -128731,7 +128731,7 @@ ET
0.200 0.200 0.200 SCN
BT
-521.24 347.54499999999996 Td
+521.24 295.9849999999999 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -128742,7 +128742,7 @@ ET
0.200 0.200 0.200 SCN
BT
-526.74 347.54499999999996 Td
+526.74 295.9849999999999 Td
/F3.0 11 Tf
<7b> Tj
ET
@@ -128753,7 +128753,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 332.80499999999995 Td
+59.24000000000001 281.2449999999999 Td
ET
0.000 0.000 0.000 SCN
@@ -128762,7 +128762,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 332.80499999999995 Td
+59.24000000000001 281.2449999999999 Td
/F3.0 11 Tf
<7d> Tj
ET
@@ -128773,7 +128773,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 318.06499999999994 Td
+59.24000000000001 266.5049999999999 Td
/F3.0 11 Tf
<ca202020> Tj
ET
@@ -128784,7 +128784,7 @@ ET
0.200 0.200 0.200 SCN
BT
-81.24000000000001 318.06499999999994 Td
+81.24000000000001 266.5049999999999 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -128795,7 +128795,7 @@ ET
0.200 0.200 0.200 SCN
BT
-86.74000000000001 318.06499999999994 Td
+86.74000000000001 266.5049999999999 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -128806,7 +128806,7 @@ ET
0.200 0.200 0.200 SCN
BT
-92.24000000000001 318.06499999999994 Td
+92.24000000000001 266.5049999999999 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -128817,7 +128817,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 303.32499999999993 Td
+59.24000000000001 251.76499999999987 Td
/F3.0 11 Tf
<7d> Tj
ET
@@ -128828,7 +128828,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24 265.44599999999997 Td
+48.24000000000001 213.88599999999988 Td
/F1.0 10.5 Tf
<5468652062656e6566697420697320746861742073756273637269626572732063616e206265206d6f726520746172676574656420617320746f20746865206576656e7473207468617420746865792073756273637269626520746f2e> Tj
ET
@@ -128839,7 +128839,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24 230.94599999999997 Td
+48.24000000000001 179.38599999999985 Td
/F2.0 13 Tf
<31302e342e312e205375627363726962657273> Tj
ET
@@ -128852,7 +128852,7 @@ ET
2.827 Tw
BT
-48.24 204.38599999999997 Td
+48.24000000000001 152.82599999999985 Td
/F1.0 10.5 Tf
<537562736372696265727320287768696368206d75737420626520646f6d61696e2073657276696365732920737562736372696265207573696e67206569746865722074686520> Tj
ET
@@ -128867,7 +128867,7 @@ ET
2.827 Tw
BT
-437.3982142857143 204.38599999999997 Td
+437.3982142857143 152.82599999999985 Td
/F1.0 10.5 Tf
<4775617661> Tj
ET
@@ -128882,7 +128882,7 @@ ET
2.827 Tw
BT
-469.42321428571427 204.38599999999997 Td
+469.42321428571427 152.82599999999985 Td
/F1.0 10.5 Tf
<20415049206f722028696620746865> Tj
ET
@@ -128894,10 +128894,10 @@ ET
0.694 0.129 0.275 scn
0.694 0.129 0.275 SCN
-0.349 Tw
+0.628 Tw
BT
-48.24 188.60599999999997 Td
+48.24000000000001 137.04599999999985 Td
/F3.0 10.5 Tf
<4576656e7442757353657276696365> Tj
ET
@@ -128909,10 +128909,10 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-0.349 Tw
+0.628 Tw
BT
-126.99000000000001 188.60599999999997 Td
+126.99000000000001 137.04599999999985 Td
/F1.0 10.5 Tf
<20686173206265656e20617070726f7072696174656c7920636f6e6669677572656429207573696e672074686520> Tj
ET
@@ -128924,10 +128924,10 @@ ET
0.259 0.545 0.792 scn
0.259 0.545 0.792 SCN
-0.349 Tw
+0.628 Tw
BT
-360.4010362955729 188.60599999999997 Td
+362.3536759588068 137.04599999999985 Td
/F1.0 10.5 Tf
[<41786f6e204672> 20.01953125 <616d65776f726b>] TJ
ET
@@ -128939,12 +128939,12 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-0.349 Tw
+0.628 Tw
BT
-448.2987649739583 188.60599999999997 Td
+450.5303531605113 137.04599999999985 Td
/F1.0 10.5 Tf
-<204150492e2020546865206578616d706c6573> Tj
+<204150492e20546865206578616d706c6573> Tj
ET
@@ -128955,9 +128955,9 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24 172.82599999999996 Td
+48.24000000000001 121.26599999999985 Td
/F1.0 10.5 Tf
-<62656c6f772075736520746865204775617661204150492e> Tj
+<62656c6f772061726520636f6d70617469626c65207769746820626f74682e> Tj
ET
0.000 0.000 0.000 SCN
@@ -128966,7 +128966,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24 145.04599999999996 Td
+48.24000000000001 93.48599999999985 Td
/F1.0 10.5 Tf
[<53756273637269626572732063616e2062652065697468657220636f617273652d6772> 20.01953125 <61696e65642028696620746865792073756273637269626520746f2074686520746f702d6c6576656c206576656e742074797065293a>] TJ
ET
@@ -129006,12 +129006,13 @@ endobj
/Font << /F2.0 22 0 R
/F1.0 8 0 R
/F3.0 40 0 R
+/F5.1 48 0 R
/F4.0 43 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
-/Annots [649 0 R 650 0 R 651 0 R 652 0 R 653 0 R 654 0 R 656 0 R 657 0 R 658 0 R]
+/Annots [649 0 R 650 0 R 651 0 R 652 0 R 653 0 R 655 0 R 656 0 R 657 0 R]
>>
endobj
648 0 obj
@@ -129021,10 +129022,10 @@ endobj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
-/URI (../rgsvc/rgsvc.pdf#_rgsvc_core-domain-api_DomainObjectContainer)
+/URI (../rgsvc/rgsvc.pdf#_rgsvc_core-domain-api_FactoryService)
>>
/Subtype /Link
-/Rect [429.74449999999996 741.396 539.9944999999999 751.896]
+/Rect [343.1418846153846 741.396 416.6418846153846 751.896]
/Type /Annot
>>
endobj
@@ -129032,10 +129033,10 @@ endobj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
-/URI (../rgsvc/rgsvc.pdf#_rgsvc_core-domain-api_DomainObjectContainer_object-creation-api)
+/URI (../rgsvc/rgsvc.pdf#_rgsvc_core-domain-api_EventBusService)
>>
/Subtype /Link
-/Rect [48.24 725.616 163.74 736.116]
+/Rect [226.6057857142857 697.8359999999999 305.35578571428573 708.3359999999999]
/Type /Annot
>>
endobj
@@ -129046,7 +129047,7 @@ endobj
/URI (../rgsvc/rgsvc.pdf#_rgsvc_metadata-api_ServiceRegistry)
>>
/Subtype /Link
-/Rect [202.73700000000002 709.836 302.487 720.336]
+/Rect [125.80666666666667 602.9359999999999 225.55666666666667 613.4359999999999]
/Type /Annot
>>
endobj
@@ -129057,7 +129058,7 @@ endobj
/URI (../rgsvc/rgsvc.pdf#_rgsvc_metadata-api_ServiceRegistry)
>>
/Subtype /Link
-/Rect [302.487 709.836 312.987 720.336]
+/Rect [225.55666666666667 602.9359999999999 236.05666666666667 613.4359999999999]
/Type /Annot
>>
endobj
@@ -129068,59 +129069,48 @@ endobj
/URI (../rgsvc/rgsvc.pdf#_rgsvc_metadata-api_ServiceRegistry)
>>
/Subtype /Link
-/Rect [312.987 709.836 318.237 720.336]
+/Rect [236.05666666666667 602.9359999999999 241.30666666666667 613.4359999999999]
/Type /Annot
>>
endobj
654 0 obj
-<< /Border [0 0 0]
-/A << /Type /Action
-/S /URI
-/URI (../rgsvc/rgsvc.pdf#_rgsvc_core-domain-api_EventBusService)
->>
-/Subtype /Link
-/Rect [226.6057857142857 682.0559999999999 305.35578571428573 692.5559999999999]
-/Type /Annot
->>
+[647 0 R /XYZ 0 198.06999999999988 null]
endobj
655 0 obj
-[647 0 R /XYZ 0 249.63 null]
-endobj
-656 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
/URI (https://github.com/google/guava)
>>
/Subtype /Link
-/Rect [437.3982142857143 201.31999999999996 469.42321428571427 215.59999999999997]
+/Rect [437.3982142857143 149.75999999999985 469.42321428571427 164.03999999999985]
/Type /Annot
>>
endobj
-657 0 obj
+656 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
/URI (../rgsvc/rgsvc.pdf#_rgsvc_core-domain-api_EventBusService)
>>
/Subtype /Link
-/Rect [48.24 187.13599999999997 126.99000000000001 197.63599999999997]
+/Rect [48.24000000000001 135.57599999999985 126.99000000000001 146.07599999999985]
/Type /Annot
>>
endobj
-658 0 obj
+657 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
/URI (http://www.axonframework.org/)
>>
/Subtype /Link
-/Rect [360.4010362955729 185.53999999999996 448.2987649739583 199.81999999999996]
+/Rect [362.3536759588068 133.97999999999985 450.5303531605113 148.25999999999985]
/Type /Annot
>>
endobj
-659 0 obj
-<< /Length 29456
+658 0 obj
+<< /Length 32462
>>
stream
q
@@ -129130,10 +129120,10 @@ q
52.240 805.890 m
543.040 805.890 l
545.249 805.890 547.040 804.099 547.040 801.890 c
-547.040 684.710 l
-547.040 682.501 545.249 680.710 543.040 680.710 c
-52.240 680.710 l
-50.031 680.710 48.240 682.501 48.240 684.710 c
+547.040 669.970 l
+547.040 667.761 545.249 665.970 543.040 665.970 c
+52.240 665.970 l
+50.031 665.970 48.240 667.761 48.240 669.970 c
48.240 801.890 l
48.240 804.099 50.031 805.890 52.240 805.890 c
h
@@ -129144,10 +129134,10 @@ f
52.240 805.890 m
543.040 805.890 l
545.249 805.890 547.040 804.099 547.040 801.890 c
-547.040 684.710 l
-547.040 682.501 545.249 680.710 543.040 680.710 c
-52.240 680.710 l
-50.031 680.710 48.240 682.501 48.240 684.710 c
+547.040 669.970 l
+547.040 667.761 545.249 665.970 543.040 665.970 c
+52.240 665.970 l
+50.031 665.970 48.240 667.761 48.240 669.970 c
48.240 801.890 l
48.240 804.099 50.031 805.890 52.240 805.890 c
h
@@ -129381,7 +129371,7 @@ ET
BT
81.24000000000001 753.585 Td
/F3.0 11 Tf
-<40636f6d> Tj
+<406f7267> Tj
ET
0.000 0.000 0.000 SCN
@@ -129403,7 +129393,7 @@ ET
BT
108.74000000000001 753.585 Td
/F3.0 11 Tf
-<676f6f676c65> Tj
+<61786f6e6672616d65776f726b> Tj
ET
0.000 0.000 0.000 SCN
@@ -129412,7 +129402,7 @@ ET
0.200 0.200 0.200 SCN
BT
-141.74 753.585 Td
+180.24 753.585 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -129423,9 +129413,9 @@ ET
0.200 0.200 0.200 SCN
BT
-147.24 753.585 Td
+185.74 753.585 Td
/F3.0 11 Tf
-<636f6d6d6f6e> Tj
+<6576656e7468616e646c696e67> Tj
ET
0.000 0.000 0.000 SCN
@@ -129434,7 +129424,7 @@ ET
0.200 0.200 0.200 SCN
BT
-180.24 753.585 Td
+257.24 753.585 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -129445,9 +129435,9 @@ ET
0.200 0.200 0.200 SCN
BT
-185.74 753.585 Td
+262.74 753.585 Td
/F3.0 11 Tf
-<6576656e74627573> Tj
+<616e6e6f746174696f6e> Tj
ET
0.000 0.000 0.000 SCN
@@ -129456,7 +129446,7 @@ ET
0.200 0.200 0.200 SCN
BT
-229.74 753.585 Td
+317.74 753.585 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -129467,9 +129457,9 @@ ET
0.200 0.200 0.200 SCN
BT
-235.24 753.585 Td
+323.24 753.585 Td
/F3.0 11 Tf
-<537562736372696265> Tj
+<4576656e7448616e646c6572> Tj
ET
0.000 0.000 0.000 SCN
@@ -129478,20 +129468,20 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 738.845 Td
+389.24 753.585 Td
/F3.0 11 Tf
-<ca202020> Tj
+<20> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.400 0.600 scn
-0.000 0.400 0.600 SCN
+0.600 0.600 0.600 scn
+0.600 0.600 0.600 SCN
BT
-81.24000000000001 738.845 Td
+394.74 753.585 Td
/F3.0 11 Tf
-<7075626c6963> Tj
+<2f2f206966207573696e672061786f6e> Tj
ET
0.000 0.000 0.000 SCN
@@ -129500,20 +129490,20 @@ ET
0.200 0.200 0.200 SCN
BT
-114.24000000000001 738.845 Td
+59.24 738.845 Td
/F3.0 11 Tf
-<20> Tj
+<ca202020> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.467 0.533 scn
-0.000 0.467 0.533 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
BT
-119.74000000000001 738.845 Td
+81.24000000000001 738.845 Td
/F3.0 11 Tf
-<766f6964> Tj
+<40636f6d> Tj
ET
0.000 0.000 0.000 SCN
@@ -129522,9 +129512,9 @@ ET
0.200 0.200 0.200 SCN
BT
-141.74 738.845 Td
+103.24000000000001 738.845 Td
/F3.0 11 Tf
-<20> Tj
+<2e> Tj
ET
0.000 0.000 0.000 SCN
@@ -129533,9 +129523,9 @@ ET
0.200 0.200 0.200 SCN
BT
-147.24 738.845 Td
+108.74000000000001 738.845 Td
/F3.0 11 Tf
-<6f6e> Tj
+<676f6f676c65> Tj
ET
0.000 0.000 0.000 SCN
@@ -129544,9 +129534,9 @@ ET
0.200 0.200 0.200 SCN
BT
-158.24 738.845 Td
+141.74 738.845 Td
/F3.0 11 Tf
-<28> Tj
+<2e> Tj
ET
0.000 0.000 0.000 SCN
@@ -129555,9 +129545,9 @@ ET
0.200 0.200 0.200 SCN
BT
-163.74 738.845 Td
+147.24 738.845 Td
/F3.0 11 Tf
-<4f626a656374437265617465644576656e74> Tj
+<636f6d6d6f6e> Tj
ET
0.000 0.000 0.000 SCN
@@ -129566,9 +129556,9 @@ ET
0.200 0.200 0.200 SCN
BT
-262.74 738.845 Td
+180.24 738.845 Td
/F3.0 11 Tf
-<20> Tj
+<2e> Tj
ET
0.000 0.000 0.000 SCN
@@ -129577,9 +129567,9 @@ ET
0.200 0.200 0.200 SCN
BT
-268.24 738.845 Td
+185.74 738.845 Td
/F3.0 11 Tf
-<6576> Tj
+<6576656e74627573> Tj
ET
0.000 0.000 0.000 SCN
@@ -129588,9 +129578,9 @@ ET
0.200 0.200 0.200 SCN
BT
-279.24 738.845 Td
+229.74 738.845 Td
/F3.0 11 Tf
-<29> Tj
+<2e> Tj
ET
0.000 0.000 0.000 SCN
@@ -129599,9 +129589,9 @@ ET
0.200 0.200 0.200 SCN
BT
-284.74 738.845 Td
+235.24 738.845 Td
/F3.0 11 Tf
-<20> Tj
+<537562736372696265> Tj
ET
0.000 0.000 0.000 SCN
@@ -129610,9 +129600,20 @@ ET
0.200 0.200 0.200 SCN
BT
-290.24 738.845 Td
+284.74 738.845 Td
/F3.0 11 Tf
-<7b> Tj
+<2020202020202020202020202020202020202020> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.600 0.600 0.600 scn
+0.600 0.600 0.600 SCN
+
+BT
+394.74 738.845 Td
+/F3.0 11 Tf
+<2f2f206966207573696e67206775617661> Tj
ET
0.000 0.000 0.000 SCN
@@ -129623,7 +129624,7 @@ ET
BT
59.24 724.105 Td
/F3.0 11 Tf
-<ca20202020202020> Tj
+<ca202020> Tj
ET
0.000 0.000 0.000 SCN
@@ -129632,9 +129633,9 @@ ET
0.000 0.400 0.600 SCN
BT
-103.24000000000001 724.105 Td
+81.24000000000001 724.105 Td
/F3.0 11 Tf
-<6966> Tj
+<7075626c6963> Tj
ET
0.000 0.000 0.000 SCN
@@ -129645,18 +129646,18 @@ ET
BT
114.24000000000001 724.105 Td
/F3.0 11 Tf
-<28> Tj
+<20> Tj
ET
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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
BT
119.74000000000001 724.105 Td
/F3.0 11 Tf
-<6576> Tj
+<766f6964> Tj
ET
0.000 0.000 0.000 SCN
@@ -129665,9 +129666,9 @@ ET
0.200 0.200 0.200 SCN
BT
-130.74 724.105 Td
+141.74 724.105 Td
/F3.0 11 Tf
-<2e> Tj
+<20> Tj
ET
0.000 0.000 0.000 SCN
@@ -129676,9 +129677,9 @@ ET
0.200 0.200 0.200 SCN
BT
-136.24 724.105 Td
+147.24 724.105 Td
/F3.0 11 Tf
-<676574536f75726365> Tj
+<6f6e> Tj
ET
0.000 0.000 0.000 SCN
@@ -129687,7 +129688,7 @@ ET
0.200 0.200 0.200 SCN
BT
-185.74 724.105 Td
+158.24 724.105 Td
/F3.0 11 Tf
<28> Tj
ET
@@ -129698,9 +129699,9 @@ ET
0.200 0.200 0.200 SCN
BT
-191.24 724.105 Td
+163.74 724.105 Td
/F3.0 11 Tf
-<29> Tj
+<4f626a656374437265617465644576656e74> Tj
ET
0.000 0.000 0.000 SCN
@@ -129709,20 +129710,20 @@ ET
0.200 0.200 0.200 SCN
BT
-196.74 724.105 Td
+262.74 724.105 Td
/F3.0 11 Tf
<20> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.400 0.600 scn
-0.000 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
-202.24 724.105 Td
+268.24 724.105 Td
/F3.0 11 Tf
-<696e7374616e63656f66> Tj
+<6576> Tj
ET
0.000 0.000 0.000 SCN
@@ -129731,9 +129732,9 @@ ET
0.200 0.200 0.200 SCN
BT
-257.24 724.105 Td
+279.24 724.105 Td
/F3.0 11 Tf
-<20> Tj
+<29> Tj
ET
0.000 0.000 0.000 SCN
@@ -129742,9 +129743,9 @@ ET
0.200 0.200 0.200 SCN
BT
-262.74 724.105 Td
+284.74 724.105 Td
/F3.0 11 Tf
-<546f446f4974656d> Tj
+<20> Tj
ET
0.000 0.000 0.000 SCN
@@ -129753,9 +129754,9 @@ ET
0.200 0.200 0.200 SCN
BT
-306.74 724.105 Td
+290.24 724.105 Td
/F3.0 11 Tf
-<29> Tj
+<7b> Tj
ET
0.000 0.000 0.000 SCN
@@ -129764,20 +129765,20 @@ ET
0.200 0.200 0.200 SCN
BT
-312.24 724.105 Td
+59.24 709.365 Td
/F3.0 11 Tf
-<20> Tj
+<ca20202020202020> Tj
ET
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
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
-317.74 724.105 Td
+103.24000000000001 709.365 Td
/F3.0 11 Tf
-<7b> Tj
+<6966> Tj
ET
0.000 0.000 0.000 SCN
@@ -129786,9 +129787,9 @@ ET
0.200 0.200 0.200 SCN
BT
-323.24 724.105 Td
+114.24000000000001 709.365 Td
/F3.0 11 Tf
-<20> Tj
+<28> Tj
ET
0.000 0.000 0.000 SCN
@@ -129797,9 +129798,9 @@ ET
0.200 0.200 0.200 SCN
BT
-328.74 724.105 Td
+119.74000000000001 709.365 Td
/F3.0 11 Tf
-<2e> Tj
+<6576> Tj
ET
0.000 0.000 0.000 SCN
@@ -129808,7 +129809,7 @@ ET
0.200 0.200 0.200 SCN
BT
-334.24 724.105 Td
+130.74 709.365 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -129819,9 +129820,9 @@ ET
0.200 0.200 0.200 SCN
BT
-339.74 724.105 Td
+136.24 709.365 Td
/F3.0 11 Tf
-<2e> Tj
+<676574536f75726365> Tj
ET
0.000 0.000 0.000 SCN
@@ -129830,9 +129831,9 @@ ET
0.200 0.200 0.200 SCN
BT
-345.24 724.105 Td
+185.74 709.365 Td
/F3.0 11 Tf
-<20> Tj
+<28> Tj
ET
0.000 0.000 0.000 SCN
@@ -129841,9 +129842,9 @@ ET
0.200 0.200 0.200 SCN
BT
-350.74 724.105 Td
+191.24 709.365 Td
/F3.0 11 Tf
-<7d> Tj
+<29> Tj
ET
0.000 0.000 0.000 SCN
@@ -129852,9 +129853,20 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 709.365 Td
+196.74 709.365 Td
/F3.0 11 Tf
-<ca202020> Tj
+<20> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
+
+BT
+202.24 709.365 Td
+/F3.0 11 Tf
+<696e7374616e63656f66> Tj
ET
0.000 0.000 0.000 SCN
@@ -129863,9 +129875,9 @@ ET
0.200 0.200 0.200 SCN
BT
-81.24000000000001 709.365 Td
+257.24 709.365 Td
/F3.0 11 Tf
-<7d> Tj
+<20> Tj
ET
0.000 0.000 0.000 SCN
@@ -129874,9 +129886,9 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 694.625 Td
+262.74 709.365 Td
/F3.0 11 Tf
-<7d> Tj
+<546f446f4974656d> Tj
ET
0.000 0.000 0.000 SCN
@@ -129885,47 +129897,20 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24 656.746 Td
-/F1.0 10.5 Tf
-[<6f722063616e2062652066696e652d6772> 20.01953125 <61696e6564202862> 20.01953125 <79207375627363726962696e6720746f207370656369666963206576656e74207375627479706573293a>] TJ
+306.74 709.365 Td
+/F3.0 11 Tf
+<29> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-q
-0.961 0.961 0.961 scn
-52.240 640.930 m
-543.040 640.930 l
-545.249 640.930 547.040 639.139 547.040 636.930 c
-547.040 519.750 l
-547.040 517.541 545.249 515.750 543.040 515.750 c
-52.240 515.750 l
-50.031 515.750 48.240 517.541 48.240 519.750 c
-48.240 636.930 l
-48.240 639.139 50.031 640.930 52.240 640.930 c
-h
-f
-0.800 0.800 0.800 SCN
-0.75 w
-52.240 640.930 m
-543.040 640.930 l
-545.249 640.930 547.040 639.139 547.040 636.930 c
-547.040 519.750 l
-547.040 517.541 545.249 515.750 543.040 515.750 c
-52.240 515.750 l
-50.031 515.750 48.240 517.541 48.240 519.750 c
-48.240 636.930 l
-48.240 639.139 50.031 640.930 52.240 640.930 c
-h
-S
-Q
-0.600 0.600 1.000 scn
-0.600 0.600 1.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
-59.24 618.105 Td
+312.24 709.365 Td
/F3.0 11 Tf
-<40446f6d61696e53657276696365> Tj
+<20> Tj
ET
0.000 0.000 0.000 SCN
@@ -129934,9 +129919,9 @@ ET
0.200 0.200 0.200 SCN
BT
-136.24 618.105 Td
+317.74 709.365 Td
/F3.0 11 Tf
-<28> Tj
+<7b> Tj
ET
0.000 0.000 0.000 SCN
@@ -129945,9 +129930,9 @@ ET
0.200 0.200 0.200 SCN
BT
-141.74 618.105 Td
+323.24 709.365 Td
/F3.0 11 Tf
-<6e6174757265> Tj
+<20> Tj
ET
0.000 0.000 0.000 SCN
@@ -129956,9 +129941,9 @@ ET
0.200 0.200 0.200 SCN
BT
-174.74 618.105 Td
+328.74 709.365 Td
/F3.0 11 Tf
-<3d> Tj
+<2e> Tj
ET
0.000 0.000 0.000 SCN
@@ -129967,9 +129952,9 @@ ET
0.200 0.200 0.200 SCN
BT
-180.24 618.105 Td
+334.24 709.365 Td
/F3.0 11 Tf
-<4e61747572654f6653657276696365> Tj
+<2e> Tj
ET
0.000 0.000 0.000 SCN
@@ -129978,7 +129963,7 @@ ET
0.200 0.200 0.200 SCN
BT
-262.74 618.105 Td
+339.74 709.365 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -129989,9 +129974,9 @@ ET
0.200 0.200 0.200 SCN
BT
-268.24 618.105 Td
+345.24 709.365 Td
/F3.0 11 Tf
-<444f4d41494e> Tj
+<20> Tj
ET
0.000 0.000 0.000 SCN
@@ -130000,20 +129985,20 @@ ET
0.200 0.200 0.200 SCN
BT
-301.24 618.105 Td
+350.74 709.365 Td
/F3.0 11 Tf
-<29> Tj
+<7d> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.400 0.600 scn
-0.000 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
-59.24 603.365 Td
+59.24 694.625 Td
/F3.0 11 Tf
-<7075626c6963> Tj
+<ca202020> Tj
ET
0.000 0.000 0.000 SCN
@@ -130022,20 +130007,20 @@ ET
0.200 0.200 0.200 SCN
BT
-92.24000000000001 603.365 Td
+81.24000000000001 694.625 Td
/F3.0 11 Tf
-<20> Tj
+<7d> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.467 0.533 scn
-0.000 0.467 0.533 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
-97.74000000000001 603.365 Td
+59.24 679.885 Td
/F3.0 11 Tf
-<636c617373> Tj
+<7d> Tj
ET
0.000 0.000 0.000 SCN
@@ -130044,20 +130029,47 @@ ET
0.200 0.200 0.200 SCN
BT
-125.24000000000001 603.365 Td
-/F3.0 11 Tf
-<20> Tj
+48.24 642.006 Td
+/F1.0 10.5 Tf
+[<6f722063616e2062652066696e652d6772> 20.01953125 <61696e6564202862> 20.01953125 <79207375627363726962696e6720746f207370656369666963206576656e74207375627479706573293a>] TJ
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.667 0.533 scn
-0.000 0.667 0.533 SCN
+q
+0.961 0.961 0.961 scn
+52.240 626.190 m
+543.040 626.190 l
+545.249 626.190 547.040 624.399 547.040 622.190 c
+547.040 490.270 l
+547.040 488.061 545.249 486.270 543.040 486.270 c
+52.240 486.270 l
+50.031 486.270 48.240 488.061 48.240 490.270 c
+48.240 622.190 l
+48.240 624.399 50.031 626.190 52.240 626.190 c
+h
+f
+0.800 0.800 0.800 SCN
+0.75 w
+52.240 626.190 m
+543.040 626.190 l
+545.249 626.190 547.040 624.399 547.040 622.190 c
+547.040 490.270 l
+547.040 488.061 545.249 486.270 543.040 486.270 c
+52.240 486.270 l
+50.031 486.270 48.240 488.061 48.240 490.270 c
+48.240 622.190 l
+48.240 624.399 50.031 626.190 52.240 626.190 c
+h
+S
+Q
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
BT
-130.74 603.365 Td
+59.24 603.365 Td
/F3.0 11 Tf
-<536f6d6553756273637269626572> Tj
+<40446f6d61696e53657276696365> Tj
ET
0.000 0.000 0.000 SCN
@@ -130066,20 +130078,20 @@ ET
0.200 0.200 0.200 SCN
BT
-207.74 603.365 Td
+136.24 603.365 Td
/F3.0 11 Tf
-<20> Tj
+<28> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.400 0.600 scn
-0.000 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
-213.24 603.365 Td
+141.74 603.365 Td
/F3.0 11 Tf
-<657874656e6473> Tj
+<6e6174757265> Tj
ET
0.000 0.000 0.000 SCN
@@ -130088,9 +130100,9 @@ ET
0.200 0.200 0.200 SCN
BT
-251.74 603.365 Td
+174.74 603.365 Td
/F3.0 11 Tf
-<20> Tj
+<3d> Tj
ET
0.000 0.000 0.000 SCN
@@ -130099,9 +130111,9 @@ ET
0.200 0.200 0.200 SCN
BT
-257.24 603.365 Td
+180.24 603.365 Td
/F3.0 11 Tf
-<416273747261637453756273637269626572> Tj
+<4e61747572654f6653657276696365> Tj
ET
0.000 0.000 0.000 SCN
@@ -130110,9 +130122,9 @@ ET
0.200 0.200 0.200 SCN
BT
-356.24 603.365 Td
+262.74 603.365 Td
/F3.0 11 Tf
-<20> Tj
+<2e> Tj
ET
0.000 0.000 0.000 SCN
@@ -130121,9 +130133,9 @@ ET
0.200 0.200 0.200 SCN
BT
-361.74 603.365 Td
+268.24 603.365 Td
/F3.0 11 Tf
-<7b> Tj
+<444f4d41494e> Tj
ET
0.000 0.000 0.000 SCN
@@ -130132,20 +130144,20 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 588.625 Td
+301.24 603.365 Td
/F3.0 11 Tf
-<ca202020> Tj
+<29> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.600 0.600 1.000 scn
-0.600 0.600 1.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
-81.24000000000001 588.625 Td
+59.24 588.625 Td
/F3.0 11 Tf
-<40636f6d> Tj
+<7075626c6963> Tj
ET
0.000 0.000 0.000 SCN
@@ -130154,20 +130166,20 @@ ET
0.200 0.200 0.200 SCN
BT
-103.24000000000001 588.625 Td
+92.24000000000001 588.625 Td
/F3.0 11 Tf
-<2e> Tj
+<20> Tj
ET
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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
BT
-108.74000000000001 588.625 Td
+97.74000000000001 588.625 Td
/F3.0 11 Tf
-<676f6f676c65> Tj
+<636c617373> Tj
ET
0.000 0.000 0.000 SCN
@@ -130176,20 +130188,20 @@ ET
0.200 0.200 0.200 SCN
BT
-141.74 588.625 Td
+125.24000000000001 588.625 Td
/F3.0 11 Tf
-<2e> Tj
+<20> Tj
ET
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
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
BT
-147.24 588.625 Td
+130.74 588.625 Td
/F3.0 11 Tf
-<636f6d6d6f6e> Tj
+<536f6d6553756273637269626572> Tj
ET
0.000 0.000 0.000 SCN
@@ -130198,20 +130210,20 @@ ET
0.200 0.200 0.200 SCN
BT
-180.24 588.625 Td
+207.74 588.625 Td
/F3.0 11 Tf
-<2e> Tj
+<20> Tj
ET
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
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
-185.74 588.625 Td
+213.24 588.625 Td
/F3.0 11 Tf
-<6576656e74627573> Tj
+<657874656e6473> Tj
ET
0.000 0.000 0.000 SCN
@@ -130220,9 +130232,9 @@ ET
0.200 0.200 0.200 SCN
BT
-229.74 588.625 Td
+251.74 588.625 Td
/F3.0 11 Tf
-<2e> Tj
+<20> Tj
ET
0.000 0.000 0.000 SCN
@@ -130231,9 +130243,9 @@ ET
0.200 0.200 0.200 SCN
BT
-235.24 588.625 Td
+257.24 588.625 Td
/F3.0 11 Tf
-<537562736372696265> Tj
+<416273747261637453756273637269626572> Tj
ET
0.000 0.000 0.000 SCN
@@ -130242,20 +130254,20 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 573.8850000000001 Td
+356.24 588.625 Td
/F3.0 11 Tf
-<ca202020> Tj
+<20> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.400 0.600 scn
-0.000 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
-81.24000000000001 573.8850000000001 Td
+361.74 588.625 Td
/F3.0 11 Tf
-<7075626c6963> Tj
+<7b> Tj
ET
0.000 0.000 0.000 SCN
@@ -130264,20 +130276,20 @@ ET
0.200 0.200 0.200 SCN
BT
-114.24000000000001 573.8850000000001 Td
+59.24 573.885 Td
/F3.0 11 Tf
-<20> Tj
+<ca202020> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.467 0.533 scn
-0.000 0.467 0.533 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
BT
-119.74000000000001 573.8850000000001 Td
+81.24000000000001 573.885 Td
/F3.0 11 Tf
-<766f6964> Tj
+<406f7267> Tj
ET
0.000 0.000 0.000 SCN
@@ -130286,9 +130298,9 @@ ET
0.200 0.200 0.200 SCN
BT
-141.74 573.8850000000001 Td
+103.24000000000001 573.885 Td
/F3.0 11 Tf
-<20> Tj
+<2e> Tj
ET
0.000 0.000 0.000 SCN
@@ -130297,9 +130309,9 @@ ET
0.200 0.200 0.200 SCN
BT
-147.24 573.8850000000001 Td
+108.74000000000001 573.885 Td
/F3.0 11 Tf
-<6f6e> Tj
+<61786f6e6672616d65776f726b> Tj
ET
0.000 0.000 0.000 SCN
@@ -130308,9 +130320,9 @@ ET
0.200 0.200 0.200 SCN
BT
-158.24 573.8850000000001 Td
+180.24 573.885 Td
/F3.0 11 Tf
-<28> Tj
+<2e> Tj
ET
0.000 0.000 0.000 SCN
@@ -130319,9 +130331,9 @@ ET
0.200 0.200 0.200 SCN
BT
-163.74 573.8850000000001 Td
+185.74 573.885 Td
/F3.0 11 Tf
-<546f446f4974656d> Tj
+<6576656e7468616e646c696e67> Tj
ET
0.000 0.000 0.000 SCN
@@ -130330,7 +130342,7 @@ ET
0.200 0.200 0.200 SCN
BT
-207.74 573.8850000000001 Td
+257.24 573.885 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -130341,9 +130353,9 @@ ET
0.200 0.200 0.200 SCN
BT
-213.24 573.8850000000001 Td
+262.74 573.885 Td
/F3.0 11 Tf
-<4f626a656374437265617465644576656e74> Tj
+<616e6e6f746174696f6e> Tj
ET
0.000 0.000 0.000 SCN
@@ -130352,9 +130364,9 @@ ET
0.200 0.200 0.200 SCN
BT
-312.24 573.8850000000001 Td
+317.74 573.885 Td
/F3.0 11 Tf
-<20> Tj
+<2e> Tj
ET
0.000 0.000 0.000 SCN
@@ -130363,9 +130375,9 @@ ET
0.200 0.200 0.200 SCN
BT
-317.74 573.8850000000001 Td
+323.24 573.885 Td
/F3.0 11 Tf
-<6576> Tj
+<4576656e7448616e646c6572> Tj
ET
0.000 0.000 0.000 SCN
@@ -130374,20 +130386,20 @@ ET
0.200 0.200 0.200 SCN
BT
-328.74 573.8850000000001 Td
+389.24 573.885 Td
/F3.0 11 Tf
-<29> Tj
+<20> Tj
ET
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
+0.600 0.600 0.600 scn
+0.600 0.600 0.600 SCN
BT
-334.24 573.8850000000001 Td
+394.74 573.885 Td
/F3.0 11 Tf
-<20> Tj
+<2f2f206966207573696e672061786f6e> Tj
ET
0.000 0.000 0.000 SCN
@@ -130396,20 +130408,20 @@ ET
0.200 0.200 0.200 SCN
BT
-339.74 573.8850000000001 Td
+59.24 559.145 Td
/F3.0 11 Tf
-<7b> Tj
+<ca202020> Tj
ET
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
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
BT
-59.24 559.145 Td
+81.24000000000001 559.145 Td
/F3.0 11 Tf
-<ca20202020202020> Tj
+<40636f6d> Tj
ET
0.000 0.000 0.000 SCN
@@ -130431,6 +130443,17 @@ ET
BT
108.74000000000001 559.145 Td
/F3.0 11 Tf
+<676f6f676c65> Tj
+ET
+
+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
+
+BT
+141.74 559.145 Td
+/F3.0 11 Tf
<2e> Tj
ET
@@ -130440,7 +130463,18 @@ ET
0.200 0.200 0.200 SCN
BT
-114.24000000000001 559.145 Td
+147.24 559.145 Td
+/F3.0 11 Tf
+<636f6d6d6f6e> Tj
+ET
+
+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
+
+BT
+180.24 559.145 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -130451,20 +130485,97 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 544.4050000000001 Td
+185.74 559.145 Td
+/F3.0 11 Tf
+<6576656e74627573> Tj
+ET
+
+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
+
+BT
+229.74 559.145 Td
+/F3.0 11 Tf
+<2e> Tj
+ET
+
+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
+
+BT
+235.24 559.145 Td
+/F3.0 11 Tf
+<537562736372696265> Tj
+ET
+
+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
+
+BT
+284.74 559.145 Td
+/F3.0 11 Tf
+<2020202020202020202020202020202020202020> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.600 0.600 0.600 scn
+0.600 0.600 0.600 SCN
+
+BT
+394.74 559.145 Td
+/F3.0 11 Tf
+<2f2f206966207573696e67206775617661> Tj
+ET
+
+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
+
+BT
+59.24 544.405 Td
/F3.0 11 Tf
<ca202020> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
+
+BT
+81.24000000000001 544.405 Td
+/F3.0 11 Tf
+<7075626c6963> Tj
+ET
+
+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
BT
-81.24000000000001 544.4050000000001 Td
+114.24000000000001 544.405 Td
/F3.0 11 Tf
-<7d> Tj
+<20> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
+
+BT
+119.74000000000001 544.405 Td
+/F3.0 11 Tf
+<766f6964> Tj
ET
0.000 0.000 0.000 SCN
@@ -130473,31 +130584,31 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 529.6650000000001 Td
+141.74 544.405 Td
/F3.0 11 Tf
-<7d> Tj
+<20> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-q
-0.5 w
-0.933 0.933 0.933 SCN
-113.807 448.410 m
-113.807 503.750 l
-S
-Q
-0.067 0.067 0.067 scn
-0.067 0.067 0.067 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+147.24 544.405 Td
+/F3.0 11 Tf
+<6f6e> Tj
+ET
+
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.067 0.067 0.067 scn
-0.067 0.067 0.067 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
-80.17133333333334 467.5 Td
-/F5.1 24 Tf
-<21> Tj
+158.24 544.405 Td
+/F3.0 11 Tf
+<28> Tj
ET
0.000 0.000 0.000 SCN
@@ -130505,55 +130616,109 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-30.911 Tw
+BT
+163.74 544.405 Td
+/F3.0 11 Tf
+<546f446f4974656d> Tj
+ET
+
+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
BT
-125.80666666666667 487.786 Td
-/F1.0 10.5 Tf
-[<4966207468652041786f6e4672> 20.01953125 <616d65776f726b206973206265696e6720757365642c207265706c616365>] TJ
+207.74 544.405 Td
+/F3.0 11 Tf
+<2e> Tj
ET
+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
+
+BT
+213.24 544.405 Td
+/F3.0 11 Tf
+<4f626a656374437265617465644576656e74> 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
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
-189.521 Tw
+BT
+312.24 544.405 Td
+/F3.0 11 Tf
+<20> Tj
+ET
+
+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
BT
-125.80666666666667 472.006 Td
-/F3.0 10.5 Tf
-<40636f6d2e676f6f676c652e636f6d6d6f6e2e6576656e746275732e537562736372696265> Tj
+317.74 544.405 Td
+/F3.0 11 Tf
+<6576> Tj
ET
+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
+
+BT
+328.74 544.405 Td
+/F3.0 11 Tf
+<29> 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
-189.521 Tw
+BT
+334.24 544.405 Td
+/F3.0 11 Tf
+<20> Tj
+ET
+
+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
BT
-320.0566666666667 472.006 Td
-/F1.0 10.5 Tf
-<2077697468> Tj
+339.74 544.405 Td
+/F3.0 11 Tf
+<7b> Tj
ET
+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
+
+BT
+59.24 529.6650000000001 Td
+/F3.0 11 Tf
+<ca20202020202020> 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
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
-125.80666666666667 456.226 Td
-/F3.0 10.5 Tf
-<406f72672e61786f6e6672616d65776f726b2e6576656e7468616e646c696e672e616e6e6f746174696f6e2e4576656e7448616e646c6572> Tj
+103.24000000000001 529.6650000000001 Td
+/F3.0 11 Tf
+<2e> Tj
ET
0.000 0.000 0.000 SCN
@@ -130562,8 +130727,8 @@ ET
0.200 0.200 0.200 SCN
BT
-419.8066666666667 456.226 Td
-/F1.0 10.5 Tf
+108.74000000000001 529.6650000000001 Td
+/F3.0 11 Tf
<2e> Tj
ET
@@ -130573,7 +130738,51 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24000000000001 417.72599999999994 Td
+114.24000000000001 529.6650000000001 Td
+/F3.0 11 Tf
+<2e> Tj
+ET
+
+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
+
+BT
+59.24 514.9250000000001 Td
+/F3.0 11 Tf
+<ca202020> Tj
+ET
+
+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
+
+BT
+81.24000000000001 514.9250000000001 Td
+/F3.0 11 Tf
+<7d> Tj
+ET
+
+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
+
+BT
+59.24 500.18500000000006 Td
+/F3.0 11 Tf
+<7d> Tj
+ET
+
+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
+
+BT
+48.24 455.586 Td
/F2.0 13 Tf
<31302e342e322e2044656661756c742c20446f6f7020616e64204e6f6f70206576656e7473> Tj
ET
@@ -130586,7 +130795,7 @@ ET
4.157 Tw
BT
-48.24000000000001 391.16599999999994 Td
+48.24 429.026 Td
/F1.0 10.5 Tf
<49662074686520> Tj
ET
@@ -130601,7 +130810,7 @@ ET
4.157 Tw
BT
-85.6915 391.16599999999994 Td
+85.69149999999999 429.026 Td
/F3.0 10.5 Tf
<637265617465644c6966656379636c654576656e74> Tj
ET
@@ -130616,7 +130825,7 @@ ET
4.157 Tw
BT
-195.94150000000002 391.16599999999994 Td
+195.94150000000002 429.026 Td
/F1.0 10.5 Tf
<20617474726962757465206973206e6f74206578706c696
<TRUNCATED>
[27/39] isis-site git commit: ISIS-1810: updates docs for 2.0.0-M1
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/274edd1d/content/versions/2.0.0-M1/guides/rgmvn/rgmvn.pdf
----------------------------------------------------------------------
diff --git a/content/versions/2.0.0-M1/guides/rgmvn/rgmvn.pdf b/content/versions/2.0.0-M1/guides/rgmvn/rgmvn.pdf
index b943c7b..9e81b20 100644
--- a/content/versions/2.0.0-M1/guides/rgmvn/rgmvn.pdf
+++ b/content/versions/2.0.0-M1/guides/rgmvn/rgmvn.pdf
@@ -4,8 +4,8 @@
<< /Title (Apache Isis Maven plugin)
/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:20180812182509+01'00')
-/ModDate (D:20180812182509+01'00')
+/CreationDate (D:20180814003845+02'00')
+/ModDate (D:20180814003845+02'00')
>>
endobj
2 0 obj
http://git-wip-us.apache.org/repos/asf/isis-site/blob/274edd1d/content/versions/2.0.0-M1/guides/rgsvc/rgsvc.html
----------------------------------------------------------------------
diff --git a/content/versions/2.0.0-M1/guides/rgsvc/rgsvc.html b/content/versions/2.0.0-M1/guides/rgsvc/rgsvc.html
index 46e4eca..0a918f7 100644
--- a/content/versions/2.0.0-M1/guides/rgsvc/rgsvc.html
+++ b/content/versions/2.0.0-M1/guides/rgsvc/rgsvc.html
@@ -405,10 +405,10 @@ table.CodeRay td.code>pre{padding:0}
<p>For objects that are already persisted, the service is automatically injected just after the object is rehydrated by JDO/DataNucleus.</p>
</div>
<div class="paragraph">
- <p>For transient objects (instantiated programmatically), the <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_FactoryService"><code>FactoryService</code></a>'s <code>instantiate()</code> method (or the deprecated <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_DomainObjectContainer"><code>DomainObjectContainer</code></a>'s <code>newTransientInstance()</code> method) will automatically inject the services.</p>
+ <p>For transient objects (instantiated programmatically), the <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_FactoryService"><code>FactoryService#instantiate(…)</code></a> or the <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_RepositoryService"><code>RepositoryService#instantiate(…)</code></a>'s will automatically inject the services.</p>
</div>
<div class="paragraph">
- <p>Alternatively the object can be instantiated simply using <code>new</code>, then services injected using <a href="../rgsvc/rgsvc.html#_rgsvc_metadata-api_ServiceRegistry"><code>ServiceRegistry</code></a>'s <code>injectServicesInto(…)</code> method (or the deprecated <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_DomainObjectContainer"><code>DomainObjectContainer</code></a>'s <code>injectServicesInto(…)</code> method).</p>
+ <p>Alternatively the object can be instantiated simply using <code>new</code>, then services injected using <a href="../rgsvc/rgsvc.html#_rgsvc_metadata-api_ServiceRegistry"><code>ServiceRegistry</code></a>'s <code>injectServicesInto(…)</code> method.</p>
</div>
</div>
<div class="sect2">
@@ -433,7 +433,7 @@ table.CodeRay td.code>pre{padding:0}
</table>
</div>
<div class="paragraph">
- <p>For example, suppose you wanted to provide your own implementation of <a href="../rgsvc/rgsvc.html#_rgsvc_api_LocaleProvider"><code>LocaleProvider</code></a>. Here’s how:</p>
+ <p>For example, suppose you wanted to provide your own implementation of <a href="../rgsvc/rgsvc.html#_rgsvc_presentation-layer-spi_LocaleProvider"><code>LocaleProvider</code></a>. Here’s how:</p>
</div>
<div class="listingblock">
<div class="content">
@@ -1657,11 +1657,17 @@ table.CodeRay td.code>pre{padding:0}
</div>
<div class="ulist">
<ul>
- <li> <p><code>o.a.i.core.metamodel.services.exceprecog.ExceptionRecognizerDocDefault</code> provided by Apache Isis core is itself an <code>ExceptionRecognizer</code>, and will handle <code>ConcurrencyException</code>s. It will also handle any application exceptions raised by the system (subclasses of <code>o.a.i.applib.RecoverableException</code>).</p> </li>
- <li> <p><code>o.a.i.applib.services.exceprecog.jdo.ExceptionRecognizerCompositeForJdoObjectStore</code> bundles up a number of more fine-grained implementations:</p>
+ <li> <p><code>o.a.i.core.metamodel.services.exceprecog.ExceptionRecognizerDocDefault</code> provided by Apache Isis core is itself an <code>ExceptionRecognizer</code>, and will handle <code>ConcurrencyException</code>s.</p>
+ <div class="paragraph">
+ <p>It will also handle any application exceptions raised by the system (subclasses of <code>o.a.i.applib.RecoverableException</code>).</p>
+ </div> </li>
+ <li> <p><code>o.a.i.applib.services.exceprecog.jdo.ExceptionRecognizerCompositeForJdoObjectStore</code></p>
+ <div class="paragraph">
+ <p>which bundles up a number of more fine-grained implementations:</p>
+ </div>
<div class="ulist">
<ul>
- <li> <p><code>ExceptionRecognizerForSQLIntegrityConstraintViolationUniqueOrIndexException</code></p> </li>
+ <li> <p><code>ExceptionRecognizerForSQLIntegrityConstraintViolationUnique OrIndexException</code></p> </li>
<li> <p><code>ExceptionRecognizerForJDOObjectNotFoundException</code></p> </li>
<li> <p><code>ExceptionRecognizerForJDODataStoreException</code></p> </li>
</ul>
@@ -2751,7 +2757,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
<div class="ulist">
<ul>
- <li> <p>first, (though some browsers support longer strings), there is a limit of 2083 characters for URLs. For view model mementos that correspond to large strings (as might occur when serializing a JAXB <a href="../rgant/rgant.html#_rgant-XmlRootElement"><code>@XmlRootElement</code></a>-annotated view model), the service provides a hook. <br></p>
+ <li> <p>first, (though some browsers support longer strings), there is a limit of 2083 characters for URLs. For view model mementos that correspond to large strings (as might occur when serializing a JAXB <a href="../rgant/rgant.html#_rgant-XmlRootElement"><code>@XmlRootElement</code></a>-annotated view model), the service provides a hook.</p>
<div class="paragraph">
<p>For example, each memento string could be mapped to a GUID held in some cluster-aware cache.</p>
</div> </li>
@@ -2759,7 +2765,7 @@ table.CodeRay td.code>pre{padding:0}
</ul>
</div>
<div class="paragraph">
- <p>The framework provides a default implementation of this service, <code>UrlEncodingServiceUsingBaseEncoding</code> (also in the applib) that uses <code>base-64</code> encoding to <code>UTF-8</code> charset.</p>
+ <p>The framework provides a default implementation of this service, <code>UrlEncodingServiceWithCompression</code>, discussed further in the section below.</p>
</div>
<div class="sect3">
<h4 id="_spi_15">4.17.1. SPI</h4>
@@ -2794,7 +2800,7 @@ table.CodeRay td.code>pre{padding:0}
<div class="sect3">
<h4 id="_implementation_13">4.17.2. Implementation</h4>
<div class="paragraph">
- <p>The framework provides a default implementation (<code>UrlEncodingServiceUsingBaseEncoding</code>) that simply converts the string using base-64 encoding and UTF-8 character set. As already noted, be aware that the maximum length of a URL should not exceed 2083 characters. For large view models, there’s the possibility that this limit could be exceeded; in such cases register an alternative implementation of this service.</p>
+ <p>The framework provides a default implementation (<code>UrlEncodingServiceWithCompression</code>) that (also in the applib) that first (gzip) compresses the state and then uses <code>base-64</code> encoding of the resulting bytes. As already noted, be aware that the maximum length of a URL should not exceed 2083 characters. For large view models, there’s the possibility that this limit could be exceeded; in such cases register an alternative implementation of this service.</p>
</div>
<div class="paragraph">
<p>To use an alternative implementation, implement the <code>UrlEncodingService</code> interface and use <a href="../rgant/rgant.html#_rgant-DomainServiceLayout_menuOrder"><code>@DomainServiceLayout#menuOrder()</code></a> (as explained in the <a href="../rgsvc/rgsvc.html#__rgsvc_intro_overriding-the-services">introduction</a> to this guide).</p>
@@ -2992,7 +2998,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>FactoryService-</code><br> <code>Default</code><br> <code>o.a.i.core</code><br> <code>isis-core-metamodel</code></p></td>
- <td class="tableblock halign-left valign-top"><p class="tableblock">Supercedes methods in <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_DomainObjectContainer"><code>DomainObjectContainer</code></a>.</p></td>
+ <td class="tableblock halign-left valign-top"></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="../rgsvc/rgsvc.html#_rgsvc_application-layer-api_SessionManagementService"><code>o.a.i.applib.</code><br> <code>services.sessmgmt</code><br> <code>SessionManagementService</code></a></p></td>
@@ -3014,7 +3020,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>TitleService-</code><br> <code>Default</code><br> <code>o.a.i.core</code><br> <code>isis-core-metamodel</code></p></td>
- <td class="tableblock halign-left valign-top"><p class="tableblock">Supercedes methods in <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_DomainObjectContainer"><code>DomainObjectContainer</code></a>.</p></td>
+ <td class="tableblock halign-left valign-top"></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="../rgsvc/rgsvc.html#_rgsvc_application-layer-api_TransactionService"><code>o.a.i.applib.</code><br> <code>services.xactn</code><br> <code>TransactionService</code></a></p></td>
@@ -3025,7 +3031,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>TransactionService-</code><br> <code>Default</code><br> <code>o.a.i.core</code><br> <code>isis-core-metamodel</code></p></td>
- <td class="tableblock halign-left valign-top"><p class="tableblock">Supercedes methods in <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_DomainObjectContainer"><code>DomainObjectContainer</code></a>.</p></td>
+ <td class="tableblock halign-left valign-top"></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="../rgsvc/rgsvc.html#_rgsvc_application-layer-api_WrapperFactory"><code>o.a.i.applib.</code><br> <code>services.wrapper</code><br> <code>WrapperFactory</code></a></p></td>
@@ -3583,8 +3589,8 @@ org.quartz.plugin.jobInitializer.failOnFileNotFound = true</code></pre>
<div class="ulist">
<ul>
<li> <p>to enable profiling of the running application (which actions are invoked then most often, what is their response time)</p> </li>
- <li> <p>if a <a href="../rgsvc/rgsvc.html#_rgsvc_persistence-layer-spi_PublisherService"><code>PublisherService</code></a> or <a href="../rgsvc/rgsvc.html#_rgsvc_persistence-layer-spi_PublishingService"><code>PublishingService</code></a> (the latter now deprecated) is configured, they provide better traceability as the <code>Command</code> is also correlated with any published events, again through the unique <code>transactionId</code> GUID</p> </li>
- <li> <p>if a <a href="../rgsvc/rgsvc.html#_rgsvc_spi_AuderService"><code>AuditerService</code></a> or <a href="../rgsvc/rgsvc.html#_rgsvc_spi_AuditService"><code>AuditingService</code></a> (the latter now deprecated) is configured, they provide better audit information, since the <code>Command</code> (the 'cause' of an action) can be correlated to the audit records (the "effect" of the action) through the <code>transactionId</code> GUID</p> </li>
+ <li> <p>if a <a href="../rgsvc/rgsvc.html#_rgsvc_persistence-layer-spi_PublisherService"><code>PublisherService</code></a> is configured, they provide better traceability as the <code>Command</code> is also correlated with any published events, again through the unique <code>transactionId</code> GUID</p> </li>
+ <li> <p>if a <a href="../rgsvc/rgsvc.html#_rgsvc_spi_AuderService"><code>AuditerService</code></a> is configured, they provide better audit information, since the <code>Command</code> (the 'cause' of an action) can be correlated to the audit records (the "effect" of the action) through the <code>transactionId</code> GUID</p> </li>
</ul>
</div>
<div class="paragraph">
@@ -3594,7 +3600,7 @@ org.quartz.plugin.jobInitializer.failOnFileNotFound = true</code></pre>
<div class="sect3">
<h4 id="__rgsvc_application-layer-api_CommandContext_screencast">5.2.7. Screencast</h4>
<div class="paragraph">
- <p>The <a href="https://www.youtube.com/watch?v=tqXUZkPB3EI">screencast</a> provides a run-through of the command (profiling) service, auditing service, publishing service. It also shows how commands can be run in the background either explicitly by scheduling through the background service or implicitly by way of a framework annotation.</p>
+ <p>The <a href="https://www.youtube.com/watch?v=tqXUZkPB3EI">screencast</a> provides a run-through of the command (profiling) service, auditing service, publishing service (note: auditing service has since been replaced by <code>AuditerService</code>, and publishing service by <code>PublisherService</code>). It also shows how commands can be run in the background either explicitly by scheduling through the background service or implicitly by way of a framework annotation.</p>
</div>
<div class="admonitionblock note">
<table>
@@ -3850,7 +3856,7 @@ org.quartz.plugin.jobInitializer.failOnFileNotFound = true</code></pre>
<div class="sect3">
<h4 id="_related_services_12">5.2.11. Related Services</h4>
<div class="paragraph">
- <p>The <a href="../rgsvc/rgsvc.html#_rgsvc_application-layer-api_CommandContext"><code>CommandContext</code></a> service is very similar in nature to the <a href="../rgsvc/rgsvc.html#_rgsvc_api_InteactionContext"><code>InteactionContext</code></a>, in that the <code>Command</code> object accessed through it is very similar to the <code>Interaction</code> object obtained from the <code>InteractionContext</code>. The principle distinction is that while <code>Command</code> represents the <em>intention</em> to invoke an action or edit a property, the <code>Interaction</code> (and contained <code>Execution</code>s) represents the actual execution.</p>
+ <p>The <a href="../rgsvc/rgsvc.html#_rgsvc_application-layer-api_CommandContext"><code>CommandContext</code></a> service is very similar in nature to the <a href="../rgsvc/rgsvc.html#_rgsvc_application-layer-api_InteractionContext"><code>InteractionContext</code></a>, in that the <code>Command</code> object accessed through it is very similar to the <code>Interaction</code> object obtained from the <code>InteractionContext</code>. The principle distinction is that while <code>Command</code> represents the <em>intention</em> to invoke an action or edit a property, the <code>Interaction</code> (and contained <code>Execution</code>s) represents the actual execution.</p>
</div>
<div class="paragraph">
<p>Most of the time a <code>Command</code> will be followed directly by its corresponding <code>Interaction</code>. However, if the <code>Command</code> is annotated to run in the background (using <a href="../rgant/rgant.html#_rgant-Action_command"><code>@Action#commandExecuteIn()</code></a>, or is explicitly created through the <a href="../rgsvc/rgsvc.html#_rgsvc_application-layer-api_BackgroundService"><code>BackgroundService</code></a>, then the actual interaction/execution is deferred until some other mechanism invokes the command (eg as described <a href="../ugbtb/ugbtb.html#_ugbtb_headless-access_BackgroundCommandExecution">here</a>). The persistence of background commands requires a configured <a href="../rgsvc/rgsvc.html#_rgsvc_application-layer-spi_BackgroundCommandService"><code>BackgroundCommandService</code></a>) to actually persist such commands for execution.</p>
@@ -3893,7 +3899,7 @@ org.quartz.plugin.jobInitializer.failOnFileNotFound = true</code></pre>
<tbody>
<tr>
<td><i class="conum" data-value="1"></i><b>1</b></td>
- <td>Uses the <a href="../rgsvc/rgsvc.html#_rgsvc_api_BookmarkService"><code>BookmarkService</code></a> to convert the domain object’s internal identifier into a serializable <code>OidDto</code>.</td>
+ <td>Uses the <a href="../rgsvc/rgsvc.html#_rgsvc_integration-api_BookmarkService"><code>BookmarkService</code></a> to convert the domain object’s internal identifier into a serializable <code>OidDto</code>.</td>
</tr>
</tbody>
</table>
@@ -4744,7 +4750,7 @@ org.quartz.plugin.jobInitializer.failOnFileNotFound = true</code></pre>
<span class="keyword">try</span> {
wrappedOrder.refund();
} <span class="keyword">catch</span>(InteractionException ex) { <i class="conum" data-value="1"></i><b>(1)</b>
- container.raiseError(ex.getMessage()); <i class="conum" data-value="2"></i><b>(2)</b>
+ messageService.raiseError(ex.getMessage()); <i class="conum" data-value="2"></i><b>(2)</b>
<span class="keyword">return</span>;
}
}
@@ -4752,7 +4758,7 @@ org.quartz.plugin.jobInitializer.failOnFileNotFound = true</code></pre>
<span class="annotation">@Inject</span>
WrapperFactory wrapperFactory;
<span class="annotation">@Inject</span>
- DomainObjectContainer container;
+ MessageService messageService;
}</code></pre>
</div>
</div>
@@ -5285,18 +5291,7 @@ org.quartz.plugin.jobInitializer.failOnFileNotFound = true</code></pre>
</div>
</div></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>ConfigurationService-</code><br> <code>Default</code><br> <code>o.a.i.core</code><br> <code>isis-core-runtime</code></p></td>
- <td class="tableblock halign-left valign-top"><p class="tableblock">The <code>ConfigurationServiceMenu</code> exposes the <code>allConfigurationProperties</code> action in the user interface.<br> + Supercedes methods in <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_DomainObjectContainer"><code>DomainObjectContainer</code></a>.</p></td>
- </tr>
- <tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_DomainObjectContainer"><code>o.a.i.applib</code><br> <code>DomainObjectContainer</code></a></p></td>
- <td class="tableblock halign-left valign-top">
- <div>
- <div class="paragraph">
- <p>Miscellaneous functions, eg obtain title of object.</p>
- </div>
- </div></td>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><code>DomainObjectContainer-</code><br> <code>Default</code><br> <code>o.a.i.core</code><br> <code>isis-core-metamodel</code></p></td>
- <td class="tableblock halign-left valign-top"></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock">The <code>ConfigurationServiceMenu</code> exposes the <code>allConfigurationProperties</code> action in the user interface.<br></p></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_EventBusService"><code>o.a.i.applib.</code><br> <code>services.eventbus</code><br> <code>EventBusService</code></a></p></td>
@@ -5325,7 +5320,7 @@ org.quartz.plugin.jobInitializer.failOnFileNotFound = true</code></pre>
</div>
</div></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>FactoryService-</code><br> <code>Default</code><br> <code>o.a.i.core</code><br> <code>isis-core-metamodel</code></p></td>
- <td class="tableblock halign-left valign-top"><p class="tableblock">Supercedes methods in <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_DomainObjectContainer"><code>DomainObjectContainer</code></a>.</p></td>
+ <td class="tableblock halign-left valign-top"></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_Scratchpad"><code>o.a.i.applib.</code><br> <code>services.scratchpad</code><br> <code>Scratchpad</code></a></p></td>
@@ -5347,7 +5342,7 @@ org.quartz.plugin.jobInitializer.failOnFileNotFound = true</code></pre>
</div>
</div></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>UserService-</code><br> <code>Default</code><br> <code>o.a.i.core</code><br> <code>isis-core-metamodel</code></p></td>
- <td class="tableblock halign-left valign-top"><p class="tableblock">Supercedes methods in <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_DomainObjectContainer"><code>DomainObjectContainer</code></a>.</p></td>
+ <td class="tableblock halign-left valign-top"></td>
</tr>
</tbody>
</table>
@@ -5415,18 +5410,19 @@ org.quartz.plugin.jobInitializer.failOnFileNotFound = true</code></pre>
<div class="sect3">
<h4 id="_testing_support">7.1.2. Testing Support</h4>
<div class="paragraph">
- <p>The default <code>ClockService</code> implementation in fact simply delegates to another class defined in the API, namely the <code>o.a.i.applib.clock.Clock</code>, an abstract singleton class. It is not recommended that your code use the <code>Clock</code> directly, but you should understand how this all works:</p>
+ <p>The default <code>ClockService</code> implementation in fact simply delegates to another class defined in the API, namely the <code>o.a.i.applib.clock.Clock</code>, an abstract singleton class. It is not recommended that your code use the <code>Clock</code> directly, but it’s worth understanding how this all works.</p>
</div>
- <div class="ulist">
- <ul>
- <li> <p>there are two subclasses implementations <code>Clock</code>, namely <code>SystemClock</code> and <code>FixtureClock</code>.</p> </li>
- <li> <p>the first implementation that is instantiated registers itself as the singleton.</p> </li>
- <li> <p>if running in <a href="../rgcfg/rgcfg.html#_rgcfg_deployment-types">production</a> (server) mode, then (unless another implementation has beaten it to the punch) the framework will instantiate the <code>`SystemClock</code>. Once instantiated this cannot be replaced.</p> </li>
- <li> <p>if running in <a href="../rgcfg/rgcfg.html#<em>rgcfg_deployment-types">prototype</a> mode, then the framework will instead instantiate <code>FixtureClock</code>. This _can be replaced if required.</p> </li>
- </ul>
+ <div class="paragraph">
+ <p>If running in <a href="../rgcfg/rgcfg.html#_rgcfg_deployment-types">production</a> (server) mode, then the framework will (lazily) instantiate the <code>`SystemClock</code> when first required. This is a read-only clock that reads from the system time. The instance registers itself as the singleton and cannot be replaced.</p>
+ </div>
+ <div class="paragraph">
+ <p>If running in <a href="../rgcfg/rgcfg.html#_rgcfg_deployment-types">prototype</a> mode, though, then the framework will instead instantiate <code>FixtureClock</code>. This is a read-write clock that will behave as the system clock, unless it is explicitly set using eg, <code>FixtureClock#setDate(…)</code> or <code>FixtureClock#setTime(…)</code> etc.</p>
</div>
<div class="paragraph">
- <p>The <code>FixtureClock</code> will behave as the system clock, unless its is explicitly set using <code>FixtureClock#setDate(…)</code> or <code>FixtureClock#setTime(…)</code> and so forth.</p>
+ <p>Moreover, <code>FixtureClock</code> singleton can be replaced with another implementation. And, it is sometimes useful to replace it using <code>TickingFixtureClock</code>, a subclass that is very similar to <code>FixtureClock</code> (in that the time can be changed) but which will continue to tick once set.</p>
+ </div>
+ <div class="paragraph">
+ <p>To use <code>TickingFixtureClock</code> instead of <code>FixtureClock</code>, use the <code>TickingClockFixture</code> fixture script.</p>
</div>
<div class="sect4">
<h5 id="_alternative_implementations_4">Alternative Implementations</h5>
@@ -5597,183 +5593,7 @@ org.quartz.plugin.jobInitializer.failOnFileNotFound = true</code></pre>
</div>
</div>
<div class="sect2">
- <h3 id="_rgsvc_core-domain-api_DomainObjectContainer">7.3. <code>DomainObjectContainer</code></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="https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_core-domain-api_DomainObjectContainer.adoc""><i class="fa fa-pencil-square-o"></i> 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/rgsvc/_rgsvc_core-domain-api_DomainObjectContainer.adoc" target="_blank"><i class="fa fa-pencil-square-o fa-fw" aria-hidden="true"></i> Edit</a></li>
- <li><a href="https://github.com/apache/isis/commits/master/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_core-domain-api_DomainObjectContainer.adoc" target="_blank"><i class="fa fa-clock-o fa-fw" aria-hidden="true"></i> History</a></li>
- <li><a href="https://github.com/apache/isis/raw/master/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_core-domain-api_DomainObjectContainer.adoc" target="_blank"><i class="fa fa-file-text-o fa-fw" aria-hidden="true"></i> Raw</a></li>
- <li><a href="https://github.com/apache/isis/blame/master/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_core-domain-api_DomainObjectContainer.adoc" target="_blank"><i class="fa fa-hand-o-right fa-fw" aria-hidden="true"></i> Blame</a></li>
- </ul>
- </div>
- <div class="paragraph">
- <p>The <code>DomainObjectContainer</code> service provides a set of general purpose functionality for domain objects to call. Principal amongst these are a generic APIs for querying objects and creating and persisting objects. In addition, the service provides access to security context (the "current user"), allows information and warning messages to be raised, and various other miscellaneous functions.</p>
- </div>
- <div class="admonitionblock note">
- <table>
- <tbody>
- <tr>
- <td class="icon"> <i class="fa icon-note" title="Note"></i> </td>
- <td class="content">
- <div class="paragraph">
- <p>(Almost all of) the methods in this service have been moved out into a number of more fine-grained services: <a href="../rgsvc/rgsvc.html#_rgsvc_persistence-layer-api_RepositoryService"><code>RepositoryService</code></a>, <a href="../rgsvc/rgsvc.html#_rgsvc_application-layer-api_MessageService"><code>MessageService</code></a>, <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_FactoryService"><code>FactoryService</code></a>, <a href="../rgsvc/rgsvc.html#_rgsvc_application-layer-api_TitleService"><code>TitleService</code></a>, <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_ConfigurationService"><code>ConfigurationService</code></a>, <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_UserService"><code>UserService</code></a> and <a href="../rgsvc/rgsvc.html#_rgsvc_metadata-api_ServiceRegistry"><code>ServiceRegistry</code></a>.</p>
- </div> </td>
- </tr>
- </tbody>
- </table>
- </div>
- <div class="sect3">
- <h4 id="_apis">7.3.1. APIs</h4>
- <div class="paragraph">
- <p>The sections below discuss the functions provided by the service, broken out into categories.</p>
- </div>
- <div class="sect4">
- <h5 id="_rgsvc_core-domain-api_DomainObjectContainer_object-creation-api">Object Creation API</h5>
- <div class="paragraph">
- <p>The (deprecated) object creation APIs is used to instantiate a view model, specifying its memento.</p>
- </div>
- <div class="listingblock">
- <div class="content">
- <pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">interface</span> <span class="class">DomainObjectContainer</span> {
-
- <T> T newViewModelInstance(<span class="directive">final</span> <span class="predefined-type">Class</span><T> ofType, <span class="directive">final</span> <span class="predefined-type">String</span> memento); <i class="conum" data-value="1"></i><b>(1)</b>
- ...
-}</code></pre>
- </div>
- </div>
- <div class="colist arabic">
- <table>
- <tbody>
- <tr>
- <td><i class="conum" data-value="1"></i><b>1</b></td>
- <td>create a new view model, with the specified memento (as per <a href="../rgcms/rgcms.html#_rgcms_classes_super_AbstractViewModel">ViewModel#viewModelMemento()</a>.</td>
- </tr>
- </tbody>
- </table>
- </div>
- <div class="admonitionblock tip">
- <table>
- <tbody>
- <tr>
- <td class="icon"> <i class="fa icon-tip" title="Tip"></i> </td>
- <td class="content">
- <div class="paragraph">
- <p>In general it is easier to just annotate with <a href="../rgant/rgant.html#_rgant-ViewModel"><code>@ViewModel</code></a>, or as a JAXB view model, and let Apache Isis manage the memento automatically.</p>
- </div> </td>
- </tr>
- </tbody>
- </table>
- </div>
- </div>
- <div class="sect4">
- <h5 id="_rgsvc_core-domain-api_DomainObjectContainer_object-persistence-api">Object Persistence API</h5>
- <div class="paragraph">
- <p>The (deprecated) persistence API is used to persist newly created objects (as per <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_DomainObjectContainer_object-creation-api"><code>#newTransientInstance(…)</code></a>, above and to delete (remove) objects that are persistent.</p>
- </div>
- <div class="admonitionblock tip">
- <table>
- <tbody>
- <tr>
- <td class="icon"> <i class="fa icon-tip" title="Tip"></i> </td>
- <td class="content">
- <div class="paragraph">
- <p>Instead, use <a href="#_rgsvc_persistence-layer-api_RepositoryService"><code>RepositoryService</code></a> API.</p>
- </div> </td>
- </tr>
- </tbody>
- </table>
- </div>
- <div class="paragraph">
- <p>Note that there is no API for updating existing objects; the framework (or rather, JDO/DataNucleus) performs object dirty tracking and so any objects that are modified in the course of a request will be automatically updated).</p>
- </div>
- <div class="listingblock">
- <div class="content">
- <pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">interface</span> <span class="class">DomainObjectContainer</span> {
-
- <span class="type">boolean</span> isViewModel(<span class="predefined-type">Object</span> domainObject); <i class="conum" data-value="1"></i><b>(1)</b>
- <span class="type">void</span> persist(<span class="predefined-type">Object</span> domainObject); <i class="conum" data-value="2"></i><b>(2)</b>
- <span class="type">void</span> remove(<span class="predefined-type">Object</span> persistentDomainObject); <i class="conum" data-value="3"></i><b>(3)</b>
-
- ...
-}</code></pre>
- </div>
- </div>
- <div class="colist arabic">
- <table>
- <tbody>
- <tr>
- <td><i class="conum" data-value="1"></i><b>1</b></td>
- <td>test whether a particular domain object is a view model or not. Note that this includes any domain objects annotated with <a href="../rgant/rgant.html#_rgant-DomainObject_nature"><code>@DomainObject#nature=Nature.EXTERNAL_ENTITY)</code></a> or <a href="../rgant/rgant.html#_rgant-DomainObject_nature"><code>@DomainObject#nature=Nature.INMEMORY_ENTITY</code></a></td>
- </tr>
- <tr>
- <td><i class="conum" data-value="2"></i><b>2</b></td>
- <td>persist a transient object. Note though that this will throw an exception if the object is already persistent; this can happen if JDO/DataNucleus’s <a href="http://www.datanucleus.org/products/accessplatform_4_0/jdo/orm/cascading.html">persistence-by-reachability</a> is in effect. For this reason it is generally better to use <a href="#_rgsvc_persistence-layer-api_RepositoryService"><code>RepositoryService#persist()</code></a>, which is a no-op if the object is persistent.</td>
- </tr>
- <tr>
- <td><i class="conum" data-value="3"></i><b>3</b></td>
- <td>remove (ie DELETE) a persistent object. However, the object must be persistent already, otherwise an exception will be thrown. It is generally therefore better to use use <a href="#_rgsvc_persistence-layer-api_RepositoryService"><code>RepositoryService#remove()</code></a>, which is a no-op if the object is not persistent.</td>
- </tr>
- </tbody>
- </table>
- </div>
- <div class="paragraph">
- <p>For example:</p>
- </div>
- <div class="listingblock">
- <div class="content">
- <pre class="CodeRay highlight"><code data-lang="java">Customer cust = container.newTransientInstance(Customer.class);
-cust.setFirstName(<span class="string"><span class="delimiter">"</span><span class="content">Freddie</span><span class="delimiter">"</span></span>);
-cust.setLastName(<span class="string"><span class="delimiter">"</span><span class="content">Mercury</span><span class="delimiter">"</span></span>);
-container.persistIfNotAlready(cust);</code></pre>
- </div>
- </div>
- <div class="paragraph">
- <p>You should be aware that by default Apache Isis queues up calls to <code>#persist()</code> and <code>#remove()</code>. These are then executed either when the request completes (and the transaction commits), or if the queue is flushed. This can be done either implicitly by the framework, or as the result of a direct call to <code>TransactionService#flushTransaction()</code>.</p>
- </div>
- </div>
- <div class="sect4">
- <h5 id="_rgsvc_core-domain-api_DomainObjectContainer_validation-api">Validation API</h5>
- <div class="paragraph">
- <p>The intent of this API is to provide a mechanism where an object can programmatically check the state any class invariants. Specifically, this means the validating the current state of all properties, as well as any object-level validation defined by <a href="../rgcms/rgcms.html#_rgcms_methods_reserved_validate"><code>validate()</code></a>.</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>These methods have been deprecated; this feature should be considered experimental and your mileage may vary.</p>
- </div> </td>
- </tr>
- </tbody>
- </table>
- </div>
- <div class="paragraph">
- <p>The API provided is:</p>
- </div>
- <div class="listingblock">
- <div class="content">
- <pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">interface</span> <span class="class">DomainObjectContainer</span> {
- <span class="type">boolean</span> isValid(<span class="predefined-type">Object</span> domainObject);
- <span class="predefined-type">String</span> validate(<span class="predefined-type">Object</span> domainObject);
- ...
-}</code></pre>
- </div>
- </div>
- </div>
- </div>
- <div class="sect3">
- <h4 id="_implementation_22">7.3.2. Implementation</h4>
- <div class="paragraph">
- <p>The core framework provides a default implementation of this service (<code>o.a.i.core.metamodel.services.container.DomainObjectContainerDefault</code>).</p>
- </div>
- </div>
- </div>
- <div class="sect2">
- <h3 id="_rgsvc_core-domain-api_EventBusService">7.4. <code>EventBusService</code></h3>
+ <h3 id="_rgsvc_core-domain-api_EventBusService">7.3. <code>EventBusService</code></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="https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_core-domain-api_EventBusService.adoc""><i class="fa fa-pencil-square-o"></i> 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>
@@ -5809,7 +5629,7 @@ container.persistIfNotAlready(cust);</code></pre>
<p>Two implementations are available, using either <a href="https://code.google.com/p/guava-libraries/">Guava</a>'s <a href="https://code.google.com/p/guava-libraries/wiki/EventBusExplained"><code>EventBus</code></a>, or alternatively using the <a href="http://www.axonframework.org/">AxonFramework</a>'s <a href="http://www.axonframework.org/docs/2.4/single.html#d5e1489">SimpleEventBus</a>. It is also possible to plug in a custom implementation.</p>
</div>
<div class="sect3">
- <h4 id="__rgsvc_core-domain-api_EventBusService_api-and-implementation">7.4.1. API</h4>
+ <h4 id="__rgsvc_core-domain-api_EventBusService_api-and-implementation">7.3.1. API</h4>
<div class="paragraph">
<p>The API defined by <code>EventBusService</code> is:</p>
</div>
@@ -5848,7 +5668,7 @@ container.persistIfNotAlready(cust);</code></pre>
</div>
</div>
<div class="sect3">
- <h4 id="_registering_subscribers">7.4.2. Registering Subscribers</h4>
+ <h4 id="_registering_subscribers">7.3.2. Registering Subscribers</h4>
<div class="paragraph">
<p>The <code>register()</code> method should be called in the <a href="../rgant/rgant.html#_rgant-PostConstruct"><code>@PostConstruct</code></a> lifecycle method. It is valid and probably the least confusing to readers to also "unregister" in the <a href="../rgant/rgant.html#_rgant-PreDestroy"><code>@PreDestroy</code></a> lifecycle method (though as noted <a href="../rgsvc/rgsvc.html#__rgsvc_core-domain-api_EventBusService_api-and-implementation">above</a>, unregistering is actually a no-op).</p>
</div>
@@ -5914,7 +5734,7 @@ container.persistIfNotAlready(cust);</code></pre>
</div>
</div>
<div class="sect3">
- <h4 id="_annotating_members">7.4.3. Annotating Members</h4>
+ <h4 id="_annotating_members">7.3.3. Annotating Members</h4>
<div class="paragraph">
<p>As discussed in the introduction, the framework will automatically emit domain events for all of the object members (actions, properties or collections) of an object whenever that object is rendered or (more generally) interacted with.</p>
</div>
@@ -6007,7 +5827,7 @@ container.persistIfNotAlready(cust);</code></pre>
</div>
</div>
<div class="sect3">
- <h4 id="__rgsvc_core-domain-api_EventBusService_event-hierarchy">7.4.4. Event hierarchy</h4>
+ <h4 id="__rgsvc_core-domain-api_EventBusService_event-hierarchy">7.3.4. Event hierarchy</h4>
<div class="paragraph">
<p>By creating domain event subtypes we can be more semantically precise and in turn providesmore flexibility for subscribers: they can choose whether to be broadly applicable (by subscribing to a superclass) or to be tightly focussed (by subscribing to a subclass).</p>
</div>
@@ -6124,7 +5944,7 @@ public <span class="directive">static</span> <span class="type">class</span> <sp
</div>
</div>
<div class="sect3">
- <h4 id="_programmatic_posting">7.4.5. Programmatic posting</h4>
+ <h4 id="_programmatic_posting">7.3.5. Programmatic posting</h4>
<div class="paragraph">
<p>To programmatically post an event, simply call <code>#post()</code>.</p>
</div>
@@ -6158,7 +5978,7 @@ public <span class="directive">static</span> <span class="type">class</span> <sp
</div>
</div>
<div class="sect3">
- <h4 id="_using_code_wrapperfactory_code">7.4.6. Using <code>WrapperFactory</code></h4>
+ <h4 id="_using_code_wrapperfactory_code">7.3.6. Using <code>WrapperFactory</code></h4>
<div class="paragraph">
<p>An alternative way to cause events to be posted is through the <a href="../rgsvc/rgsvc.html#_rgsvc_application-layer-api_WrapperFactory"><code>WrapperFactory</code></a>. This is useful when you wish to enforce a (lack-of-) trust boundary between the caller and the callee.</p>
</div>
@@ -6188,7 +6008,7 @@ public <span class="directive">static</span> <span class="type">class</span> <sp
</div>
</div>
<div class="sect3">
- <h4 id="__rgsvc_core-domain-api_EventBusService_Configuration">7.4.7. Implementation</h4>
+ <h4 id="__rgsvc_core-domain-api_EventBusService_Configuration">7.3.7. Implementation</h4>
<div class="paragraph">
<p>The framework provides a default implementation of the service, <code>o.a.i.objectstore.jdo.datanucleus.service.eventbus.EventBusServiceJdo</code>.</p>
</div>
@@ -6303,7 +6123,7 @@ public <span class="directive">static</span> <span class="type">class</span> <sp
</div>
</div>
<div class="sect3">
- <h4 id="_related_services_16">7.4.8. Related Services</h4>
+ <h4 id="_related_services_16">7.3.8. Related Services</h4>
<div class="paragraph">
<p>The <code>EventBusService</code> is intended for fine-grained publish/subscribe for object-to-object interactions within an Apache Isis domain object model. The event propagation is strictly in-memory, and there are no restrictions on the object acting as the event (it need not be serializable, for example).</p>
</div>
@@ -6313,7 +6133,7 @@ public <span class="directive">static</span> <span class="type">class</span> <sp
</div>
</div>
<div class="sect2">
- <h3 id="_rgsvc_core-domain-api_FactoryService">7.5. <code>FactoryService</code></h3>
+ <h3 id="_rgsvc_core-domain-api_FactoryService">7.4. <code>FactoryService</code></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="https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_core-domain-api_FactoryService.adoc""><i class="fa fa-pencil-square-o"></i> 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>
@@ -6328,7 +6148,7 @@ public <span class="directive">static</span> <span class="type">class</span> <sp
<p>The <code>FactoryService</code> collects together methods for instantiating domain objects.</p>
</div>
<div class="sect3">
- <h4 id="_api_5">7.5.1. API</h4>
+ <h4 id="_api_5">7.4.1. API</h4>
<div class="paragraph">
<p>The API of <code>FactoryService</code> is:</p>
</div>
@@ -6368,7 +6188,7 @@ public <span class="directive">static</span> <span class="type">class</span> <sp
</div>
</div>
<div class="sect3">
- <h4 id="_usage_9">7.5.2. Usage</h4>
+ <h4 id="_usage_9">7.4.2. Usage</h4>
<div class="paragraph">
<p>For example:</p>
</div>
@@ -6382,13 +6202,13 @@ repositoryService.persist(cust);</code></pre>
</div>
</div>
<div class="sect3">
- <h4 id="_implementation_23">7.5.3. Implementation</h4>
+ <h4 id="_implementation_22">7.4.3. Implementation</h4>
<div class="paragraph">
<p>The core framework provides a default implementation of this service (<code>o.a.i.core.metamodel.services.factory.FactoryServiceDefault</code>).</p>
</div>
</div>
<div class="sect3">
- <h4 id="_related_services_17">7.5.4. Related Services</h4>
+ <h4 id="_related_services_17">7.4.4. Related Services</h4>
<div class="paragraph">
<p>The <a href="../rgsvc/rgsvc.html#_rgsvc_persistence-layer-api_RepositoryService"><code>RepositoryService</code></a> is often used in conjunction with the <code>FactoryService</code>, to persist domain objects after they have been instantiated and populated.</p>
</div>
@@ -6398,7 +6218,7 @@ repositoryService.persist(cust);</code></pre>
</div>
</div>
<div class="sect2">
- <h3 id="_rgsvc_core-domain-api_Scratchpad">7.6. <code>Scratchpad</code></h3>
+ <h3 id="_rgsvc_core-domain-api_Scratchpad">7.5. <code>Scratchpad</code></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="https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_core-domain-api_Scratchpad.adoc""><i class="fa fa-pencil-square-o"></i> 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>
@@ -6413,7 +6233,7 @@ repositoryService.persist(cust);</code></pre>
<p>The <code>Scratchpad</code> (request-scoped) domain service allows objects to exchange information even if they do not directly call each other.</p>
</div>
<div class="sect3">
- <h4 id="_api_implementation_10">7.6.1. API & Implementation</h4>
+ <h4 id="_api_implementation_10">7.5.1. API & Implementation</h4>
<div class="paragraph">
<p>The API of <code>Scratchpad</code> service is:</p>
</div>
@@ -6438,7 +6258,7 @@ repositoryService.persist(cust);</code></pre>
</div>
</div>
<div class="sect3">
- <h4 id="_usage_10">7.6.2. Usage</h4>
+ <h4 id="_usage_10">7.5.2. Usage</h4>
<div class="paragraph">
<p>The most common use-case is for <a href="../rgant/rgant.html#_rgant-Action_invokeOn">bulk</a> actions that act upon multiple objects in a list. The (same) <code>Scratchpad</code> service is injected into each of these objects, and so they can use pass information.</p>
</div>
@@ -6532,17 +6352,14 @@ Scratchpad scratchpad;</code></pre>
</div>
</div>
<div class="sect3">
- <h4 id="_related_services_18">7.6.3. Related Services</h4>
- <div class="paragraph">
- <p>The <a href="../rgsvc/rgsvc.html#_rgsvc_api_ActionInteractionContext"><code>ActionInteractionContext</code></a> service allows <a href="../rgant/rgant.html#_rgant-Action_invokeOn">bulk actions</a> to co-ordinate with each other.</p>
- </div>
+ <h4 id="_related_services_18">7.5.3. Related Services</h4>
<div class="paragraph">
<p>The <a href="../rgsvc/rgsvc.html#_rgsvc_persistence-layer-api_QueryResultsCache"><code>QueryResultsCache</code></a> is useful for caching the results of expensive method calls.</p>
</div>
</div>
</div>
<div class="sect2">
- <h3 id="_rgsvc_core-domain-api_UserService">7.7. <code>UserService</code></h3>
+ <h3 id="_rgsvc_core-domain-api_UserService">7.6. <code>UserService</code></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="https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_core-domain-api_UserService.adoc""><i class="fa fa-pencil-square-o"></i> 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>
@@ -6560,7 +6377,7 @@ Scratchpad scratchpad;</code></pre>
<p>If <a href="../rgsvc/rgsvc.html#_rgsvc_testing_SudoService"><code>SudoService</code></a> has been used to temporarily override the user and/or roles, then this service will report the overridden values instead.</p>
</div>
<div class="sect3">
- <h4 id="_api_and_usage_4">7.7.1. API and Usage</h4>
+ <h4 id="_api_and_usage_4">7.6.1. API and Usage</h4>
<div class="paragraph">
<p>The API of <code>UserService</code> is:</p>
</div>
@@ -6607,7 +6424,7 @@ Scratchpad scratchpad;</code></pre>
</div>
</div>
<div class="sect3">
- <h4 id="_implementation_24">7.7.2. Implementation</h4>
+ <h4 id="_implementation_23">7.6.2. Implementation</h4>
<div class="paragraph">
<p>The core framework provides a default implementation of this service (<code>o.a.i.core.runtime.services.user.UserServiceDefault</code>).</p>
</div>
@@ -6864,7 +6681,7 @@ Scratchpad scratchpad;</code></pre>
<div class="sect3">
<h4 id="_usage_by_other_services">8.1.3. Usage by other services</h4>
<div class="paragraph">
- <p>Bookmarks are used by the (non-ASF) <a href="http://platform.incode.org" target="_blank">Incode Platform</a>'s command module’s implementation of <a href="../rgsvc/rgsvc.html#_rgsvc_api_BackgroundCommandService"><code>BackgroundCommandService</code></a>, which uses a bookmark to capture the target object on which an action will be invoked subsequently.</p>
+ <p>Bookmarks are used by the (non-ASF) <a href="http://platform.incode.org" target="_blank">Incode Platform</a>'s command module’s implementation of <a href="../rgsvc/rgsvc.html#_rgsvc_application-layer-spi_BackgroundCommandService"><code>BackgroundCommandService</code></a>, which uses a bookmark to capture the target object on which an action will be invoked subsequently.</p>
</div>
<div class="paragraph">
<p>Bookmarks are also used by the (non-ASF) <a href="http://platform.incode.org" target="_blank">Incode Platform</a>'s auditing module’s implementation of <a href="../rgsvc/rgsvc.html#_rgsvc_persistence-layer-spi_AuditerService"><code>AuditerService</code></a>.</p>
@@ -6930,7 +6747,7 @@ Scratchpad scratchpad;</code></pre>
</div>
</div>
<div class="sect3">
- <h4 id="_implementation_25">8.2.2. Implementation</h4>
+ <h4 id="_implementation_24">8.2.2. Implementation</h4>
<div class="paragraph">
<p>As noted in the introduction, the core framework provides a default implementation, <code>EmailServiceDefault</code>. This sends email as an HTML message, using an external SMTP provider.</p>
</div>
@@ -7312,7 +7129,7 @@ Scratchpad scratchpad;</code></pre>
<p>With respect to the <code>IsisSchemas</code> enum: a JAXB-annotated domain object will live in its own XSD namespace and may reference multiple other XSD schemas. In particular, many JAXB domain objects will reference the <a href="../rgcms/rgcms.html#_rgcms_schema">common Isis schemas</a> (for example the <code>OidDto</code> class that represents a reference to a persistent entity). The enum indicates whether these schemas should be included or excluded from the map.</p>
</div>
<div class="paragraph">
- <p>Isis provides a default implementation of the service, <code>o.a.i.applib.services.jaxb.JaxbServiceDefault</code>.</p>
+ <p>Apache Isis provides a default implementation of the service, <code>o.a.i.applib.services.jaxb.JaxbServiceDefault</code>.</p>
</div>
<div class="paragraph">
<p>To use an alternative implementation, implement <code>JaxbService</code> interface and use <a href="../rgant/rgant.html#_rgant-DomainServiceLayout_menuOrder"><code>@DomainServiceLayout#menuOrder()</code></a> (as explained in the <a href="../rgsvc/rgsvc.html#__rgsvc_intro_overriding-the-services">introduction</a> to this guide).</p>
@@ -7717,7 +7534,7 @@ Element customerXsd = snapshot.getXsdElement();</code></pre>
</div>
</div>
<div class="sect3">
- <h4 id="_implementation_26">8.5.5. Implementation</h4>
+ <h4 id="_implementation_25">8.5.5. Implementation</h4>
<div class="paragraph">
<p>The core framework provides an implementation of this service (<code>o.a.i.core.runtime.services.xmlsnapshot.XmlSnapshotServiceDefault</code>).</p>
</div>
@@ -7817,7 +7634,7 @@ Element customerXsd = snapshot.getXsdElement();</code></pre>
</div>
</div></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>ServiceRegistry-</code><br> <code>Default</code><br> <code>o.a.i.core</code><br> <code>isis-core-metamodel</code></p></td>
- <td class="tableblock halign-left valign-top"><p class="tableblock">Supercedes methods in <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_DomainObjectContainer"><code>DomainObjectContainer</code></a>.</p></td>
+ <td class="tableblock halign-left valign-top"></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="../rgsvc/rgsvc.html#_rgsvc_metadata-api_SwaggerService"><code>o.a.i.applib.</code><br> <code>services.swagger</code><br> <code>SwaggerService</code></a></p></td>
@@ -7904,7 +7721,7 @@ Element customerXsd = snapshot.getXsdElement();</code></pre>
</div>
</div>
<div class="sect3">
- <h4 id="_implementation_27">9.1.2. Implementation</h4>
+ <h4 id="_implementation_26">9.1.2. Implementation</h4>
<div class="paragraph">
<p>The default implementation of this service is <code>ApplicationFeatureRepositoryDefault</code>.</p>
</div>
@@ -8296,7 +8113,7 @@ repositoryService.persist(cust);</code></pre>
</div>
</div>
<div class="sect3">
- <h4 id="_implementation_28">9.4.3. Implementation</h4>
+ <h4 id="_implementation_27">9.4.3. Implementation</h4>
<div class="paragraph">
<p>The core framework provides a default implementation of this service (<code>o.a.i.core.runtime.services.registry.ServiceRegistryDefault</code>).</p>
</div>
@@ -8378,7 +8195,7 @@ repositoryService.persist(cust);</code></pre>
</div>
</div>
<div class="sect3">
- <h4 id="_implementation_29">9.5.2. Implementation</h4>
+ <h4 id="_implementation_28">9.5.2. Implementation</h4>
<div class="paragraph">
<p>Isis provides a default implementation of the service, <code>o.a.i.core.metamodel.services.swagger.SwaggerServiceDefault</code>.</p>
</div>
@@ -8565,7 +8382,7 @@ repositoryService.persist(cust);</code></pre>
</ul>
</div>
<div class="paragraph">
- <p>The <code>FixtureScripts</code> service provides the ability to execute <a href="../ugtst/ugtst.html#_ugtst_fixture-scripts_api-and-usage">fixture scripts</a> .</p>
+ <p>The <code>FixtureScripts</code> service provides the ability to execute <a href="../ugtst/ugtst.html#_ugtst_fixture-scripts_api-and-usage">fixture scripts</a>.</p>
</div>
<div class="paragraph">
<p>The default implementation of this service, <code>FixtureScriptsDefault</code>, uses the associated <a href="../rgsvc/rgsvc.html#_rgsvc_testing_FixtureScriptsSpecificationProvider"><code>FixtureScriptsSpecificationProvider</code></a> to obtain a <code>FixtureScriptsSpecification</code>. This configures this service, for example telling it which package to search for <code>FixtureScript</code> classes, how to execute those classes, and hints that influence the UI.</p>
@@ -8587,7 +8404,7 @@ repositoryService.persist(cust);</code></pre>
</div>
</div>
<div class="sect3">
- <h4 id="_implementation_30">10.2.2. Implementation</h4>
+ <h4 id="_implementation_29">10.2.2. Implementation</h4>
<div class="paragraph">
<p>The default implementation is <code>o.a.i.applib.services.fixturespec.FixtureScriptsDefault</code></p>
</div>
@@ -8707,7 +8524,7 @@ repositoryService.persist(cust);</code></pre>
</div>
</div>
<div class="sect3">
- <h4 id="_implementation_31">10.3.2. Implementation</h4>
+ <h4 id="_implementation_30">10.3.2. Implementation</h4>
<div class="paragraph">
<p>The <a href="../ugfun/ugfun.html#_ugfun_getting-started_simpleapp-archetype">SimpleApp archetype</a> has a simple implementation of this service:</p>
</div>
@@ -8785,7 +8602,7 @@ repositoryService.persist(cust);</code></pre>
</div>
</div>
<div class="sect3">
- <h4 id="_implementation_32">10.4.2. Implementation</h4>
+ <h4 id="_implementation_31">10.4.2. Implementation</h4>
<div class="paragraph">
<p>The core framework provides a default implementation of this service (<code>o.a.i.core.runtime.services.sudo.SudoServiceDefault</code>).</p>
</div>
@@ -8939,7 +8756,7 @@ repositoryService.persist(cust);</code></pre>
</div>
</div>
<div class="sect3">
- <h4 id="_implementation_33">10.5.2. Implementation</h4>
+ <h4 id="_implementation_32">10.5.2. Implementation</h4>
<div class="paragraph">
<p>The framework provides a default implementation of this service: <code>SwitchUserServiceImpl</code> in <code>isis-core-runtime</code></p>
</div>
@@ -9027,7 +8844,7 @@ repositoryService.persist(cust);</code></pre>
</div>
</div></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>RepositoryService-</code><br> <code>Default</code><br> <code>o.a.i.core</code><br> <code>isis-core-metamodel</code></p></td>
- <td class="tableblock halign-left valign-top"><p class="tableblock">Supercedes methods in <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_DomainObjectContainer"><code>DomainObjectContainer</code></a>.</p></td>
+ <td class="tableblock halign-left valign-top"></td>
</tr>
</tbody>
</table>
@@ -9105,7 +8922,7 @@ repositoryService.persist(cust);</code></pre>
</ul>
</div>
<div class="paragraph">
- <p>The <code>IsisJdoSupport</code> service provides a number of general purpose methods for working with the JDO/DataNucleus objectstore. In general these act at a lower-level of abstraction than the APIs normally used (specifically, those of <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_DomainObjectContainer"><code>DomainObjectContainer</code></a>), but nevertheless deal with some of the most common use cases. For service also provides access to the underlying JDO <code>PersistenceManager</code> for full control.</p>
+ <p>The <code>IsisJdoSupport</code> service provides a number of general purpose methods for working with the JDO/DataNucleus objectstore. In general these act at a lower-level of abstraction than the APIs normally used (specifically, those of <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_RepositoryService"><code>RepositoryService</code></a>), but nevertheless deal with some of the most common use cases. For service also provides access to the underlying JDO <code>PersistenceManager</code> for full control.</p>
</div>
<div class="paragraph">
<p>The following sections discuss the functionality provided by the service, broken out into categories.</p>
@@ -9334,15 +9151,13 @@ repositoryService.persist(cust);</code></pre>
<pre class="CodeRay highlight"><code data-lang="java"><span class="annotation">@DomainService</span>(nature=NatureOfService.VIEW_CONTRIBUTIONS_ONLY)
<span class="directive">public</span> <span class="type">class</span> <span class="class">OrderContributions</span> {
<span class="directive">public</span> Order newOrder(<span class="directive">final</span> Customer customer) {
- Order order = newTransientInstance(Order.class);
- order.setCustomer(customer);
- container.persist(customer);
- container.flush(); <i class="conum" data-value="1"></i><b>(1)</b>
- isisJdoSupport.refresh(customer); <i class="conum" data-value="2"></i><b>(2)</b>
+ Order order = <span class="keyword">new</span> Order(customer);
+ repositoryService.persistAndFlush(customer); <i class="conum" data-value="1"></i><b>(1)</b>
+ isisJdoSupport.refresh(customer); <i class="conum" data-value="2"></i><b>(2)</b>
<span class="keyword">return</span> order;
}
<span class="annotation">@Inject</span>
- DomainObjectContainer container;
+ RepositoryService repositoryService;
<span class="annotation">@Inject</span>
IsisJdoSupport isisJdoSupport;
}</code></pre>
@@ -9906,7 +9721,7 @@ repositoryService.persist(cust);</code></pre>
<span class="directive">public</span> <span class="type">class</span> <span class="class">ToDoItemRepositoryImplUsingJdoql</span> <span class="directive">implements</span> ToDoItemRepositoryImpl {
<span class="annotation">@Programmatic</span>
<span class="directive">public</span> <span class="predefined-type">List</span><ToDoItem> findByAtPathAndCategory(<span class="directive">final</span> <span class="predefined-type">String</span> atPath, <span class="directive">final</span> Category category) {
- <span class="keyword">return</span> container.allMatches(
+ <span class="keyword">return</span> repositoryService.allMatches(
<span class="keyword">new</span> QueryDefault<>(ToDoItem.class,
<span class="string"><span class="delimiter">"</span><span class="content">findByAtPathAndCategory</span><span class="delimiter">"</span></span>, <i class="conum" data-value="1"></i><b>(1)</b>
<span class="string"><span class="delimiter">"</span><span class="content">atPath</span><span class="delimiter">"</span></span>, atPath, <i class="conum" data-value="2"></i><b>(2)</b>
@@ -9914,7 +9729,7 @@ repositoryService.persist(cust);</code></pre>
}
...
<span class="annotation">@javax</span>.inject.Inject
- DomainObjectContainer container;
+ RepositoryService repositoryService;
}</code></pre>
</div>
</div>
@@ -9958,7 +9773,7 @@ repositoryService.persist(cust);</code></pre>
</div>
</div>
<div class="sect3">
- <h4 id="_implementation_34">11.5.3. Implementation</h4>
+ <h4 id="_implementation_33">11.5.3. Implementation</h4>
<div class="paragraph">
<p>The default implementation of this domain service is <code>o.a.i.core.metamodel.services.repository.RepositoryServiceDefault</code>.</p>
</div>
@@ -9992,7 +9807,7 @@ repositoryService.persist(cust);</code></pre>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p>Whether the <code>RepositoryService</code> (or <code>DomainObjectContainer</code> that delegates to it) should automatically flush pending changes prior to querying (via <code>allMatches()</code>, <code>firstMatch()</code> and so on).</p>
+ <p>Whether the <code>RepositoryService</code> should automatically flush pending changes prior to querying (via <code>allMatches()</code>, <code>firstMatch()</code> and so on).</p>
</div>
</div></td>
</tr>
@@ -10111,19 +9926,6 @@ repositoryService.persist(cust);</code></pre>
<div class="paragraph">
<p>The <code>AuditerService</code> auditing service provides a simple mechanism to capture changes to data. It is called for each property that has changed on any domain object, as a set of pre- and post-values.</p>
</div>
- <div class="admonitionblock note">
- <table>
- <tbody>
- <tr>
- <td class="icon"> <i class="fa icon-note" title="Note"></i> </td>
- <td class="content">
- <div class="paragraph">
- <p>This service is intended to replace the now-deprecated <a href="../rgsvc/rgsvc.html#_rgsvc_persistence-layer-spi_AuditingService"><code>AuditingService3</code></a>. The difference between the two is that this service recognises that the <code>transactionId</code> is actually a request/interaction Id, and that an additional `sequence</p>
- </div> </td>
- </tr>
- </tbody>
- </table>
- </div>
<div class="sect3">
<h4 id="_spi_22">12.1.1. SPI</h4>
<div class="paragraph">
@@ -10377,13 +10179,14 @@ log4j.additivity.org.apache.isis.applib.services.publish.PublisherServiceLogging
<div class="sect3">
<h4 id="_usage_17">12.2.3. Usage</h4>
<div class="paragraph">
- <p>To indicate that an action invocation should be published, annotate it with the <a href="../rgant/rgant.html#_rgant-Action_publishing"><code>@Action#publishing()</code></a> annotation.</p>
+ <p>To indicate that:</p>
</div>
- <div class="paragraph">
- <p>To indicate that an property edit should be published, annotate it with the <a href="../rgant/rgant.html#_rgant-Property_publishing"><code>@Property#publishing()</code></a> annotation.</p>
- </div>
- <div class="paragraph">
- <p>To indicate that a changed object should be published is to annotate it with the <a href="../rgant/rgant.html#_rgant-DomainObject_publishing"><code>@DomainObject#publishing()</code></a> annotation.</p>
+ <div class="ulist">
+ <ul>
+ <li> <p>an action invocation should be published, annotate it with the <a href="../rgant/rgant.html#_rgant-Action_publishing"><code>@Action#publishing()</code></a> annotation.</p> </li>
+ <li> <p>an property edit should be published, annotate it with the <a href="../rgant/rgant.html#_rgant-Property_publishing"><code>@Property#publishing()</code></a> annotation.</p> </li>
+ <li> <p>a changed object should be published is to annotate it with the <a href="../rgant/rgant.html#_rgant-DomainObject_publishing"><code>@DomainObject#publishing()</code></a> annotation.</p> </li>
+ </ul>
</div>
</div>
<div class="sect3">
@@ -10499,7 +10302,7 @@ log4j.additivity.org.apache.isis.applib.services.publish.PublisherServiceLogging
</div>
</div>
<div class="sect3">
- <h4 id="_implementation_35">12.3.2. Implementation</h4>
+ <h4 id="_implementation_34">12.3.2. Implementation</h4>
<div class="paragraph">
<p>The core Apache Isis framework itself defines only an API; there is no default implementation. Rather, the implementation will depend on the security mechanism being used.</p>
</div>
@@ -10628,7 +10431,7 @@ log4j.additivity.org.apache.isis.applib.services.publish.PublisherServiceLogging
</ul>
</div>
<div class="paragraph">
- <p>The <code>ClassDiscoveryService2</code> service (and its various supertypes) is used to automatically discover subclasses of any given type on the classpath. The primary use case is to support "convention-over-configuration" designs that work with a minimum of configuration.</p>
+ <p>The <code>ClassDiscoveryService</code> service (and its various supertypes) is used to automatically discover subclasses of any given type on the classpath. The primary use case is to support "convention-over-configuration" designs that work with a minimum of configuration.</p>
</div>
<div class="paragraph">
<p>This service is used by the <a href="../rgcms/rgcms.html#_rgcms_classes_super_FixtureScripts"><code>FixtureScripts</code></a> service to automatically locate any <a href="../rgcms/rgcms.html#_rgcms_classes_super_FixtureScript"><code>FixtureScript</code></a> implementations.</p>
@@ -10661,7 +10464,7 @@ log4j.additivity.org.apache.isis.applib.services.publish.PublisherServiceLogging
</div>
</div>
<div class="sect3">
- <h4 id="_implementation_36">13.1.2. Implementation</h4>
+ <h4 id="_implementation_35">13.1.2. Implementation</h4>
<div class="paragraph">
<p>Isis provides an implementation of this service, namely <code>o.a.i.applib.services.classdiscovery.ClassDiscoveryServiceUsingReflections</code>.</p>
</div>
[29/39] isis-site git commit: ISIS-1810: updates docs for 2.0.0-M1
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/274edd1d/content/versions/2.0.0-M1/guides/rgfis/rgfis.html
----------------------------------------------------------------------
diff --git a/content/versions/2.0.0-M1/guides/rgfis/rgfis.html b/content/versions/2.0.0-M1/guides/rgfis/rgfis.html
index 79c4991..3530f3d 100644
--- a/content/versions/2.0.0-M1/guides/rgfis/rgfis.html
+++ b/content/versions/2.0.0-M1/guides/rgfis/rgfis.html
@@ -697,13 +697,10 @@ table.CodeRay td.code>pre{padding:0}
<p>The <code>RepresentationService</code> is the main plug-in point for the <a href="../ugvro/ugvro.html">RestfulObjects viewer</a> to generate representations.</p>
</div>
<div class="paragraph">
- <p>The default implementation generates representations according to the <a href="http://restfulobjects.org">Restful Objects spec</a> v1.0. However, it also delegates to the <a href="../rgfis/rgfis.html#_rgfis_presentation-layer_ContentNegotiationService"><code>ContentNegotiationService</code></a> which provides a mechanism for altering representations according to the HTTP <code>Accept</code> header.</p>
+ <p>The default implementations ultimately generate representations according to the <a href="http://restfulobjects.org">Restful Objects spec</a> v1.0. However, it also delegates to the <a href="../rgfis/rgfis.html#_rgfis_presentation-layer_ContentNegotiationService"><code>ContentNegotiationService</code></a> which provides a mechanism for altering representations according to the HTTP <code>Accept</code> header. This allows more flexible representations to be generated for REST clients that (perhaps through their use of a certain Javascript library, say) expect, or at least works best with, a certain style of representation.</p>
</div>
<div class="paragraph">
- <p>The principal motivation is to allow more flexible representations to be generated for REST clients that (perhaps through their use of a certain Javascript library, say) expect, or at least works best with, a certain style of representation.</p>
- </div>
- <div class="paragraph">
- <p>In all there are three domain services that can influence the representations generated: this service, <a href="../rgfis/rgfis.html#_rgfis_presentation-layer_ContentNegotiationService"><code>ContentNegotiationService</code></a>and the <a href="../rgsvc/rgsvc.html#_rgsvc_presentation-layer-spi_ContentMappingService"><code>ContentMappingService</code></a>. The diagram below shows how these collaborate:</p>
+ <p>In all there are three domain services that can influence the representations generated: this service, <a href="../rgfis/rgfis.html#_rgfis_presentation-layer_ContentNegotiationService"><code>ContentNegotiationService</code></a> and the <a href="../rgsvc/rgsvc.html#_rgsvc_presentation-layer-spi_ContentMappingService"><code>ContentMappingService</code></a>. The diagram below shows how these collaborate:</p>
</div>
<div class="imageblock">
<div class="content">
@@ -711,7 +708,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="paragraph">
- <p>The <code>RepresentationServiceForRestfulObjects</code> is the default implementation of this service; likewise <code>ContentNegotiationServiceXRoDomainType</code> is the default implementation of the <code>ContentNegotiationService</code>. If you inspect the source code you’ll see that the default implementation of this service’s primary responsibility is to generate the default Restful Objects representations. Therefore, if you what you want to do is to generate a <em>different _representation then in many cases replacing either this service _or</em> the <code>ContentNegotiationService</code> will be equivalent (you’ll notice that their SPIs are very similar).</p>
+ <p>The <code>RepresentationServiceContentNegotiator</code> is the default implementation of the top-level <code>RepresentationService</code>, and it delegates to list of injecting <code>ContentNegotiationService</code> services. Using a chain of responsibility pattern, it returns the first non-null representation. For their part, the implementations of <code>ContentNegotiationService</code> use the HTTP Accept header to determine if they should render any representation or just return null.</p>
</div>
<div class="sect3">
<h4 id="_spi_2">2.2.1. SPI</h4>
@@ -750,23 +747,23 @@ table.CodeRay td.code>pre{padding:0}
<tbody>
<tr>
<td><i class="conum" data-value="1"></i><b>1</b></td>
- <td>representation of a single object, as per section 14.4 of the RO spec, v1.0</td>
+ <td>representation of a single object, eg as per section 14.4 of the RO spec, v1.0</td>
</tr>
<tr>
<td><i class="conum" data-value="2"></i><b>2</b></td>
- <td>representation of a single property of an object, as per section 16.4 of the RO spec v1.0</td>
+ <td>representation of a single property of an object, eg as per section 16.4 of the RO spec v1.0</td>
</tr>
<tr>
<td><i class="conum" data-value="3"></i><b>3</b></td>
- <td>representation of a single collection of an object, as per section 17.5 of the RO spec v1.0</td>
+ <td>representation of a single collection of an object, eg as per section 17.5 of the RO spec v1.0</td>
</tr>
<tr>
<td><i class="conum" data-value="4"></i><b>4</b></td>
- <td>representation of a single action (prompt) of an object, as per section 18.2 of the RO spec v1.0</td>
+ <td>representation of a single action (prompt) of an object, eg as per section 18.2 of the RO spec v1.0</td>
</tr>
<tr>
<td><i class="conum" data-value="5"></i><b>5</b></td>
- <td>representation of the results of a single action invocation, as per section 19.5 of the RO spec v1.0</td>
+ <td>representation of the results of a single action invocation, eg as per section 19.5 of the RO spec v1.0</td>
</tr>
</tbody>
</table>
@@ -1457,7 +1454,7 @@ table.CodeRay td.code>pre{padding:0}
</ul>
</div>
<div class="paragraph">
- <p>The (internal) <code>PublishingServiceInternal</code> domain service acts as an internal facade to any configured <a href="../rgsvc/rgsvc.html#_rgsvc_persistence-layer-spi_PublisherService"><code>PublisherService</code></a> or (deprecated) <a href="../rgsvc/rgsvc.html#_rgsvc_persistence-layer-spi_PublishingService"><code>PublishingService</code></a> domain services.</p>
+ <p>The (internal) <code>PublishingServiceInternal</code> domain service acts as an internal facade to any configured <a href="../rgsvc/rgsvc.html#_rgsvc_persistence-layer-spi_PublisherService"><code>PublisherService</code></a> domain service(s).</p>
</div>
<div class="paragraph">
<p>For published action invocations/ property edits, it provides an API for those member executions to call.</p>
@@ -1512,7 +1509,7 @@ table.CodeRay td.code>pre{padding:0}
<div class="sect3">
<h4 id="_related_classes_3">4.4.3. Related Classes</h4>
<div class="paragraph">
- <p>The service delegates between the (internal) <a href="../rgfis/rgfis.html#_rgfis_persistence-layer_ChangedObjectsServiceInternal"><code>ChangedObjectsServiceInternal</code></a> domain service to the configured <a href="../rgsvc/rgsvc.html#_rgsvc_persistence-layer-spi_PublisherService"><code>PublisherService</code></a> and <a href="../rgsvc/rgsvc.html#_rgsvc_persistence-layer-spi_PublishingService"><code>PublishingService</code></a>.</p>
+ <p>The service delegates between the (internal) <a href="../rgfis/rgfis.html#_rgfis_persistence-layer_ChangedObjectsServiceInternal"><code>ChangedObjectsServiceInternal</code></a> domain service to the configured <a href="../rgsvc/rgsvc.html#_rgsvc_persistence-layer-spi_PublisherService"><code>PublisherService</code></a>.</p>
</div>
<div class="paragraph">
<p>The (internal) <a href="../rgfis/rgfis.html#_rgfis_persistence-layer_AuditingServiceInternal"><code>AuditingServiceInternal</code></a> performs a similar function for the <a href="../rgsvc/rgsvc.html#_rgsvc_persistence-layer-spi_PublisherService"><code>PublisherService</code></a>, also collating details of the changed objects from <code>ChangedObjectsServiceInternal</code>.</p>
[38/39] isis-site git commit: ISIS-1810: updates docs for 2.0.0-M1
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/274edd1d/content/migration-notes/migration-notes.html
----------------------------------------------------------------------
diff --git a/content/migration-notes/migration-notes.html b/content/migration-notes/migration-notes.html
index 7a37dd7..192bb88 100644
--- a/content/migration-notes/migration-notes.html
+++ b/content/migration-notes/migration-notes.html
@@ -381,13 +381,13 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-DomainService">@DomainService</a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-DomainService">@DomainService</a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-DomainServiceLayout">@DomainServiceLayout</a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-DomainServiceLayout">@DomainServiceLayout</a></p>
</div>
</div></td>
</tr>
@@ -401,13 +401,13 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-DomainObject">@DomainObject</a><br> <a href="../guides/rgant/rgant.html#_rgant-ViewModel">@ViewModel</a><br> <a href="../guides/rgant/rgant.html#_rgant-MemberGroupLayout">@MemberGroupLayout</a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-DomainObject">@DomainObject</a><br> <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-ViewModel">@ViewModel</a><br> <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-MemberGroupLayout">@MemberGroupLayout</a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-DomainObjectLayout">@DomainObjectLayout</a><br> <a href="../guides/rgant/rgant.html#_rgant-ViewModelLayout">@ViewModelLayout</a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-DomainObjectLayout">@DomainObjectLayout</a><br> <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-ViewModelLayout">@ViewModelLayout</a></p>
</div>
</div></td>
</tr>
@@ -421,13 +421,13 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-Action">@Action</a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-Action">@Action</a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-ActionLayout">@ActionLayout</a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-ActionLayout">@ActionLayout</a></p>
</div>
</div></td>
</tr>
@@ -441,13 +441,13 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-Parameter">@Parameter</a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-Parameter">@Parameter</a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-ParameterLayout">@ParameterLayout</a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-ParameterLayout">@ParameterLayout</a></p>
</div>
</div></td>
</tr>
@@ -461,13 +461,13 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-Property">@Property</a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-Property">@Property</a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-PropertyLayout">@PropertyLayout</a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-PropertyLayout">@PropertyLayout</a></p>
</div>
</div></td>
</tr>
@@ -481,13 +481,13 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-Collection">@Collection</a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-Collection">@Collection</a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-CollectionLayout">@CollectionLayout</a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-CollectionLayout">@CollectionLayout</a></p>
</div>
</div></td>
</tr>
@@ -507,7 +507,7 @@ table.CodeRay td.code>pre{padding:0}
</ul>
</div>
<div class="paragraph">
- <p>Prior to v2.0.0, several annotation attributes were defined as booleans. In order to support <a href="#__migration-notes_1.15.0-to-1.16.0_meta-annotations">meta annotations</a>, these have been replaced by enums which also include a <code>NOT_SPECIFIED</code> value. Other enums have been extended (where necessary) to also have a <code>NOT_SPECIFIED</code> value. In all cases <code>NOT_SPECIFIED</code> is the new default.</p>
+ <p>Prior to v2.0.0, several annotation attributes were defined as booleans. In order to support <a href="https://isis.apache.org/versions/2.0.0-M1/migration-notes/migration-notes.html#__migration-notes_1.15.0-to-1.16.0_meta-annotations">meta annotations</a>, these have been replaced by enums which also include a <code>NOT_SPECIFIED</code> value. Other enums have been extended (where necessary) to also have a <code>NOT_SPECIFIED</code> value. In all cases <code>NOT_SPECIFIED</code> is the new default.</p>
</div>
<table class="tableblock frame-all grid-all spread">
<caption class="title">
@@ -530,13 +530,13 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top" rowspan="7">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-Action"><code>@Action</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-Action"><code>@Action</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-Action_command"><code>command</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-Action_command"><code>command</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -550,7 +550,7 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-Action_hidden"><code>hidden</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-Action_hidden"><code>hidden</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -564,7 +564,7 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-Action_invokeOn"><code>invokeOn</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-Action_invokeOn"><code>invokeOn</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -578,7 +578,7 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-Action_publishing"><code>publishing</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-Action_publishing"><code>publishing</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -592,7 +592,7 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-Action_publishing"><code>publishing</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-Action_publishing"><code>publishing</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -606,7 +606,7 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-Action_restrictTo"><code>restrictTo</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-Action_restrictTo"><code>restrictTo</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -620,7 +620,7 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-Action_semantics"><code>semantics</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-Action_semantics"><code>semantics</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -634,13 +634,13 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top" rowspan="3">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-ActionLayout"><code>@ActionLayout</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-ActionLayout"><code>@ActionLayout</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-ActionLayout_bookmarking"><code>bookmarking</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-ActionLayout_bookmarking"><code>bookmarking</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -654,7 +654,7 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-ActionLayout_contributed"><code>contributed</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-ActionLayout_contributed"><code>contributed</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -668,7 +668,7 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-ActionLayout_position"><code>position</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-ActionLayout_position"><code>position</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -682,13 +682,13 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top" rowspan="3">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-Collection"><code>@Collection</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-Collection"><code>@Collection</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-Collection_hidden"><code>hidden</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-Collection_hidden"><code>hidden</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -702,7 +702,7 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-Collection_editing"><code>editing</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-Collection_editing"><code>editing</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -716,7 +716,7 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-Collection_mementoSerialization"><code>mementoSerialization</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-Collection_mementoSerialization"><code>mementoSerialization</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -730,13 +730,13 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top" rowspan="4">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-DomainObject"><code>@DomainObject</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-DomainObject"><code>@DomainObject</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-DomainObject_auditing"><code>auditing</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-DomainObject_auditing"><code>auditing</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -750,7 +750,7 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-DomainObject_bounding"><code>bounding</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-DomainObject_bounding"><code>bounding</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -764,7 +764,7 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-DomainObject_editing"><code>editing</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-DomainObject_editing"><code>editing</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -778,7 +778,7 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-DomainObject_publishing"><code>publishing</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-DomainObject_publishing"><code>publishing</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -792,13 +792,13 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-DomainObjectLayout"><code>@DomainObjectLayout</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-DomainObjectLayout"><code>@DomainObjectLayout</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-DomainObjectLayout_bookmarking"><code>bookmarking</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-DomainObjectLayout_bookmarking"><code>bookmarking</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -812,13 +812,13 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-Parameter"><code>@Parameter</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-Parameter"><code>@Parameter</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-Parameter_optionality"><code>optionality</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-Parameter_optionality"><code>optionality</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -832,13 +832,13 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top" rowspan="2">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-ParameterLayout"><code>@ParameterLayout</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-ParameterLayout"><code>@ParameterLayout</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-ParameterLayout_labelPosition"><code>labelPosition</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-ParameterLayout_labelPosition"><code>labelPosition</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -852,7 +852,7 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-ParameterLayout_renderDay"><code>renderDay</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-ParameterLayout_renderDay"><code>renderDay</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -866,13 +866,13 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top" rowspan="6">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-Property"><code>@Property</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-Property"><code>@Property</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-Property_commandReification"><code>commandReification</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-Property_commandReification"><code>commandReification</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -886,7 +886,7 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-Property_editing"><code>editing</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-Property_editing"><code>editing</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -900,7 +900,7 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-Property_hidden"><code>hidden</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-Property_hidden"><code>hidden</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -914,7 +914,7 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-Property_mementoSerialization"><code>mementoSerialization</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-Property_mementoSerialization"><code>mementoSerialization</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -928,7 +928,7 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-Property_optionality"><code>optionality</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-Property_optionality"><code>optionality</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -942,7 +942,7 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-Property_publishing"><code>publishing</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-Property_publishing"><code>publishing</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -956,13 +956,13 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top" rowspan="5">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-PropertyLayout"><code>@PropertyLayout</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-PropertyLayout"><code>@PropertyLayout</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-PropertyLayout_labelPosition"><code>labelPosition</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-PropertyLayout_labelPosition"><code>labelPosition</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -976,7 +976,7 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-PropertyLayout_promptStyle"><code>promptStyle</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-PropertyLayout_promptStyle"><code>promptStyle</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -990,7 +990,7 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-PropertyLayout_renderDay"><code>renderDay</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-PropertyLayout_renderDay"><code>renderDay</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -1004,7 +1004,7 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-PropertyLayout_repainting"><code>repainting</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-PropertyLayout_repainting"><code>repainting</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -1018,13 +1018,13 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-ViewModelLayout"><code>@ViewModelLayout</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-ViewModelLayout"><code>@ViewModelLayout</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-ViewModelLayout_bookmarking"><code>bookmarking</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-ViewModelLayout_bookmarking"><code>bookmarking</code></a></p>
</div>
</div></td>
</tr>
@@ -1065,61 +1065,65 @@ table.CodeRay td.code>pre{padding:0}
<tbody>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@Action</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@Action</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>publishingPayloadFactory()</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>publishingPayloadFactory()</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p>Removed, use the simpler <a href="../guides/rgsvc/rgsvc.html#PublisherService">PublisherService</a> SPI instead.</p>
+ <p>Removed, use the simpler <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgsvc/rgsvc.html#PublisherService">PublisherService</a> SPI instead.</p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@ActionInteraction</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@ActionInteraction</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant_Action_domainEvent"><code>@Action#domainEvent()</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Action_domainEvent"><code>@Action#domainEvent()</code></a></p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@ActionOrder</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@ActionOrder</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant_MemberOrder"><code>@MemberOrder()</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_MemberOrder"><code>@MemberOrder()</code></a></p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@Aggregated</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@Aggregated</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
@@ -1129,414 +1133,429 @@ table.CodeRay td.code>pre{padding:0}
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@Auditable
-(JDO applib)</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@Auditable</code> (JDO applib)</p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant_DomainObject_audited"><code>@DomainObject#auditing()</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_DomainObject_audited"><code>@DomainObject#auditing()</code></a></p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@Audited</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@Audited</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant_DomainObject_audited"><code>@DomainObject#auditing()</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_DomainObject_audited"><code>@DomainObject#auditing()</code></a></p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@AutoComplete</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@AutoComplete</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant_DomainObject_autoComplete"><code>@DomainObject#autoComplete()</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_DomainObject_autoComplete"><code>@DomainObject#autoComplete()</code></a></p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@ActionSemantics</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@ActionSemantics</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant_Action_semantics"><code>@Action#semantics()</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Action_semantics"><code>@Action#semantics()</code></a></p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@Bookmarkable</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@Bookmarkable</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant_DomainObject_bookmarking"><code>@DomainObject#bookmarking()</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_DomainObject_bookmarking"><code>@DomainObject#bookmarking()</code></a></p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@Bounded</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@Bounded</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant_DomainObject_bounding"><code>@DomainObject#bounding()</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_DomainObject_bounding"><code>@DomainObject#bounding()</code></a></p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@Bulk</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@Bulk</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant_Action_invokeOn"><code>@Action#invokeOn()</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Action_invokeOn"><code>@Action#invokeOn()</code></a></p>
</div>
<div class="paragraph">
- <p>Similarly, the <code>Bulk.InteractionContext</code> domain service is replaced with the <a href="../guides/rgsvc/rgsvc.html#ActionInvocationContext">ActionInvocationContext</a> domain service.</p>
+ <p>Similarly, the <code>Bulk.InteractionContext</code> domain service is replaced with the <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgsvc/rgsvc.html#ActionInvocationContext">ActionInvocationContext</a> domain service.</p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@Collection</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@Collection</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>notPersisted</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>notPersisted</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p>Removed, replaced with <a href="../guides/rgant/rgant.html#_rgant_Collection_mementoSerialization"><code>@Collection#mementoSerialization()</code></a></p>
+ <p>Removed, replaced with <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Collection_mementoSerialization"><code>@Collection#mementoSerialization()</code></a></p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@CollectionInteraction</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@CollectionInteraction</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant_Collection_domainEvent"><code>@Collection #domainEvent()</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Collection_domainEvent"><code>@Collection #domainEvent()</code></a></p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@CollectionLayout</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@CollectionLayout</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>render()</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>render</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant_CollectionLayout_defaultView"><code>@CollectionLayout#defaultView()</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_CollectionLayout_defaultView"><code>@CollectionLayout#defaultView()</code></a></p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@Command</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@Command</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant_Action_command"><code>@Action#command()</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Action_command"><code>@Action#command()</code></a></p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@CssClass</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@CssClass</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p>Either <a href="../guides/rgant/rgant.html#_rgant_ActionLayout_cssClass"><code>@ActionLayout#cssClass()</code></a>, <a href="../guides/rgant/rgant.html#_rgant_PropertyLayout_cssClass"><code>@PropertyLayout#cssClass()</code></a>, <a href="../guides/rgant/rgant.html#_rgant_CollectionLayout_cssClass"><code>@CollectionLayout#cssClass()</code></a>, <a href="../guides/rgant/rgant.html#_rgant_ParameterLayout_cssClass"><code>@ParameterLayout#cssClass()</code></a>, <a href="../guides/rgant/rgant.html#_rgant_DomainObjectLayout_cssClass"><code>@DomainObjectLayout#cssClass()</code></a> or <a href="../guides/rgant/rgant.html#_rgant_ViewModelLayout_cssClass"><code>@ViewModelLayout#cssClass()</code></a>.</p>
+ <p>Either <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_ActionLayout_cssClass"><code>@ActionLayout#cssClass()</code></a>, <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_PropertyLayout_cssClass"><code>@PropertyLayout#cssClass()</code></a>, <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_CollectionLayout_cssClass"><code>@CollectionLayout#cssClass()</code></a>, <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_ParameterLayout_cssClass"><code>@ParameterLayout#cssClass()</code></a>, <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_DomainObjectLayout_cssClass"><code>@DomainObjectLayout#cssClass()</code></a> or <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_ViewModelLayout_cssClass"><code>@ViewModelLayout#cssClass()</code></a>.</p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@CssClassFa</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@CssClassFa</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p>Either <a href="../guides/rgant/rgant.html#_rgant_ActionLayout_cssClassFa"><code>@ActionLayout#cssClassFa()</code></a>, <a href="../guides/rgant/rgant.html#_rgant_DomainObjectLayout_cssClassFa"><code>@DomainObjectLayout#cssClassFa()</code></a> or <a href="../guides/rgant/rgant.html#_rgant_ViewModelLayout_cssClassFa"><code>@ViewModelLayout#cssClassFa()</code></a>.</p>
+ <p>Either <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_ActionLayout_cssClassFa"><code>@ActionLayout#cssClassFa()</code></a>, <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_DomainObjectLayout_cssClassFa"><code>@DomainObjectLayout#cssClassFa()</code></a> or <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_ViewModelLayout_cssClassFa"><code>@ViewModelLayout#cssClassFa()</code></a>.</p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@Debug</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@Debug</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant_Action_restrictTo"><code>@Action#restrictTo()</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Action_restrictTo"><code>@Action#restrictTo()</code></a></p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@DescribedAs</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@DescribedAs</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p>Either <a href="../guides/rgant/rgant.html#_rgant_ActionLayout_describedAs"><code>@ActionLayout#describedAs()</code></a>, <a href="../guides/rgant/rgant.html#_rgant_PropertyLayout_describedAs"><code>@PropertyLayout#describedAs()</code></a>, <a href="../guides/rgant/rgant.html#_rgant_CollectionLayout_describedAs"><code>@CollectionLayout#describedAs()</code></a>, <a href="../guides/rgant/rgant.html#_rgant_ParameterLayout_describedAs"><code>@ParameterLayout#describedAs()</code></a>, <a href="../guides/rgant/rgant.html#_rgant_DomainObjectLayout_describedAs"><code>@DomainObjectLayout#describedAs()</code></a> or <a href="../guides/rgant/rgant.html#_rgant_ViewModelLayout_describedAs"><code>@ViewModelLayout#describedAs()</code></a>.</p>
+ <p>Either <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_ActionLayout_describedAs"><code>@ActionLayout#describedAs()</code></a>, <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_PropertyLayout_describedAs"><code>@PropertyLayout#describedAs()</code></a>, <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_CollectionLayout_describedAs"><code>@CollectionLayout#describedAs()</code></a>, <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_ParameterLayout_describedAs"><code>@ParameterLayout#describedAs()</code></a>, <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_DomainObjectLayout_describedAs"><code>@DomainObjectLayout#describedAs()</code></a> or <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_ViewModelLayout_describedAs"><code>@ViewModelLayout#describedAs()</code></a>.</p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@Disabled</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@Disabled</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant_Property_editingDisabledReason"><code>@Property#editingDisabledReason()</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Property_editingDisabledReason"><code>@Property#editingDisabledReason()</code></a></p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top" rowspan="2">
- <div class="literal">
- <pre>@DomainObject</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@DomainObject</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>bounded</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>bounded</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p>Deleted (was a boolean attribute), replaced by <a href="../guides/rgant/rgant.html#_rgant_DomainObject_bounding"><code>@Property#bounding</code></a></p>
+ <p>Deleted (was a boolean attribute), replaced by <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_DomainObject_bounding"><code>@Property#bounding</code></a></p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>publishingPayloadFactory</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>publishingPayloadFactory</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>Removed, use the simpler <a href="../guides/rgsvc/rgsvc.html#PublisherService">PublisherService</a> SPI instead.</pre>
+ <div>
+ <div class="paragraph">
+ <p>Removed, use the simpler <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgsvc/rgsvc.html#PublisherService">PublisherService</a> SPI instead.</p>
+ </div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@Exploration</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@Exploration</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant_Action_restrictTo"><code>@Action#restrictTo()</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Action_restrictTo"><code>@Action#restrictTo()</code></a></p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@FieldOrder</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@FieldOrder</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant_MemberOrder"><code>@MemberOrder()</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_MemberOrder"><code>@MemberOrder()</code></a></p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@Hidden</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@Hidden</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p>For actions by either <a href="../guides/rgant/rgant.html#_rgant_Action_hidden"><code>@Action#hidden()</code></a> or <a href="../guides/rgant/rgant.html#_rgant_ActionLayout_hidden"><code>@ActionLayout#hidden()</code></a>, for properties by either <a href="../guides/rgant/rgant.html#_rgant_Property_hidden"><code>@Property#hidden()</code></a> or <a href="../guides/rgant/rgant.html#_rgant_PropertyLayout_hidden"><code>@PropertyLayout#hidden()</code></a>, for collections by either <a href="../guides/rgant/rgant.html#_rgant_Collection_hidden"><code>@Collection#hidden()</code></a> or <a href="../guides/rgant/rgant.html#_rgant_CollectionLayout_hidden"><code>@CollectionLayout#hidden()</code></a>.</p>
+ <p>For actions by either <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Action_hidden"><code>@Action#hidden()</code></a> or <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_ActionLayout_hidden"><code>@ActionLayout#hidden()</code></a>, for properties by either <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Property_hidden"><code>@Property#hidden()</code></a> or <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_PropertyLayout_hidden"><code>@PropertyLayout#hidden()</code></a>, for collections by either <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Collection_hidden"><code>@Collection#hidden()</code></a> or <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_CollectionLayout_hidden"><code>@CollectionLayout#hidden()</code></a>.</p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@Idempotent</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@Idempotent</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant_Action_semantics"><code>@Action#semantics()</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Action_semantics"><code>@Action#semantics()</code></a></p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@Ignore</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@Ignore</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant_Programmatic"><code>@Programmatic</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Programmatic"><code>@Programmatic</code></a></p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@Immutable</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@Immutable</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant_DomainObject_editing"><code>@DomainObject#editing()</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_DomainObject_editing"><code>@DomainObject#editing()</code></a></p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@Mandatory</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@Mandatory</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p>Either <a href="../guides/rgant/rgant.html#_rgant_Property_optionality"><code>@Property#optionality()</code></a> or <a href="../guides/rgant/rgant.html#_rgant_Parameter_optionality"><code>@Parameter#optionality()</code></a>.</p>
+ <p>Either <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Property_optionality"><code>@Property#optionality()</code></a> or <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Parameter_optionality"><code>@Parameter#optionality()</code></a>.</p>
</div>
<div class="paragraph">
- <p>For properties, can also use <a href="../guides/rgant/rgant.html#_rgant_Column_allowsNull"><code>@Column#allowsNull()</code></a> Can also use <a href="../guides/rgant/rgant.html#_rgant_Nullable"><code>@Nullable</code></a> for either properties or parameters.</p>
+ <p>For properties, can also use <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Column_allowsNull"><code>@Column#allowsNull()</code></a> Can also use <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Nullable"><code>@Nullable</code></a> for either properties or parameters.</p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@Mask</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@Mask</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
@@ -1546,154 +1565,154 @@ table.CodeRay td.code>pre{padding:0}
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@MaxLength</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@MaxLength</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p>Either <a href="../guides/rgant/rgant.html#_rgant_Property_maxLength"><code>@Property#maxLength()</code></a> or <a href="../guides/rgant/rgant.html#_rgant_Parameter_maxLength"><code>@Parameter#maxLength()</code></a>.</p>
+ <p>Either <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Property_maxLength"><code>@Property#maxLength()</code></a> or <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Parameter_maxLength"><code>@Parameter#maxLength()</code></a>.</p>
</div>
<div class="paragraph">
- <p>For properties, can also use <a href="../guides/rgant/rgant.html#_rgant_Column_length"><code>@Column#length()</code></a></p>
+ <p>For properties, can also use <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Column_length"><code>@Column#length()</code></a></p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@MemberGroups</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@MemberGroups</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/ugvw/ugvw.html#_ugvw_layout_file-based">.layout.xml</a> file instead.</p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/ugvw/ugvw.html#_ugvw_layout_file-based">.layout.xml</a> file instead.</p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@MultiLine</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@MultiLine</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p>Either <a href="../guides/rgant/rgant.html#_rgant_PropertyLayout_multiLine"><code>@PropertyLayout#multiLine()</code></a> or <a href="../guides/rgant/rgant.html#_rgant_ParameterLayout_multiLine"><code>@ParameterLayout#multiLine()</code></a>.</p>
+ <p>Either <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_PropertyLayout_multiLine"><code>@PropertyLayout#multiLine()</code></a> or <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_ParameterLayout_multiLine"><code>@ParameterLayout#multiLine()</code></a>.</p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@MustSatisfy</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@MustSatisfy</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p>Either <a href="../guides/rgant/rgant.html#_rgant_Property_mustSatisfy"><code>@Property#mustSatisfy()</code></a> or <a href="../guides/rgant/rgant.html#_rgant_Parameter_mustSatisfy"><code>@Parameter#mustSatisfy()</code></a>.</p>
+ <p>Either <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Property_mustSatisfy"><code>@Property#mustSatisfy()</code></a> or <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Parameter_mustSatisfy"><code>@Parameter#mustSatisfy()</code></a>.</p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@NotPersisted</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@NotPersisted</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant_Property_notPersisted"><code>@Property#notPersisted()</code></a>.</p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Property_notPersisted"><code>@Property#notPersisted()</code></a>.</p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@Optional</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@Optional</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p>Either <a href="../guides/rgant/rgant.html#_rgant_Property_optionality"><code>@Property#optionality()</code></a> or <a href="../guides/rgant/rgant.html#_rgant_Parameter_optionality"><code>@Parameter#optionality()</code></a>.</p>
+ <p>Either <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Property_optionality"><code>@Property#optionality()</code></a> or <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Parameter_optionality"><code>@Parameter#optionality()</code></a>.</p>
</div>
<div class="paragraph">
- <p>For properties, can also use <a href="../guides/rgant/rgant.html#_rgant_Column_allowsNull"><code>@Column#allowsNull()</code></a> Can also use <a href="../guides/rgant/rgant.html#_rgant_Nullable"><code>@Nullable</code></a> for either properties or parameters.</p>
+ <p>For properties, can also use <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Column_allowsNull"><code>@Column#allowsNull()</code></a> Can also use <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Nullable"><code>@Nullable</code></a> for either properties or parameters.</p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@Named</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@Named</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p>Either <a href="../guides/rgant/rgant.html#_rgant_ActionLayout_named"><code>@ActionLayout#named()</code></a>, <a href="../guides/rgant/rgant.html#_rgant_PropertyLayout_named"><code>@PropertyLayout#named()</code></a>, <a href="../guides/rgant/rgant.html#_rgant_CollectionLayout_named"><code>@CollectionLayout#named()</code></a>, <a href="../guides/rgant/rgant.html#_rgant_ParameterLayout_named"><code>@ParameterLayout#named()</code></a>, <a href="../guides/rgant/rgant.html#_rgant_DomainObjectLayout_named"><code>@DomainObjectLayout#named()</code></a> or <a href="../guides/rgant/rgant.html#_rgant_ViewModelLayout_named"><code>@ViewModelLayout#named()</code></a>.</p>
+ <p>Either <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_ActionLayout_named"><code>@ActionLayout#named()</code></a>, <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_PropertyLayout_named"><code>@PropertyLayout#named()</code></a>, <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_CollectionLayout_named"><code>@CollectionLayout#named()</code></a>, <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_ParameterLayout_named"><code>@ParameterLayout#named()</code></a>, <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_DomainObjectLayout_named"><code>@DomainObjectLayout#named()</code></a> or <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_ViewModelLayout_named"><code>@ViewModelLayout#named()</code></a>.</p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@NotInServiceMenu</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@NotInServiceMenu</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant_DomainService_nature"><code>@DomainService#nature()</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_DomainService_nature"><code>@DomainService#nature()</code></a></p>
</div>
<div class="paragraph">
- <p>Specify nature of <code>VIEW_CONTRIBUTIONS_ONLY</code>. Alternatively, use a <a href="../guides/rgant/rgant.html#_rgant_Mixin">mixin</a>.</p>
+ <p>Specify nature of <code>VIEW_CONTRIBUTIONS_ONLY</code>. Alternatively, use a <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Mixin">mixin</a>.</p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@NotContributed</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@NotContributed</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant_DomainService_nature"><code>@DomainService#nature()</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_DomainService_nature"><code>@DomainService#nature()</code></a></p>
</div>
<div class="paragraph">
<p>Specify nature of <code>VIEW_MENU_ONLY</code>.</p>
@@ -1702,13 +1721,13 @@ table.CodeRay td.code>pre{padding:0}
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@NotPersistable</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@NotPersistable</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
@@ -1718,37 +1737,41 @@ table.CodeRay td.code>pre{padding:0}
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@ObjectType</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@ObjectType</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p>Removed, <a href="../guides/rgant/rgant.html#_rgant_DomainObject_objectType"><code>@DomainObject#objectType()</code></a> or <a href="../guides/rgant/rgant.html#_rgant_DomainService_objectType"><code>@DomainService#objectType()</code></a></p>
+ <p>Removed, <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_DomainObject_objectType"><code>@DomainObject#objectType()</code></a> or <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_DomainService_objectType"><code>@DomainService#objectType()</code></a></p>
</div>
<div class="paragraph">
<p>Alternatively, for domain entities either:</p>
</div>
<div class="ulist">
<ul>
- <li> <p>the <a href="../guides/rgant/rgant.html#_rgant_Discriminator"><code>@Discriminator</code></a> annotation can be specified; the value is used as the object type, or</p> </li>
- <li> <p>the <a href="../guides/rgant/rgant.html#_rgant_PersistenceCapable_schema"><code>@PersistenceCapable#schema()</code></a> can be specified; the value is used as the concatenated with the class name to create a two part object type.</p> </li>
+ <li> <p>the <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Discriminator"><code>@Discriminator</code></a> annotation can be specified; the value is used as the object type, or</p> </li>
+ <li> <p>the <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_PersistenceCapable_schema"><code>@PersistenceCapable#schema()</code></a> can be specified; the value is used as the concatenated with the class name to create a two part object type.</p> </li>
</ul>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@Parameter</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@Parameter</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>minLength()</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>minLength</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
<div>
@@ -1756,311 +1779,321 @@ table.CodeRay td.code>pre{padding:0}
<p>Never implemented internally in Isis 1.x so no replacement.</p>
</div>
<div class="paragraph">
- <p>Note that the <a href="../guides/rgant/rgant.html#_rgant_MinLength"><code>@MinLength</code></a> annotation is for use with autocomplete supporting methods (specifying the minimum number of characters to enter before an auto-complete search is performed).</p>
+ <p>Note that the <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_MinLength"><code>@MinLength</code></a> annotation is for use with autocomplete supporting methods (specifying the minimum number of characters to enter before an auto-complete search is performed).</p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@Paged</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@Paged</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p>Either <a href="../guides/rgant/rgant.html#_rgant_CollectionLayout_paged"><code>@CollectionLayout#paged()</code></a> (for parented collections), or <a href="../guides/rgant/rgant.html#_rgant_DomainObject_paged"><code>@DomainObject#paged()</code></a> (for standalone collections)</p>
+ <p>Either <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_CollectionLayout_paged"><code>@CollectionLayout#paged()</code></a> (for parented collections), or <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_DomainObject_paged"><code>@DomainObject#paged()</code></a> (for standalone collections)</p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@ParameterLayout</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@ParameterLayout</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>renderedAsDayBefore</pre>
+ <div>
+ <div class="paragraph">
+ <p>renderedAsDayBefore</p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p>Deleted (was a boolean attribute), replaced by <a href="../guides/rgant/rgant.html#_rgant_ParameterLayout_renderDay"><code>@ParameterLayout#renderDay</code></a>.</p>
+ <p>Deleted (was a boolean attribute), replaced by <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_ParameterLayout_renderDay"><code>@ParameterLayout#renderDay</code></a>.</p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@Plural</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@Plural</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant_DomainObjectLayout_plural"><code>@DomainObjectLayout#plural()</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_DomainObjectLayout_plural"><code>@DomainObjectLayout#plural()</code></a></p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@PostsAction
-InvokedEvent</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@PostsAction<br> InvokedEvent</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant_Action_domainEvent"><code>@Action#domainEvent()</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Action_domainEvent"><code>@Action#domainEvent()</code></a></p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@PostsCollection
-AddedToEvent</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@PostsCollection<br> AddedToEvent</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant_Collection_domainEvent"><code>@Collection#domainEvent()</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Collection_domainEvent"><code>@Collection#domainEvent()</code></a></p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@PostsCollection
-RemovedFromEvent</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@PostsCollection<br> RemovedFromEvent</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<TRUNCATED>
[09/39] isis-site git commit: ISIS-1810: updates docs for 2.0.0-M1
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/274edd1d/content/versions/SNAPSHOT/guides/rgsvc/rgsvc.pdf
----------------------------------------------------------------------
diff --git a/content/versions/SNAPSHOT/guides/rgsvc/rgsvc.pdf b/content/versions/SNAPSHOT/guides/rgsvc/rgsvc.pdf
index 738ef32..8ff195c 100644
--- a/content/versions/SNAPSHOT/guides/rgsvc/rgsvc.pdf
+++ b/content/versions/SNAPSHOT/guides/rgsvc/rgsvc.pdf
@@ -4,16 +4,16 @@
<< /Title (Domain Services)
/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:20180812182515+01'00')
-/ModDate (D:20180812182515+01'00')
+/CreationDate (D:20180814003851+02'00')
+/ModDate (D:20180814003851+02'00')
>>
endobj
2 0 obj
<< /Type /Catalog
/Pages 3 0 R
/Names 18 0 R
-/Outlines 1935 0 R
-/PageLabels 2022 0 R
+/Outlines 1875 0 R
+/PageLabels 1961 0 R
/PageMode /UseOutlines
/OpenAction [7 0 R /FitH 842.89]
/ViewerPreferences << /DisplayDocTitle true
@@ -22,8 +22,8 @@ endobj
endobj
3 0 obj
<< /Type /Pages
-/Count 156
-/Kids [7 0 R 10 0 R 12 0 R 14 0 R 16 0 R 38 0 R 50 0 R 62 0 R 71 0 R 77 0 R 105 0 R 108 0 R 143 0 R 157 0 R 164 0 R 181 0 R 189 0 R 191 0 R 214 0 R 249 0 R 280 0 R 298 0 R 309 0 R 320 0 R 329 0 R 334 0 R 341 0 R 344 0 R 350 0 R 355 0 R 368 0 R 384 0 R 396 0 R 411 0 R 418 0 R 430 0 R 446 0 R 454 0 R 465 0 R 472 0 R 480 0 R 493 0 R 507 0 R 516 0 R 523 0 R 556 0 R 603 0 R 612 0 R 619 0 R 627 0 R 640 0 R 654 0 R 663 0 R 665 0 R 667 0 R 675 0 R 689 0 R 691 0 R 702 0 R 709 0 R 725 0 R 735 0 R 740 0 R 753 0 R 768 0 R 775 0 R 783 0 R 790 0 R 794 0 R 803 0 R 809 0 R 823 0 R 826 0 R 849 0 R 859 0 R 875 0 R 890 0 R 905 0 R 915 0 R 943 0 R 969 0 R 974 0 R 979 0 R 986 0 R 1006 0 R 1015 0 R 1032 0 R 1047 0 R 1050 0 R 1053 0 R 1057 0 R 1063 0 R 1076 0 R 1084 0 R 1096 0 R 1104 0 R 1112 0 R 1119 0 R 1150 0 R 1159 0 R 1164 0 R 1173 0 R 1179 0 R 1186 0 R 1192 0 R 1199 0 R 1212 0 R 1221 0 R 1225 0 R 1229 0 R 1231 0 R 1235 0 R 1243 0 R 1271 0 R 1287 0 R 1294 0 R 1306 0 R 1321 0 R 1328 0 R 1337 0 R 1352
0 R 1361 0 R 1402 0 R 1412 0 R 1421 0 R 1431 0 R 1439 0 R 1450 0 R 1457 0 R 1487 0 R 1494 0 R 1505 0 R 1510 0 R 1517 0 R 1521 0 R 1527 0 R 1536 0 R 1544 0 R 1549 0 R 1557 0 R 1560 0 R 1566 0 R 1569 0 R 1573 0 R 1578 0 R 1582 0 R 1602 0 R 1608 0 R 1617 0 R 1632 0 R 1638 0 R 1650 0 R 1661 0 R 1666 0 R 1672 0 R 1689 0 R]
+/Count 154
+/Kids [7 0 R 10 0 R 12 0 R 14 0 R 16 0 R 38 0 R 50 0 R 65 0 R 74 0 R 80 0 R 108 0 R 111 0 R 146 0 R 160 0 R 167 0 R 184 0 R 192 0 R 194 0 R 217 0 R 252 0 R 283 0 R 301 0 R 312 0 R 323 0 R 332 0 R 337 0 R 344 0 R 347 0 R 353 0 R 358 0 R 370 0 R 385 0 R 398 0 R 413 0 R 421 0 R 431 0 R 447 0 R 456 0 R 468 0 R 475 0 R 483 0 R 496 0 R 510 0 R 519 0 R 526 0 R 559 0 R 597 0 R 606 0 R 613 0 R 621 0 R 634 0 R 648 0 R 657 0 R 659 0 R 661 0 R 669 0 R 681 0 R 683 0 R 694 0 R 701 0 R 717 0 R 727 0 R 732 0 R 745 0 R 760 0 R 767 0 R 775 0 R 782 0 R 786 0 R 795 0 R 801 0 R 815 0 R 818 0 R 841 0 R 851 0 R 867 0 R 882 0 R 897 0 R 907 0 R 939 0 R 949 0 R 955 0 R 960 0 R 970 0 R 988 0 R 999 0 R 1002 0 R 1005 0 R 1009 0 R 1015 0 R 1027 0 R 1035 0 R 1047 0 R 1055 0 R 1061 0 R 1068 0 R 1098 0 R 1107 0 R 1113 0 R 1122 0 R 1128 0 R 1135 0 R 1141 0 R 1148 0 R 1162 0 R 1171 0 R 1175 0 R 1179 0 R 1181 0 R 1185 0 R 1193 0 R 1218 0 R 1234 0 R 1241 0 R 1253 0 R 1268 0 R 1274 0 R 1283 0 R 1299 0 R 1308 0 R 1349 0
R 1359 0 R 1368 0 R 1377 0 R 1386 0 R 1397 0 R 1404 0 R 1431 0 R 1438 0 R 1449 0 R 1454 0 R 1461 0 R 1465 0 R 1471 0 R 1480 0 R 1488 0 R 1493 0 R 1500 0 R 1503 0 R 1509 0 R 1512 0 R 1516 0 R 1521 0 R 1525 0 R 1545 0 R 1550 0 R 1561 0 R 1574 0 R 1580 0 R 1592 0 R 1604 0 R 1609 0 R 1615 0 R 1632 0 R]
>>
endobj
4 0 obj
@@ -80,11 +80,11 @@ endobj
<< /Type /Font
/BaseFont /AAAACH+NotoSerif
/Subtype /TrueType
-/FontDescriptor 2024 0 R
+/FontDescriptor 1963 0 R
/FirstChar 32
/LastChar 255
-/Widths 2026 0 R
-/ToUnicode 2025 0 R
+/Widths 1965 0 R
+/ToUnicode 1964 0 R
>>
endobj
9 0 obj
@@ -1948,11 +1948,11 @@ endobj
/F3.0 43 0 R
>>
>>
-/Annots [1696 0 R 1697 0 R 1698 0 R 1699 0 R 1700 0 R 1701 0 R 1702 0 R 1703 0 R 1704 0 R 1705 0 R 1706 0 R 1707 0 R 1708 0 R 1709 0 R 1710 0 R 1711 0 R 1712 0 R 1713 0 R 1714 0 R 1715 0 R 1716 0 R 1717 0 R 1718 0 R 1719 0 R 1720 0 R 1721 0 R 1722 0 R 1723 0 R 1724 0 R 1725 0 R 1726 0 R 1727 0 R 1728 0 R 1729 0 R 1730 0 R 1731 0 R 1732 0 R 1733 0 R 1734 0 R 1735 0 R 1736 0 R 1737 0 R 1738 0 R 1739 0 R 1740 0 R 1741 0 R 1742 0 R 1743 0 R 1744 0 R 1745 0 R 1746 0 R 1747 0 R 1748 0 R 1749 0 R 1750 0 R 1751 0 R 1752 0 R 1753 0 R 1754 0 R 1755 0 R 1756 0 R 1757 0 R 1758 0 R 1759 0 R 1760 0 R 1761 0 R 1762 0 R 1763 0 R 1764 0 R 1765 0 R 1766 0 R 1767 0 R 1768 0 R 1769 0 R 1770 0 R 1771 0 R 1772 0 R 1773 0 R 1774 0 R 1775 0 R 1776 0 R 1777 0 R 1778 0 R 1779 0 R 1780 0 R 1781 0 R 1782 0 R 1783 0 R 1784 0 R 1785 0 R 1786 0 R 1787 0 R 1788 0 R 1789 0 R 1790 0 R 1791 0 R 1792 0 R 1793 0 R 1794 0 R 1795 0 R 1796 0 R 1797 0 R 1798 0 R 1799 0 R]
+/Annots [1639 0 R 1640 0 R 1641 0 R 1642 0 R 1643 0 R 1644 0 R 1645 0 R 1646 0 R 1647 0 R 1648 0 R 1649 0 R 1650 0 R 1651 0 R 1652 0 R 1653 0 R 1654 0 R 1655 0 R 1656 0 R 1657 0 R 1658 0 R 1659 0 R 1660 0 R 1661 0 R 1662 0 R 1663 0 R 1664 0 R 1665 0 R 1666 0 R 1667 0 R 1668 0 R 1669 0 R 1670 0 R 1671 0 R 1672 0 R 1673 0 R 1674 0 R 1675 0 R 1676 0 R 1677 0 R 1678 0 R 1679 0 R 1680 0 R 1681 0 R 1682 0 R 1683 0 R 1684 0 R 1685 0 R 1686 0 R 1687 0 R 1688 0 R 1689 0 R 1690 0 R 1691 0 R 1692 0 R 1693 0 R 1694 0 R 1695 0 R 1696 0 R 1697 0 R 1698 0 R 1699 0 R 1700 0 R 1701 0 R 1702 0 R 1703 0 R 1704 0 R 1705 0 R 1706 0 R 1707 0 R 1708 0 R 1709 0 R 1710 0 R 1711 0 R 1712 0 R 1713 0 R 1714 0 R 1715 0 R 1716 0 R 1717 0 R 1718 0 R 1719 0 R 1720 0 R 1721 0 R 1722 0 R 1723 0 R 1724 0 R 1725 0 R 1726 0 R 1727 0 R 1728 0 R 1729 0 R 1730 0 R 1731 0 R 1732 0 R 1733 0 R 1734 0 R 1735 0 R 1736 0 R 1737 0 R 1738 0 R 1739 0 R 1740 0 R 1741 0 R 1742 0 R]
>>
endobj
11 0 obj
-<< /Length 39940
+<< /Length 39962
>>
stream
q
@@ -2514,7 +2514,7 @@ ET
BT
79.9485 591.3959999999997 Td
/F3.0 10.5 Tf
-<446f6d61696e4f626a656374436f6e7461696e6572> Tj
+<4576656e7442757353657276696365> Tj
ET
0.000 0.000 0.000 SCN
@@ -2523,9 +2523,9 @@ ET
0.200 0.200 0.200 SCN
BT
-191.89324999999997 591.3959999999997 Td
+159.82624999999996 591.3959999999997 Td
/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -2565,7 +2565,7 @@ ET
BT
79.9485 572.9159999999997 Td
/F3.0 10.5 Tf
-<4576656e7442757353657276696365> Tj
+<466163746f727953657276696365> Tj
ET
0.000 0.000 0.000 SCN
@@ -2574,9 +2574,9 @@ ET
0.200 0.200 0.200 SCN
BT
-159.82624999999996 572.9159999999997 Td
+154.48174999999992 572.9159999999997 Td
/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -2594,7 +2594,7 @@ ET
BT
535.3009999999999 572.9159999999997 Td
/F1.0 10.5 Tf
-<3831> Tj
+<3837> Tj
ET
0.000 0.000 0.000 SCN
@@ -2616,7 +2616,7 @@ ET
BT
79.9485 554.4359999999997 Td
/F3.0 10.5 Tf
-<466163746f727953657276696365> Tj
+<53637261746368706164> Tj
ET
0.000 0.000 0.000 SCN
@@ -2625,9 +2625,9 @@ ET
0.200 0.200 0.200 SCN
BT
-154.48174999999992 554.4359999999997 Td
+138.44824999999992 554.4359999999997 Td
/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -2645,7 +2645,7 @@ ET
BT
535.3009999999999 554.4359999999997 Td
/F1.0 10.5 Tf
-<3839> Tj
+<3838> Tj
ET
0.000 0.000 0.000 SCN
@@ -2667,7 +2667,7 @@ ET
BT
79.9485 535.9559999999997 Td
/F3.0 10.5 Tf
-<53637261746368706164> Tj
+<5573657253657276696365> Tj
ET
0.000 0.000 0.000 SCN
@@ -2705,20 +2705,9 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 517.4759999999997 Td
+48.24 517.4759999999997 Td
/F1.0 10.5 Tf
-<372e372e20> Tj
-ET
-
-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
-
-BT
-79.9485 517.4759999999997 Td
-/F3.0 10.5 Tf
-<5573657253657276696365> Tj
+[<382e20496e74656772> 20.01953125 <6174696f6e20415049>] TJ
ET
0.000 0.000 0.000 SCN
@@ -2756,47 +2745,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24 498.9959999999997 Td
-/F1.0 10.5 Tf
-[<382e20496e74656772> 20.01953125 <6174696f6e20415049>] TJ
-ET
-
-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
-
-BT
-138.44824999999992 498.9959999999997 Td
-/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-
-BT
-533.94125 498.9959999999997 Td
-/F1.0 5.25 Tf
-<ca> Tj
-ET
-
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-BT
-535.3009999999999 498.9959999999997 Td
-/F1.0 10.5 Tf
-<3934> Tj
-ET
-
-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
-
-BT
-60.24 480.5159999999997 Td
+60.24 498.9959999999997 Td
/F1.0 10.5 Tf
<382e312e20> Tj
ET
@@ -2807,7 +2756,7 @@ ET
0.694 0.129 0.275 SCN
BT
-79.9485 480.5159999999997 Td
+79.9485 498.9959999999997 Td
/F3.0 10.5 Tf
<426f6f6b6d61726b53657276696365> Tj
ET
@@ -2818,7 +2767,7 @@ ET
0.200 0.200 0.200 SCN
BT
-159.82624999999996 480.5159999999997 Td
+159.82624999999996 498.9959999999997 Td
/F1.0 10.5 Tf
<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
@@ -2827,7 +2776,7 @@ ET
0.000 0.000 0.000 scn
BT
-533.94125 480.5159999999997 Td
+533.94125 498.9959999999997 Td
/F1.0 5.25 Tf
<ca> Tj
ET
@@ -2836,9 +2785,9 @@ ET
0.200 0.200 0.200 SCN
BT
-535.3009999999999 480.5159999999997 Td
+535.3009999999999 498.9959999999997 Td
/F1.0 10.5 Tf
-<3935> Tj
+<3933> Tj
ET
0.000 0.000 0.000 SCN
@@ -2847,7 +2796,7 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 462.03599999999966 Td
+60.24 480.5159999999997 Td
/F1.0 10.5 Tf
<382e322e20> Tj
ET
@@ -2858,7 +2807,7 @@ ET
0.694 0.129 0.275 SCN
BT
-79.9485 462.03599999999966 Td
+79.9485 480.5159999999997 Td
/F3.0 10.5 Tf
<456d61696c53657276696365> Tj
ET
@@ -2869,7 +2818,7 @@ ET
0.200 0.200 0.200 SCN
BT
-143.79274999999996 462.03599999999966 Td
+143.79274999999996 480.5159999999997 Td
/F1.0 10.5 Tf
<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
@@ -2878,7 +2827,7 @@ ET
0.000 0.000 0.000 scn
BT
-533.94125 462.03599999999966 Td
+533.94125 480.5159999999997 Td
/F1.0 5.25 Tf
<ca> Tj
ET
@@ -2887,9 +2836,9 @@ ET
0.200 0.200 0.200 SCN
BT
-535.3009999999999 462.03599999999966 Td
+535.3009999999999 480.5159999999997 Td
/F1.0 10.5 Tf
-<3937> Tj
+<3935> Tj
ET
0.000 0.000 0.000 SCN
@@ -2898,7 +2847,7 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 443.55599999999964 Td
+60.24 462.03599999999966 Td
/F1.0 10.5 Tf
<382e332e20> Tj
ET
@@ -2909,7 +2858,7 @@ ET
0.694 0.129 0.275 SCN
BT
-79.9485 443.55599999999964 Td
+79.9485 462.03599999999966 Td
/F3.0 10.5 Tf
<4a61786253657276696365> Tj
ET
@@ -2920,16 +2869,16 @@ ET
0.200 0.200 0.200 SCN
BT
-143.26774999999992 443.55599999999964 Td
+138.44824999999992 462.03599999999966 Td
/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
BT
-528.07175 443.55599999999964 Td
+533.94125 462.03599999999966 Td
/F1.0 5.25 Tf
<ca> Tj
ET
@@ -2938,9 +2887,9 @@ ET
0.200 0.200 0.200 SCN
BT
-529.4314999999999 443.55599999999964 Td
+535.3009999999999 462.03599999999966 Td
/F1.0 10.5 Tf
-<313031> Tj
+<3939> Tj
ET
0.000 0.000 0.000 SCN
@@ -2949,7 +2898,7 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 425.0759999999996 Td
+60.24 443.55599999999964 Td
/F1.0 10.5 Tf
<382e342e20> Tj
ET
@@ -2960,7 +2909,7 @@ ET
0.694 0.129 0.275 SCN
BT
-79.9485 425.0759999999996 Td
+79.9485 443.55599999999964 Td
/F3.0 10.5 Tf
<4d656d656e746f53657276696365> Tj
ET
@@ -2971,7 +2920,7 @@ ET
0.200 0.200 0.200 SCN
BT
-153.4485 425.0759999999996 Td
+153.4485 443.55599999999964 Td
/F1.0 10.5 Tf
<20286465707265636174656429> Tj
ET
@@ -2982,7 +2931,7 @@ ET
0.200 0.200 0.200 SCN
BT
-223.43524999999994 425.0759999999996 Td
+223.43524999999994 443.55599999999964 Td
/F1.0 10.5 Tf
<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
@@ -2991,7 +2940,7 @@ ET
0.000 0.000 0.000 scn
BT
-528.07175 425.0759999999996 Td
+528.07175 443.55599999999964 Td
/F1.0 5.25 Tf
<ca> Tj
ET
@@ -3000,9 +2949,9 @@ ET
0.200 0.200 0.200 SCN
BT
-529.4314999999999 425.0759999999996 Td
+529.4314999999999 443.55599999999964 Td
/F1.0 10.5 Tf
-<313032> Tj
+<313030> Tj
ET
0.000 0.000 0.000 SCN
@@ -3011,7 +2960,7 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 406.5959999999996 Td
+60.24 425.0759999999996 Td
/F1.0 10.5 Tf
<382e352e20> Tj
ET
@@ -3022,7 +2971,7 @@ ET
0.694 0.129 0.275 SCN
BT
-79.9485 406.5959999999996 Td
+79.9485 425.0759999999996 Td
/F3.0 10.5 Tf
<586d6c536e617073686f7453657276696365> Tj
ET
@@ -3033,7 +2982,7 @@ ET
0.200 0.200 0.200 SCN
BT
-175.33474999999993 406.5959999999996 Td
+175.33474999999993 425.0759999999996 Td
/F1.0 10.5 Tf
<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
@@ -3042,7 +2991,7 @@ ET
0.000 0.000 0.000 scn
BT
-528.07175 406.5959999999996 Td
+528.07175 425.0759999999996 Td
/F1.0 5.25 Tf
<ca> Tj
ET
@@ -3051,9 +3000,9 @@ ET
0.200 0.200 0.200 SCN
BT
-529.4314999999999 406.5959999999996 Td
+529.4314999999999 425.0759999999996 Td
/F1.0 10.5 Tf
-<313034> Tj
+<313032> Tj
ET
0.000 0.000 0.000 SCN
@@ -3062,7 +3011,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24 388.1159999999996 Td
+48.24 406.5959999999996 Td
/F1.0 10.5 Tf
<392e204d6574616461746120415049> Tj
ET
@@ -3073,7 +3022,7 @@ ET
0.200 0.200 0.200 SCN
BT
-132.5787499999999 388.1159999999996 Td
+132.5787499999999 406.5959999999996 Td
/F1.0 10.5 Tf
<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
@@ -3082,7 +3031,7 @@ ET
0.000 0.000 0.000 scn
BT
-528.07175 388.1159999999996 Td
+528.07175 406.5959999999996 Td
/F1.0 5.25 Tf
<ca> Tj
ET
@@ -3091,9 +3040,9 @@ ET
0.200 0.200 0.200 SCN
BT
-529.4314999999999 388.1159999999996 Td
+529.4314999999999 406.5959999999996 Td
/F1.0 10.5 Tf
-<313039> Tj
+<313037> Tj
ET
0.000 0.000 0.000 SCN
@@ -3102,7 +3051,7 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 369.63599999999957 Td
+60.24 388.1159999999996 Td
/F1.0 10.5 Tf
<392e312e20> Tj
ET
@@ -3113,7 +3062,7 @@ ET
0.694 0.129 0.275 SCN
BT
-79.9485 369.63599999999957 Td
+79.9485 388.1159999999996 Td
/F3.0 10.5 Tf
<4170706c69636174696f6e466561747572655265706f7369746f7279> Tj
ET
@@ -3124,7 +3073,7 @@ ET
0.200 0.200 0.200 SCN
BT
-228.77974999999992 369.63599999999957 Td
+228.77974999999992 388.1159999999996 Td
/F1.0 10.5 Tf
<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
@@ -3133,7 +3082,7 @@ ET
0.000 0.000 0.000 scn
BT
-528.07175 369.63599999999957 Td
+528.07175 388.1159999999996 Td
/F1.0 5.25 Tf
<ca> Tj
ET
@@ -3142,9 +3091,9 @@ ET
0.200 0.200 0.200 SCN
BT
-529.4314999999999 369.63599999999957 Td
+529.4314999999999 388.1159999999996 Td
/F1.0 10.5 Tf
-<313130> Tj
+<313038> Tj
ET
0.000 0.000 0.000 SCN
@@ -3153,7 +3102,7 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 351.15599999999955 Td
+60.24 369.63599999999957 Td
/F1.0 10.5 Tf
<392e322e20> Tj
ET
@@ -3164,7 +3113,7 @@ ET
0.694 0.129 0.275 SCN
BT
-79.9485 351.15599999999955 Td
+79.9485 369.63599999999957 Td
/F3.0 10.5 Tf
<4c61796f757453657276696365> Tj
ET
@@ -3175,7 +3124,7 @@ ET
0.200 0.200 0.200 SCN
BT
-153.95674999999994 351.15599999999955 Td
+153.95674999999994 369.63599999999957 Td
/F1.0 10.5 Tf
<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
@@ -3184,7 +3133,7 @@ ET
0.000 0.000 0.000 scn
BT
-528.07175 351.15599999999955 Td
+528.07175 369.63599999999957 Td
/F1.0 5.25 Tf
<ca> Tj
ET
@@ -3193,9 +3142,9 @@ ET
0.200 0.200 0.200 SCN
BT
-529.4314999999999 351.15599999999955 Td
+529.4314999999999 369.63599999999957 Td
/F1.0 10.5 Tf
-<313132> Tj
+<313130> Tj
ET
0.000 0.000 0.000 SCN
@@ -3204,7 +3153,7 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 332.67599999999953 Td
+60.24 351.15599999999955 Td
/F1.0 10.5 Tf
<392e332e20> Tj
ET
@@ -3215,7 +3164,7 @@ ET
0.694 0.129 0.275 SCN
BT
-79.9485 332.67599999999953 Td
+79.9485 351.15599999999955 Td
/F3.0 10.5 Tf
<4d6574614d6f64656c53657276696365> Tj
ET
@@ -3226,7 +3175,7 @@ ET
0.200 0.200 0.200 SCN
BT
-164.6457499999999 332.67599999999953 Td
+164.6457499999999 351.15599999999955 Td
/F1.0 10.5 Tf
<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
@@ -3235,7 +3184,7 @@ ET
0.000 0.000 0.000 scn
BT
-528.07175 332.67599999999953 Td
+528.07175 351.15599999999955 Td
/F1.0 5.25 Tf
<ca> Tj
ET
@@ -3244,9 +3193,9 @@ ET
0.200 0.200 0.200 SCN
BT
-529.4314999999999 332.67599999999953 Td
+529.4314999999999 351.15599999999955 Td
/F1.0 10.5 Tf
-<313133> Tj
+<313131> Tj
ET
0.000 0.000 0.000 SCN
@@ -3255,7 +3204,7 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 314.1959999999995 Td
+60.24 332.67599999999953 Td
/F1.0 10.5 Tf
<392e342e20> Tj
ET
@@ -3266,7 +3215,7 @@ ET
0.694 0.129 0.275 SCN
BT
-79.9485 314.1959999999995 Td
+79.9485 332.67599999999953 Td
/F3.0 10.5 Tf
<536572766963655265676973747279> Tj
ET
@@ -3277,7 +3226,7 @@ ET
0.200 0.200 0.200 SCN
BT
-164.6457499999999 314.1959999999995 Td
+164.6457499999999 332.67599999999953 Td
/F1.0 10.5 Tf
<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
@@ -3286,7 +3235,7 @@ ET
0.000 0.000 0.000 scn
BT
-528.07175 314.1959999999995 Td
+528.07175 332.67599999999953 Td
/F1.0 5.25 Tf
<ca> Tj
ET
@@ -3295,9 +3244,9 @@ ET
0.200 0.200 0.200 SCN
BT
-529.4314999999999 314.1959999999995 Td
+529.4314999999999 332.67599999999953 Td
/F1.0 10.5 Tf
-<313135> Tj
+<313133> Tj
ET
0.000 0.000 0.000 SCN
@@ -3306,7 +3255,7 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 295.7159999999995 Td
+60.24 314.1959999999995 Td
/F1.0 10.5 Tf
<392e352e20> Tj
ET
@@ -3317,7 +3266,7 @@ ET
0.694 0.129 0.275 SCN
BT
-79.9485 295.7159999999995 Td
+79.9485 314.1959999999995 Td
/F3.0 10.5 Tf
<5377616767657253657276696365> Tj
ET
@@ -3328,7 +3277,7 @@ ET
0.200 0.200 0.200 SCN
BT
-159.30124999999992 295.7159999999995 Td
+159.30124999999992 314.1959999999995 Td
/F1.0 10.5 Tf
<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
@@ -3337,7 +3286,7 @@ ET
0.000 0.000 0.000 scn
BT
-528.07175 295.7159999999995 Td
+528.07175 314.1959999999995 Td
/F1.0 5.25 Tf
<ca> Tj
ET
@@ -3346,9 +3295,9 @@ ET
0.200 0.200 0.200 SCN
BT
-529.4314999999999 295.7159999999995 Td
+529.4314999999999 314.1959999999995 Td
/F1.0 10.5 Tf
-<313136> Tj
+<313134> Tj
ET
0.000 0.000 0.000 SCN
@@ -3357,7 +3306,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24 277.2359999999995 Td
+48.24 295.7159999999995 Td
/F1.0 10.5 Tf
[<31302e2054> 29.78515625 <657374696e67>] TJ
ET
@@ -3368,7 +3317,7 @@ ET
0.200 0.200 0.200 SCN
BT
-105.85624999999993 277.2359999999995 Td
+105.85624999999993 295.7159999999995 Td
/F1.0 10.5 Tf
<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
@@ -3377,7 +3326,7 @@ ET
0.000 0.000 0.000 scn
BT
-528.07175 277.2359999999995 Td
+528.07175 295.7159999999995 Td
/F1.0 5.25 Tf
<ca> Tj
ET
@@ -3386,9 +3335,9 @@ ET
0.200 0.200 0.200 SCN
BT
-529.4314999999999 277.2359999999995 Td
+529.4314999999999 295.7159999999995 Td
/F1.0 10.5 Tf
-<313138> Tj
+<313136> Tj
ET
0.000 0.000 0.000 SCN
@@ -3397,7 +3346,7 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 258.75599999999946 Td
+60.24 277.2359999999995 Td
/F1.0 10.5 Tf
<31302e312e20> Tj
ET
@@ -3408,7 +3357,7 @@ ET
0.694 0.129 0.275 SCN
BT
-85.81800000000001 258.75599999999946 Td
+85.81800000000001 277.2359999999995 Td
/F3.0 10.5 Tf
<457865637574696f6e506172616d657465727353657276696365> Tj
ET
@@ -3419,7 +3368,7 @@ ET
0.200 0.200 0.200 SCN
BT
-223.43524999999994 258.75599999999946 Td
+223.43524999999994 277.2359999999995 Td
/F1.0 10.5 Tf
<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
@@ -3428,7 +3377,7 @@ ET
0.000 0.000 0.000 scn
BT
-528.07175 258.75599999999946 Td
+528.07175 277.2359999999995 Td
/F1.0 5.25 Tf
<ca> Tj
ET
@@ -3437,9 +3386,9 @@ ET
0.200 0.200 0.200 SCN
BT
-529.4314999999999 258.75599999999946 Td
+529.4314999999999 277.2359999999995 Td
/F1.0 10.5 Tf
-<313139> Tj
+<313137> Tj
ET
0.000 0.000 0.000 SCN
@@ -3448,7 +3397,7 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 240.27599999999947 Td
+60.24 258.75599999999946 Td
/F1.0 10.5 Tf
<31302e322e20> Tj
ET
@@ -3459,7 +3408,7 @@ ET
0.694 0.129 0.275 SCN
BT
-85.81800000000001 240.27599999999947 Td
+85.81800000000001 258.75599999999946 Td
/F3.0 10.5 Tf
<4669787475726553637269707473> Tj
ET
@@ -3470,7 +3419,7 @@ ET
0.200 0.200 0.200 SCN
BT
-164.6457499999999 240.27599999999947 Td
+164.6457499999999 258.75599999999946 Td
/F1.0 10.5 Tf
<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
@@ -3479,7 +3428,7 @@ ET
0.000 0.000 0.000 scn
BT
-528.07175 240.27599999999947 Td
+528.07175 258.75599999999946 Td
/F1.0 5.25 Tf
<ca> Tj
ET
@@ -3488,9 +3437,9 @@ ET
0.200 0.200 0.200 SCN
BT
-529.4314999999999 240.27599999999947 Td
+529.4314999999999 258.75599999999946 Td
/F1.0 10.5 Tf
-<313139> Tj
+<313137> Tj
ET
0.000 0.000 0.000 SCN
@@ -3499,7 +3448,7 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 221.79599999999948 Td
+60.24 240.27599999999947 Td
/F1.0 10.5 Tf
<31302e332e20> Tj
ET
@@ -3510,7 +3459,7 @@ ET
0.694 0.129 0.275 SCN
BT
-85.81800000000001 221.79599999999948 Td
+85.81800000000001 240.27599999999947 Td
/F3.0 10.5 Tf
<466978747572655363726970747353706563> Tj
ET
@@ -3521,7 +3470,7 @@ ET
0.694 0.129 0.275 SCN
BT
-180.318 221.79599999999948 Td
+180.318 240.27599999999947 Td
/F4.0 10.5 Tf
<d5> Tj
ET
@@ -3532,7 +3481,7 @@ ET
0.694 0.129 0.275 SCN
BT
-183.342 221.79599999999948 Td
+183.342 240.27599999999947 Td
/F3.0 10.5 Tf
<6e50726f7669646572> Tj
ET
@@ -3543,7 +3492,7 @@ ET
0.200 0.200 0.200 SCN
BT
-239.46874999999994 221.79599999999948 Td
+239.46874999999994 240.27599999999947 Td
/F1.0 10.5 Tf
<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
@@ -3552,7 +3501,7 @@ ET
0.000 0.000 0.000 scn
BT
-528.07175 221.79599999999948 Td
+528.07175 240.27599999999947 Td
/F1.0 5.25 Tf
<ca> Tj
ET
@@ -3561,9 +3510,9 @@ ET
0.200 0.200 0.200 SCN
BT
-529.4314999999999 221.79599999999948 Td
+529.4314999999999 240.27599999999947 Td
/F1.0 10.5 Tf
-<313230> Tj
+<313138> Tj
ET
0.000 0.000 0.000 SCN
@@ -3572,7 +3521,7 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 203.3159999999995 Td
+60.24 221.79599999999948 Td
/F1.0 10.5 Tf
<31302e342e20> Tj
ET
@@ -3583,7 +3532,7 @@ ET
0.694 0.129 0.275 SCN
BT
-85.81800000000001 203.3159999999995 Td
+85.81800000000001 221.79599999999948 Td
/F3.0 10.5 Tf
<5375646f53657276696365> Tj
ET
@@ -3594,7 +3543,7 @@ ET
0.200 0.200 0.200 SCN
BT
-148.6122499999999 203.3159999999995 Td
+148.6122499999999 221.79599999999948 Td
/F1.0 10.5 Tf
<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
@@ -3603,7 +3552,7 @@ ET
0.000 0.000 0.000 scn
BT
-528.07175 203.3159999999995 Td
+528.07175 221.79599999999948 Td
/F1.0 5.25 Tf
<ca> Tj
ET
@@ -3612,9 +3561,9 @@ ET
0.200 0.200 0.200 SCN
BT
-529.4314999999999 203.3159999999995 Td
+529.4314999999999 221.79599999999948 Td
/F1.0 10.5 Tf
-<313231> Tj
+<313139> Tj
ET
0.000 0.000 0.000 SCN
@@ -3623,7 +3572,7 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 184.8359999999995 Td
+60.24 203.3159999999995 Td
/F1.0 10.5 Tf
<31302e352e20> Tj
ET
@@ -3634,7 +3583,7 @@ ET
0.694 0.129 0.275 SCN
BT
-85.81800000000001 184.8359999999995 Td
+85.81800000000001 203.3159999999995 Td
/F3.0 10.5 Tf
<5377697463685573657253657276696365> Tj
ET
@@ -3645,7 +3594,7 @@ ET
0.200 0.200 0.200 SCN
BT
-175.068 184.8359999999995 Td
+175.068 203.3159999999995 Td
/F1.0 10.5 Tf
<20286465707265636174656429> Tj
ET
@@ -3656,7 +3605,7 @@ ET
0.200 0.200 0.200 SCN
BT
-244.81324999999993 184.8359999999995 Td
+244.81324999999993 203.3159999999995 Td
/F1.0 10.5 Tf
<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
@@ -3665,7 +3614,7 @@ ET
0.000 0.000 0.000 scn
BT
-528.07175 184.8359999999995 Td
+528.07175 203.3159999999995 Td
/F1.0 5.25 Tf
<ca> Tj
ET
@@ -3674,9 +3623,9 @@ ET
0.200 0.200 0.200 SCN
BT
-529.4314999999999 184.8359999999995 Td
+529.4314999999999 203.3159999999995 Td
/F1.0 10.5 Tf
-<313234> Tj
+<313232> Tj
ET
0.000 0.000 0.000 SCN
@@ -3685,7 +3634,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24 166.3559999999995 Td
+48.24 184.8359999999995 Td
/F1.0 10.5 Tf
[<31312e2050657273697374656e6365204c61> 20.01953125 <79657220415049>] TJ
ET
@@ -3696,7 +3645,7 @@ ET
0.200 0.200 0.200 SCN
BT
-175.33474999999993 166.3559999999995 Td
+175.33474999999993 184.8359999999995 Td
/F1.0 10.5 Tf
<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
@@ -3705,7 +3654,7 @@ ET
0.000 0.000 0.000 scn
BT
-528.07175 166.3559999999995 Td
+528.07175 184.8359999999995 Td
/F1.0 5.25 Tf
<ca> Tj
ET
@@ -3714,9 +3663,9 @@ ET
0.200 0.200 0.200 SCN
BT
-529.4314999999999 166.3559999999995 Td
+529.4314999999999 184.8359999999995 Td
/F1.0 10.5 Tf
-<313235> Tj
+<313233> Tj
ET
0.000 0.000 0.000 SCN
@@ -3725,7 +3674,7 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 147.87599999999952 Td
+60.24 166.3559999999995 Td
/F1.0 10.5 Tf
<31312e312e20> Tj
ET
@@ -3736,7 +3685,7 @@ ET
0.694 0.129 0.275 SCN
BT
-85.81800000000001 147.87599999999952 Td
+85.81800000000001 166.3559999999995 Td
/F3.0 10.5 Tf
<4873716c44624d616e616765724d656e75> Tj
ET
@@ -3747,7 +3696,7 @@ ET
0.200 0.200 0.200 SCN
BT
-180.6792499999999 147.87599999999952 Td
+180.6792499999999 166.3559999999995 Td
/F1.0 10.5 Tf
<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
@@ -3756,7 +3705,7 @@ ET
0.000 0.000 0.000 scn
BT
-528.07175 147.87599999999952 Td
+528.07175 166.3559999999995 Td
/F1.0 5.25 Tf
<ca> Tj
ET
@@ -3765,9 +3714,9 @@ ET
0.200 0.200 0.200 SCN
BT
-529.4314999999999 147.87599999999952 Td
+529.4314999999999 166.3559999999995 Td
/F1.0 10.5 Tf
-<313235> Tj
+<313233> Tj
ET
0.000 0.000 0.000 SCN
@@ -3776,7 +3725,7 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 129.39599999999953 Td
+60.24 147.87599999999952 Td
/F1.0 10.5 Tf
<31312e322e20> Tj
ET
@@ -3787,7 +3736,7 @@ ET
0.694 0.129 0.275 SCN
BT
-85.81800000000001 129.39599999999953 Td
+85.81800000000001 147.87599999999952 Td
/F3.0 10.5 Tf
<497369734a646f537570706f7274> Tj
ET
@@ -3798,7 +3747,7 @@ ET
0.200 0.200 0.200 SCN
BT
-164.6457499999999 129.39599999999953 Td
+164.6457499999999 147.87599999999952 Td
/F1.0 10.5 Tf
<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
@@ -3807,7 +3756,7 @@ ET
0.000 0.000 0.000 scn
BT
-528.07175 129.39599999999953 Td
+528.07175 147.87599999999952 Td
/F1.0 5.25 Tf
<ca> Tj
ET
@@ -3816,9 +3765,9 @@ ET
0.200 0.200 0.200 SCN
BT
-529.4314999999999 129.39599999999953 Td
+529.4314999999999 147.87599999999952 Td
/F1.0 10.5 Tf
-<313236> Tj
+<313234> Tj
ET
0.000 0.000 0.000 SCN
@@ -3827,7 +3776,7 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 110.91599999999954 Td
+60.24 129.39599999999953 Td
/F1.0 10.5 Tf
<31312e332e20> Tj
ET
@@ -3838,7 +3787,7 @@ ET
0.694 0.129 0.275 SCN
BT
-85.81800000000001 110.91599999999954 Td
+85.81800000000001 129.39599999999953 Td
/F3.0 10.5 Tf
<4d65747269637353657276696365> Tj
ET
@@ -3849,7 +3798,7 @@ ET
0.200 0.200 0.200 SCN
BT
-164.6457499999999 110.91599999999954 Td
+164.6457499999999 129.39599999999953 Td
/F1.0 10.5 Tf
<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
@@ -3858,7 +3807,7 @@ ET
0.000 0.000 0.000 scn
BT
-528.07175 110.91599999999954 Td
+528.07175 129.39599999999953 Td
/F1.0 5.25 Tf
<ca> Tj
ET
@@ -3867,9 +3816,9 @@ ET
0.200 0.200 0.200 SCN
BT
-529.4314999999999 110.91599999999954 Td
+529.4314999999999 129.39599999999953 Td
/F1.0 10.5 Tf
-<313331> Tj
+<313239> Tj
ET
0.000 0.000 0.000 SCN
@@ -3878,7 +3827,7 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 92.43599999999955 Td
+60.24 110.91599999999954 Td
/F1.0 10.5 Tf
<31312e342e20> Tj
ET
@@ -3889,7 +3838,7 @@ ET
0.694 0.129 0.275 SCN
BT
-85.81800000000001 92.43599999999955 Td
+85.81800000000001 110.91599999999954 Td
/F3.0 10.5 Tf
<5175657279526573756c74734361636865> Tj
ET
@@ -3900,7 +3849,7 @@ ET
0.200 0.200 0.200 SCN
BT
-180.6792499999999 92.43599999999955 Td
+180.6792499999999 110.91599999999954 Td
/F1.0 10.5 Tf
<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
@@ -3909,7 +3858,7 @@ ET
0.000 0.000 0.000 scn
BT
-528.07175 92.43599999999955 Td
+528.07175 110.91599999999954 Td
/F1.0 5.25 Tf
<ca> Tj
ET
@@ -3918,9 +3867,9 @@ ET
0.200 0.200 0.200 SCN
BT
-529.4314999999999 92.43599999999955 Td
+529.4314999999999 110.91599999999954 Td
/F1.0 10.5 Tf
-<313332> Tj
+<313330> Tj
ET
0.000 0.000 0.000 SCN
@@ -3929,7 +3878,7 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 73.95599999999956 Td
+60.24 92.43599999999955 Td
/F1.0 10.5 Tf
<31312e352e20> Tj
ET
@@ -3940,7 +3889,7 @@ ET
0.694 0.129 0.275 SCN
BT
-85.81800000000001 73.95599999999956 Td
+85.81800000000001 92.43599999999955 Td
/F3.0 10.5 Tf
<5265706f7369746f727953657276696365> Tj
ET
@@ -3951,7 +3900,7 @@ ET
0.200 0.200 0.200 SCN
BT
-180.6792499999999 73.95599999999956 Td
+180.6792499999999 92.43599999999955 Td
/F1.0 10.5 Tf
<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
@@ -3960,7 +3909,7 @@ ET
0.000 0.000 0.000 scn
BT
-528.07175 73.95599999999956 Td
+528.07175 92.43599999999955 Td
/F1.0 5.25 Tf
<ca> Tj
ET
@@ -3969,9 +3918,9 @@ ET
0.200 0.200 0.200 SCN
BT
-529.4314999999999 73.95599999999956 Td
+529.4314999999999 92.43599999999955 Td
/F1.0 10.5 Tf
-<313335> Tj
+<313333> Tj
ET
0.000 0.000 0.000 SCN
@@ -3980,7 +3929,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24 55.47599999999957 Td
+48.24 73.95599999999956 Td
/F1.0 10.5 Tf
[<31322e2050657273697374656e6365204c61> 20.01953125 <79657220535049>] TJ
ET
@@ -3991,7 +3940,7 @@ ET
0.200 0.200 0.200 SCN
BT
-175.33474999999993 55.47599999999957 Td
+175.33474999999993 73.95599999999956 Td
/F1.0 10.5 Tf
<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
@@ -4000,7 +3949,7 @@ ET
0.000 0.000 0.000 scn
BT
-528.07175 55.47599999999957 Td
+528.07175 73.95599999999956 Td
/F1.0 5.25 Tf
<ca> Tj
ET
@@ -4009,43 +3958,18 @@ ET
0.200 0.200 0.200 SCN
BT
-529.4314999999999 55.47599999999957 Td
+529.4314999999999 73.95599999999956 Td
/F1.0 10.5 Tf
-<313432> Tj
+<313430> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-Q
-
-endstream
-endobj
-12 0 obj
-<< /Type /Page
-/Parent 3 0 R
-/MediaBox [0 0 595.28 841.89]
-/Contents 11 0 R
-/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F1.0 8 0 R
-/F3.0 43 0 R
-/F4.0 59 0 R
->>
->>
-/Annots [1800 0 R 1801 0 R 1802 0 R 1803 0 R 1804 0 R 1805 0 R 1806 0 R 1807 0 R 1808 0 R 1809 0 R 1810 0 R 1811 0 R 1812 0 R 1813 0 R 1814 0 R 1815 0 R 1816 0 R 1817 0 R 1818 0 R 1819 0 R 1820 0 R 1821 0 R 1822 0 R 1823 0 R 1824 0 R 1825 0 R 1826 0 R 1827 0 R 1828 0 R 1829 0 R 1830 0 R 1831 0 R 1832 0 R 1833 0 R 1834 0 R 1835 0 R 1836 0 R 1837 0 R 1838 0 R 1839 0 R 1840 0 R 1841 0 R 1842 0 R 1843 0 R 1844 0 R 1845 0 R 1846 0 R 1847 0 R 1848 0 R 1849 0 R 1850 0 R 1851 0 R 1852 0 R 1853 0 R 1854 0 R 1855 0 R 1856 0 R 1857 0 R 1858 0 R 1859 0 R 1860 0 R 1861 0 R 1862 0 R 1863 0 R 1864 0 R 1865 0 R 1866 0 R 1867 0 R 1868 0 R 1869 0 R 1870 0 R 1871 0 R 1872 0 R 1873 0 R 1874 0 R 1875 0 R 1876 0 R 1877 0 R 1878 0 R 1879 0 R 1880 0 R 1881 0 R 1882 0 R 1883 0 R 1884 0 R 1885 0 R 1886 0 R 1887 0 R 1888 0 R 1889 0 R 1890 0 R 1891 0 R 1892 0 R 1893 0 R 1894 0 R 1895 0 R 1896 0 R 1897 0 R 1898 0 R 1899 0 R 1900 0 R 1901 0 R 1902 0 R 1903 0 R 1904 0 R 1905 0 R 1906 0 R 1907 0 R 1908 0 R 1909 0
R 1910 0 R 1911 0 R 1912 0 R 1913 0 R 1914 0 R 1915 0 R 1916 0 R 1917 0 R 1918 0 R 1919 0 R]
->>
-endobj
-13 0 obj
-<< /Length 4807
->>
-stream
-q
-/DeviceRGB cs
0.200 0.200 0.200 scn
-/DeviceRGB CS
0.200 0.200 0.200 SCN
BT
-60.24 794.6759999999999 Td
+60.24 55.47599999999957 Td
/F1.0 10.5 Tf
<31322e312e20> Tj
ET
@@ -4056,7 +3980,7 @@ ET
0.694 0.129 0.275 SCN
BT
-85.81800000000001 794.6759999999999 Td
+85.81800000000001 55.47599999999957 Td
/F3.0 10.5 Tf
<4175646974657253657276696365> Tj
ET
@@ -4067,7 +3991,7 @@ ET
0.200 0.200 0.200 SCN
BT
-164.6457499999999 794.6759999999999 Td
+164.6457499999999 55.47599999999957 Td
/F1.0 10.5 Tf
<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
@@ -4076,7 +4000,7 @@ ET
0.000 0.000 0.000 scn
BT
-528.07175 794.6759999999999 Td
+528.07175 55.47599999999957 Td
/F1.0 5.25 Tf
<ca> Tj
ET
@@ -4085,18 +4009,43 @@ ET
0.200 0.200 0.200 SCN
BT
-529.4314999999999 794.6759999999999 Td
+529.4314999999999 55.47599999999957 Td
/F1.0 10.5 Tf
-<313433> Tj
+<313431> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
+Q
+
+endstream
+endobj
+12 0 obj
+<< /Type /Page
+/Parent 3 0 R
+/MediaBox [0 0 595.28 841.89]
+/Contents 11 0 R
+/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
+/Font << /F1.0 8 0 R
+/F3.0 43 0 R
+/F4.0 57 0 R
+>>
+>>
+/Annots [1743 0 R 1744 0 R 1745 0 R 1746 0 R 1747 0 R 1748 0 R 1749 0 R 1750 0 R 1751 0 R 1752 0 R 1753 0 R 1754 0 R 1755 0 R 1756 0 R 1757 0 R 1758 0 R 1759 0 R 1760 0 R 1761 0 R 1762 0 R 1763 0 R 1764 0 R 1765 0 R 1766 0 R 1767 0 R 1768 0 R 1769 0 R 1770 0 R 1771 0 R 1772 0 R 1773 0 R 1774 0 R 1775 0 R 1776 0 R 1777 0 R 1778 0 R 1779 0 R 1780 0 R 1781 0 R 1782 0 R 1783 0 R 1784 0 R 1785 0 R 1786 0 R 1787 0 R 1788 0 R 1789 0 R 1790 0 R 1791 0 R 1792 0 R 1793 0 R 1794 0 R 1795 0 R 1796 0 R 1797 0 R 1798 0 R 1799 0 R 1800 0 R 1801 0 R 1802 0 R 1803 0 R 1804 0 R 1805 0 R 1806 0 R 1807 0 R 1808 0 R 1809 0 R 1810 0 R 1811 0 R 1812 0 R 1813 0 R 1814 0 R 1815 0 R 1816 0 R 1817 0 R 1818 0 R 1819 0 R 1820 0 R 1821 0 R 1822 0 R 1823 0 R 1824 0 R 1825 0 R 1826 0 R 1827 0 R 1828 0 R 1829 0 R 1830 0 R 1831 0 R 1832 0 R 1833 0 R 1834 0 R 1835 0 R 1836 0 R 1837 0 R 1838 0 R 1839 0 R 1840 0 R 1841 0 R 1842 0 R 1843 0 R 1844 0 R 1845 0 R 1846 0 R 1847 0 R 1848 0 R 1849 0 R 1850 0 R 1851 0 R 1852 0
R 1853 0 R 1854 0 R 1855 0 R 1856 0 R 1857 0 R 1858 0 R 1859 0 R 1860 0 R 1861 0 R 1862 0 R]
+>>
+endobj
+13 0 obj
+<< /Length 3820
+>>
+stream
+q
+/DeviceRGB cs
0.200 0.200 0.200 scn
+/DeviceRGB CS
0.200 0.200 0.200 SCN
BT
-60.24 776.1959999999999 Td
+60.24 794.6759999999999 Td
/F1.0 10.5 Tf
<31322e322e20> Tj
ET
@@ -4107,7 +4056,7 @@ ET
0.694 0.129 0.275 SCN
BT
-85.81800000000001 776.1959999999999 Td
+85.81800000000001 794.6759999999999 Td
/F3.0 10.5 Tf
<5075626c697368657253657276696365> Tj
ET
@@ -4118,7 +4067,7 @@ ET
0.200 0.200 0.200 SCN
BT
-175.33474999999993 776.1959999999999 Td
+175.33474999999993 794.6759999999999 Td
/F1.0 10.5 Tf
<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
@@ -4127,7 +4076,7 @@ ET
0.000 0.000 0.000 scn
BT
-528.07175 776.1959999999999 Td
+528.07175 794.6759999999999 Td
/F1.0 5.25 Tf
<ca> Tj
ET
@@ -4136,9 +4085,9 @@ ET
0.200 0.200 0.200 SCN
BT
-529.4314999999999 776.1959999999999 Td
+529.4314999999999 794.6759999999999 Td
/F1.0 10.5 Tf
-<313435> Tj
+<313433> Tj
ET
0.000 0.000 0.000 SCN
@@ -4147,7 +4096,7 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 757.7159999999999 Td
+60.24 776.1959999999999 Td
/F1.0 10.5 Tf
<31322e332e20> Tj
ET
@@ -4158,7 +4107,7 @@ ET
0.694 0.129 0.275 SCN
BT
-85.81800000000001 757.7159999999999 Td
+85.81800000000001 776.1959999999999 Td
/F3.0 10.5 Tf
<55736572526567697374726174696f6e53657276696365> Tj
ET
@@ -4169,7 +4118,7 @@ ET
0.200 0.200 0.200 SCN
BT
-207.40174999999994 757.7159999999999 Td
+207.40174999999994 776.1959999999999 Td
/F1.0 10.5 Tf
<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
@@ -4178,7 +4127,7 @@ ET
0.000 0.000 0.000 scn
BT
-528.07175 757.7159999999999 Td
+528.07175 776.1959999999999 Td
/F1.0 5.25 Tf
<ca> Tj
ET
@@ -4187,9 +4136,9 @@ ET
0.200 0.200 0.200 SCN
BT
-529.4314999999999 757.7159999999999 Td
+529.4314999999999 776.1959999999999 Td
/F1.0 10.5 Tf
-<313438> Tj
+<313436> Tj
ET
0.000 0.000 0.000 SCN
@@ -4198,7 +4147,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24 739.2359999999999 Td
+48.24 757.7159999999999 Td
/F1.0 10.5 Tf
[<31332e20426f6f74737472> 20.01953125 <617070696e6720535049>] TJ
ET
@@ -4209,7 +4158,7 @@ ET
0.200 0.200 0.200 SCN
BT
-159.30124999999992 739.2359999999999 Td
+159.30124999999992 757.7159999999999 Td
/F1.0 10.5 Tf
<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
@@ -4218,7 +4167,7 @@ ET
0.000 0.000 0.000 scn
BT
-528.07175 739.2359999999999 Td
+528.07175 757.7159999999999 Td
/F1.0 5.25 Tf
<ca> Tj
ET
@@ -4227,9 +4176,9 @@ ET
0.200 0.200 0.200 SCN
BT
-529.4314999999999 739.2359999999999 Td
+529.4314999999999 757.7159999999999 Td
/F1.0 10.5 Tf
-<313531> Tj
+<313439> Tj
ET
0.000 0.000 0.000 SCN
@@ -4238,7 +4187,7 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 720.7559999999999 Td
+60.24 739.2359999999999 Td
/F1.0 10.5 Tf
<31332e312e20> Tj
ET
@@ -4249,7 +4198,7 @@ ET
0.694 0.129 0.275 SCN
BT
-85.81800000000001 720.7559999999999 Td
+85.81800000000001 739.2359999999999 Td
/F3.0 10.5 Tf
<436c617373446973636f7665727953657276696365> Tj
ET
@@ -4260,7 +4209,7 @@ ET
0.200 0.200 0.200 SCN
BT
-202.05724999999995 720.7559999999999 Td
+202.05724999999995 739.2359999999999 Td
/F1.0 10.5 Tf
<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
@@ -4269,7 +4218,7 @@ ET
0.000 0.000 0.000 scn
BT
-528.07175 720.7559999999999 Td
+528.07175 739.2359999999999 Td
/F1.0 5.25 Tf
<ca> Tj
ET
@@ -4278,9 +4227,9 @@ ET
0.200 0.200 0.200 SCN
BT
-529.4314999999999 720.7559999999999 Td
+529.4314999999999 739.2359999999999 Td
/F1.0 10.5 Tf
-<313531> Tj
+<313439> Tj
ET
0.000 0.000 0.000 SCN
@@ -4299,7 +4248,7 @@ endobj
/F3.0 43 0 R
>>
>>
-/Annots [1920 0 R 1921 0 R 1922 0 R 1923 0 R 1924 0 R 1925 0 R 1926 0 R 1927 0 R 1928 0 R 1929 0 R 1930 0 R 1931 0 R 1932 0 R 1933 0 R]
+/Annots [1863 0 R 1864 0 R 1865 0 R 1866 0 R 1867 0 R 1868 0 R 1869 0 R 1870 0 R 1871 0 R 1872 0 R 1873 0 R]
>>
endobj
15 0 obj
@@ -4906,7 +4855,7 @@ endobj
/Font << /F2.0 20 0 R
/F1.0 8 0 R
>>
-/XObject << /Stamp1 1934 0 R
+/XObject << /Stamp1 1874 0 R
>>
>>
/Annots [22 0 R 23 0 R 24 0 R 25 0 R 26 0 R 27 0 R 28 0 R 29 0 R 30 0 R 31 0 R 32 0 R 33 0 R 34 0 R 35 0 R 36 0 R]
@@ -4921,18 +4870,18 @@ endobj
>>
endobj
19 0 obj
-<< /Kids [1541 0 R 1542 0 R]
+<< /Kids [1485 0 R 1486 0 R]
>>
endobj
20 0 obj
<< /Type /Font
/BaseFont /AAAACI+NotoSerif-Bold
/Subtype /TrueType
-/FontDescriptor 2028 0 R
+/FontDescriptor 1967 0 R
/FirstChar 32
/LastChar 255
-/Widths 2030 0 R
-/ToUnicode 2029 0 R
+/Widths 1969 0 R
+/ToUnicode 1968 0 R
>>
endobj
21 0 obj
@@ -5499,7 +5448,7 @@ endobj
/F3.0 43 0 R
>>
/XObject << /I1 41 0 R
-/Stamp1 1934 0 R
+/Stamp1 1874 0 R
>>
>>
/Annots [42 0 R 44 0 R 45 0 R 46 0 R 47 0 R 48 0 R]
@@ -5591,11 +5540,11 @@ endobj
<< /Type /Font
/BaseFont /AAAACJ+mplus1mn-regular
/Subtype /TrueType
-/FontDescriptor 2032 0 R
+/FontDescriptor 1971 0 R
/FirstChar 32
/LastChar 255
-/Widths 2034 0 R
-/ToUnicode 2033 0 R
+/Widths 1973 0 R
+/ToUnicode 1972 0 R
>>
endobj
44 0 obj
@@ -5654,7 +5603,7 @@ endobj
>>
endobj
49 0 obj
-<< /Length 28850
+<< /Length 27133
>>
stream
q
@@ -7205,7 +7154,7 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-2.150 Tw
+2.487 Tw
BT
48.239999999999995 159.72600000000008 Td
@@ -7220,27 +7169,27 @@ ET
0.694 0.129 0.275 scn
0.694 0.129 0.275 SCN
-2.150 Tw
+2.487 Tw
BT
-350.12866992187503 159.72600000000008 Td
+352.152544921875 159.72600000000008 Td
/F3.0 10.5 Tf
-<466163746f727953657276696365> Tj
+<466163746f72795365727669636523696e7374616e746961746528> 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
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
-2.150 Tw
+2.487 Tw
BT
-423.62866992187503 159.72600000000008 Td
-/F1.0 10.5 Tf
-<277320> Tj
+493.902544921875 159.72600000000008 Td
+/F4.0 10.5 Tf
+<c9> Tj
ET
@@ -7250,27 +7199,12 @@ ET
0.694 0.129 0.275 scn
0.694 0.129 0.275 SCN
-2.150 Tw
+2.487 Tw
BT
-435.5433349609375 159.72600000000008 Td
+504.402544921875 159.72600000000008 Td
/F3.0 10.5 Tf
-<696e7374616e74696174652829> 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
-
-2.150 Tw
-
-BT
-503.7933349609375 159.72600000000008 Td
-/F1.0 10.5 Tf
-<206d6574686f64> Tj
+<29> Tj
ET
@@ -7280,12 +7214,12 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-0.056 Tw
+2.487 Tw
BT
-48.239999999999995 143.94600000000008 Td
+509.652544921875 159.72600000000008 Td
/F1.0 10.5 Tf
-<286f7220746865206465707265636174656420> Tj
+<206f7220746865> Tj
ET
@@ -7295,70 +7229,43 @@ ET
0.694 0.129 0.275 scn
0.694 0.129 0.275 SCN
-0.056 Tw
-
BT
-143.044875 143.94600000000008 Td
+48.239999999999995 143.94600000000008 Td
/F3.0 10.5 Tf
-<446f6d61696e4f626a656374436f6e7461696e6572> Tj
+<5265706f7369746f72795365727669636523696e7374616e746961746528> 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
-
-0.056 Tw
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
BT
-253.294875 143.94600000000008 Td
-/F1.0 10.5 Tf
-<277320> Tj
+205.74 143.94600000000008 Td
+/F4.0 10.5 Tf
+<c9> 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
-0.056 Tw
-
BT
-263.116 143.94600000000008 Td
+216.24 143.94600000000008 Td
/F3.0 10.5 Tf
-<6e65775472616e7369656e74496e7374616e63652829> 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
-
-0.056 Tw
-
-BT
-378.616 143.94600000000008 Td
-/F1.0 10.5 Tf
-<206d6574686f64292077696c6c206175746f6d61746963616c6c7920696e6a656374> Tj
+<29> 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
BT
-48.239999999999995 128.16600000000008 Td
+221.49 143.94600000000008 Td
/F1.0 10.5 Tf
-<7468652073657276696365732e> Tj
+<27732077696c6c206175746f6d61746963616c6c7920696e6a656374207468652073657276696365732e> Tj
ET
0.000 0.000 0.000 SCN
@@ -7369,7 +7276,7 @@ ET
4.638 Tw
BT
-48.239999999999995 100.38600000000008 Td
+48.239999999999995 116.16600000000008 Td
/F1.0 10.5 Tf
<416c7465726e61746976656c7920746865206f626a6563742063616e20626520696e7374616e7469617465642073696d706c79207573696e6720> Tj
ET
@@ -7384,7 +7291,7 @@ ET
4.638 Tw
BT
-369.2863333333333 100.38600000000008 Td
+369.2863333333333 116.16600000000008 Td
/F3.0 10.5 Tf
<6e6577> Tj
ET
@@ -7399,7 +7306,7 @@ ET
4.638 Tw
BT
-385.0363333333333 100.38600000000008 Td
+385.0363333333333 116.16600000000008 Td
/F1.0 10.5 Tf
<2c207468656e20736572766963657320696e6a6563746564207573696e67> Tj
ET
@@ -7411,163 +7318,65 @@ ET
0.694 0.129 0.275 scn
0.694 0.129 0.275 SCN
-6.506 Tw
-
BT
-48.239999999999995 84.60600000000008 Td
+48.239999999999995 100.38600000000008 Td
/F3.0 10.5 Tf
<536572766963655265676973747279> 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
-6.506 Tw
-
BT
-126.99 84.60600000000008 Td
+126.99 100.38600000000008 Td
/F1.0 10.5 Tf
<277320> 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
-6.506 Tw
-
BT
-143.26108333333332 84.60600000000008 Td
+136.755 100.38600000000008 Td
/F3.0 10.5 Tf
<696e6a6563745365727669636573496e746f28> 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
-6.506 Tw
-
BT
-243.01108333333332 84.60600000000008 Td
+236.505 100.38600000000008 Td
/F4.0 10.5 Tf
<c9> 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
-6.506 Tw
-
BT
-253.51108333333332 84.60600000000008 Td
+247.005 100.38600000000008 Td
/F3.0 10.5 Tf
<29> 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
-
-6.506 Tw
-
-BT
-258.7610833333333 84.60600000000008 Td
-/F1.0 10.5 Tf
-<206d6574686f6420286f7220746865206465707265636174656420> 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
-
-6.506 Tw
-
-BT
-429.7445 84.60600000000008 Td
-/F3.0 10.5 Tf
-<446f6d61696e4f626a656374436f6e7461696e6572> 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
-6.506 Tw
-
BT
-539.9945 84.60600000000008 Td
+252.255 100.38600000000008 Td
/F1.0 10.5 Tf
-<2773> 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
-
-BT
-48.239999999999995 68.82600000000008 Td
-/F3.0 10.5 Tf
-<696e6a6563745365727669636573496e746f28> Tj
-ET
-
-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
-
-BT
-147.99 68.82600000000008 Td
-/F4.0 10.5 Tf
-<c9> Tj
-ET
-
-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
-
-BT
-158.49 68.82600000000008 Td
-/F3.0 10.5 Tf
-<29> Tj
-ET
-
-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
-
-BT
-163.74 68.82600000000008 Td
-/F1.0 10.5 Tf
-<206d6574686f64292e> Tj
+<206d6574686f642e> Tj
ET
0.000 0.000 0.000 SCN
@@ -7606,12 +7415,12 @@ endobj
/F1.0 8 0 R
/F3.0 43 0 R
/F3.1 55 0 R
-/F4.0 59 0 R
+/F4.0 57 0 R
>>
-/XObject << /Stamp1 1934 0 R
+/XObject << /Stamp1 1874 0 R
>>
>>
-/Annots [52 0 R 53 0 R 56 0 R 57 0 R 58 0 R 60 0 R]
+/Annots [52 0 R 53 0 R 56 0 R 58 0 R 59 0 R 60 0 R 61 0 R 62 0 R 63 0 R]
>>
endobj
51 0 obj
@@ -7646,11 +7455,11 @@ endobj
<< /Type /Font
/BaseFont /AAAACK+mplus1mn-regular
/Subtype /TrueType
-/FontDescriptor 2036 0 R
+/FontDescriptor 1975 0 R
/FirstChar 32
/LastChar 255
-/Widths 2038 0 R
-/ToUnicode 2037 0 R
+/Widths 1977 0 R
+/ToUnicode 1976 0 R
>>
endobj
56 0 obj
@@ -7660,55 +7469,88 @@ endobj
/URI (../rgsvc/rgsvc.pdf#_rgsvc_core-domain-api_FactoryService)
>>
/Subtype /Link
-/Rect [350.12866992187503 158.25600000000009 423.62866992187503 168.75600000000009]
+/Rect [352.152544921875 158.25600000000009 493.902544921875 168.75600000000009]
/Type /Annot
>>
endobj
57 0 obj
+<< /Type /Font
+/BaseFont /AAAACL+mplus-1p-regular
+/Subtype /TrueType
+/FontDescriptor 1979 0 R
+/FirstChar 32
+/LastChar 255
+/Widths 1981 0 R
+/ToUnicode 1980 0 R
+>>
+endobj
+58 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
-/URI (../rgsvc/rgsvc.pdf#_rgsvc_core-domain-api_DomainObjectContainer)
+/URI (../rgsvc/rgsvc.pdf#_rgsvc_core-domain-api_FactoryService)
>>
/Subtype /Link
-/Rect [143.044875 142.47600000000008 253.294875 152.97600000000008]
+/Rect [493.902544921875 158.25600000000009 504.402544921875 168.75600000000009]
/Type /Annot
>>
endobj
-58 0 obj
+59 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
-/URI (../rgsvc/rgsvc.pdf#_rgsvc_metadata-api_ServiceRegistry)
+/URI (../rgsvc/rgsvc.pdf#_rgsvc_core-domain-api_FactoryService)
>>
/Subtype /Link
-/Rect [48.239999999999995 83.13600000000008 126.99 93.63600000000008]
+/Rect [504.402544921875 158.25600000000009 509.652544921875 168.75600000000009]
/Type /Annot
>>
endobj
-59 0 obj
-<< /Type /Font
-/BaseFont /AAAACL+mplus-1p-regular
-/Subtype /TrueType
-/FontDescriptor 2040 0 R
-/FirstChar 32
-/LastChar 255
-/Widths 2042 0 R
-/ToUnicode 2041 0 R
->>
-endobj
60 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
-/URI (../rgsvc/rgsvc.pdf#_rgsvc_core-domain-api_DomainObjectContainer)
+/URI (../rgsvc/rgsvc.pdf#_rgsvc_core-domain-api_RepositoryService)
>>
/Subtype /Link
-/Rect [429.7445 83.13600000000008 539.9945 93.63600000000008]
+/Rect [48.239999999999995 142.47600000000008 205.74 152.97600000000008]
/Type /Annot
>>
endobj
61 0 obj
+<< /Border [0 0 0]
+/A << /Type /Action
+/S /URI
+/URI (../rgsvc/rgsvc.pdf#_rgsvc_core-domain-api_RepositoryService)
+>>
+/Subtype /Link
+/Rect [205.74 142.47600000000008 216.24 152.97600000000008]
+/Type /Annot
+>>
+endobj
+62 0 obj
+<< /Border [0 0 0]
+/A << /Type /Action
+/S /URI
+/URI (../rgsvc/rgsvc.pdf#_rgsvc_core-domain-api_RepositoryService)
+>>
+/Subtype /Link
+/Rect [216.24 142.47600000000008 221.49 152.97600000000008]
+/Type /Annot
+>>
+endobj
+63 0 obj
+<< /Border [0 0 0]
+/A << /Type /Action
+/S /URI
+/URI (../rgsvc/rgsvc.pdf#_rgsvc_metadata-api_ServiceRegistry)
+>>
+/Subtype /Link
+/Rect [48.239999999999995 98.91600000000008 126.99 109.41600000000008]
+/Type /Annot
+>>
+endobj
+64 0 obj
<< /Length 16954
>>
stream
@@ -8805,28 +8647,28 @@ Q
endstream
endobj
-62 0 obj
+65 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 61 0 R
+/Contents 64 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/Font << /F2.0 20 0 R
/F1.0 8 0 R
/F3.0 43 0 R
-/F5.1 65 0 R
+/F5.1 68 0 R
/F3.1 55 0 R
>>
-/XObject << /Stamp1 1934 0 R
+/XObject << /Stamp1 1874 0 R
>>
>>
-/Annots [64 0 R 66 0 R 67 0 R 68 0 R 69 0 R]
+/Annots [67 0 R 69 0 R 70 0 R 71 0 R 72 0 R]
>>
endobj
-63 0 obj
-[62 0 R /XYZ 0 841.89 null]
+66 0 obj
+[65 0 R /XYZ 0 841.89 null]
endobj
-64 0 obj
+67 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -8837,18 +8679,18 @@ endobj
/Type /Annot
>>
endobj
-65 0 obj
+68 0 obj
<< /Type /Font
/BaseFont /AAAACM+FontAwesome
/Subtype /TrueType
-/FontDescriptor 2044 0 R
+/FontDescriptor 1983 0 R
/FirstChar 32
/LastChar 255
-/Widths 2046 0 R
-/ToUnicode 2045 0 R
+/Widths 1985 0 R
+/ToUnicode 1984 0 R
>>
endobj
-66 0 obj
+69 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -8859,7 +8701,7 @@ endobj
/Type /Annot
>>
endobj
-67 0 obj
+70 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -8870,7 +8712,7 @@ endobj
/Type /Annot
>>
endobj
-68 0 obj
+71 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -8881,18 +8723,18 @@ endobj
/Type /Annot
>>
endobj
-69 0 obj
+72 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
-/URI (../rgsvc/rgsvc.pdf#_rgsvc_api_LocaleProvider)
+/URI (../rgsvc/rgsvc.pdf#_rgsvc_presentation-layer-spi_LocaleProvider)
>>
/Subtype /Link
/Rect [435.1057991536458 586.9359999999999 508.6057991536458 597.4359999999999]
/Type /Annot
>>
endobj
-70 0 obj
+73 0 obj
<< /Length 25625
>>
stream
@@ -10640,39 +10482,39 @@ Q
endstream
endobj
-71 0 obj
+74 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 70 0 R
+/Contents 73 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/Font << /F3.0 43 0 R
/F3.1 55 0 R
/F1.0 8 0 R
-/F6.0 72 0 R
+/F6.0 75 0 R
/F2.0 20 0 R
>>
-/XObject << /Stamp1 1934 0 R
+/XObject << /Stamp1 1874 0 R
>>
>>
-/Annots [74 0 R 75 0 R]
+/Annots [77 0 R 78 0 R]
>>
endobj
-72 0 obj
+75 0 obj
<< /Type /Font
/BaseFont /AAAACN+NotoSerif-Italic
/Subtype /TrueType
-/FontDescriptor 2048 0 R
+/FontDescriptor 1987 0 R
/FirstChar 32
/LastChar 255
-/Widths 2050 0 R
-/ToUnicode 2049 0 R
+/Widths 1989 0 R
+/ToUnicode 1988 0 R
>>
endobj
-73 0 obj
-[71 0 R /XYZ 0 361.15000000000003 null]
+76 0 obj
+[74 0 R /XYZ 0 361.15000000000003 null]
endobj
-74 0 obj
+77 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -10683,7 +10525,7 @@ endobj
/Type /Annot
>>
endobj
-75 0 obj
+78 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -10694,7 +10536,7 @@ endobj
/Type /Annot
>>
endobj
-76 0 obj
+79 0 obj
<< /Length 26410
>>
stream
@@ -12339,24 +12181,24 @@ Q
endstream
endobj
-77 0 obj
+80 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 76 0 R
+/Contents 79 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/Font << /F1.0 8 0 R
/F3.0 43 0 R
-/F4.0 59 0 R
-/F5.1 65 0 R
+/F4.0 57 0 R
+/F5.1 68 0 R
>>
-/XObject << /Stamp1 1934 0 R
+/XObject << /Stamp1 1874 0 R
>>
>>
-/Annots [78 0 R 79 0 R 80 0 R 81 0 R 82 0 R 83 0 R 84 0 R 85 0 R 86 0 R 87 0 R 88 0 R 89 0 R 90 0 R 91 0 R 92 0 R 93 0 R 94 0 R 95 0 R 96 0 R 97 0 R 98 0 R 99 0 R 100 0 R 101 0 R 102 0 R 103 0 R]
+/Annots [81 0 R 82 0 R 83 0 R 84 0 R 85 0 R 86 0 R 87 0 R 88 0 R 89 0 R 90 0 R 91 0 R 92 0 R 93 0 R 94 0 R 95 0 R 96 0 R 97 0 R 98 0 R 99 0 R 100 0 R 101 0 R 102 0 R 103 0 R 104 0 R 105 0 R 106 0 R]
>>
endobj
-78 0 obj
+81 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -12367,7 +12209,7 @@ endobj
/Type /Annot
>>
endobj
-79 0 obj
+82 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -12378,7 +12220,7 @@ endobj
/Type /Annot
>>
endobj
-80 0 obj
+83 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -12389,7 +12231,7 @@ endobj
/Type /Annot
>>
endobj
-81 0 obj
+84 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -12400,7 +12242,7 @@ endobj
/Type /Annot
>>
endobj
-82 0 obj
+85 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -12411,7 +12253,7 @@ endobj
/Type /Annot
>>
endobj
-83 0 obj
+86 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -12422,7 +12264,7 @@ endobj
/Type /Annot
>>
endobj
-84 0 obj
+87 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -12433,7 +12275,7 @@ endobj
/Type /Annot
>>
endobj
-85 0 obj
+88 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -12444,7 +12286,7 @@ endobj
/Type /Annot
>>
endobj
-86 0 obj
+89 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -12455,7 +12297,7 @@ endobj
/Type /Annot
>>
endobj
-87 0 obj
+90 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -12466,7 +12308,7 @@ endobj
/Type /Annot
>>
endobj
-88 0 obj
+91 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -12477,7 +12319,7 @@ endobj
/Type /Annot
>>
endobj
-89 0 obj
+92 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -12488,7 +12330,7 @@ endobj
/Type /Annot
>>
endobj
-90 0 obj
+93 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -12499,7 +12341,7 @@ endobj
/Type /Annot
>>
endobj
-91 0 obj
+94 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -12510,7 +12352,7 @@ endobj
/Type /Annot
>>
endobj
-92 0 obj
+95 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -12521,7 +12363,7 @@ endobj
/Type /Annot
>>
endobj
-93 0 obj
+96 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -12532,7 +12374,7 @@ endobj
/Type /Annot
>>
endobj
-94 0 obj
+97 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -12543,7 +12385,7 @@ endobj
/Type /Annot
>>
endobj
-95 0 obj
+98 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -12554,7 +12396,7 @@ endobj
/Type /Annot
>>
endobj
-96 0 obj
+99 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -12565,7 +12407,7 @@ endobj
/Type /Annot
>>
endobj
-97 0 obj
+100 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -12576,7 +12418,7 @@ endobj
/Type /Annot
>>
endobj
-98 0 obj
+101 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -12587,7 +12429,7 @@ endobj
/Type /Annot
>>
endobj
-99 0 obj
+102 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -12598,7 +12440,7 @@ endobj
/Type /Annot
>>
endobj
-100 0 obj
+103 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -12609,7 +12451,7 @@ endobj
/Type /Annot
>>
endobj
-101 0 obj
+104 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -12620,7 +12462,7 @@ endobj
/Type /Annot
>>
endobj
-102 0 obj
+105 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -12631,7 +12473,7 @@ endobj
/Type /Annot
>>
endobj
-103 0 obj
+106 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -12642,7 +12484,7 @@ endobj
/Type /Annot
>>
endobj
-104 0 obj
+107 0 obj
<< /Length 2793
>>
stream
@@ -12800,22 +12642,22 @@ Q
endstream
endobj
-105 0 obj
+108 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 104 0 R
+/Contents 107 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/Font << /F1.0 8 0 R
/F3.0 43 0 R
>>
-/XObject << /Stamp1 1934 0 R
+/XObject << /Stamp1 1874 0 R
>>
>>
-/Annots [106 0 R]
+/Annots [109 0 R]
>>
endobj
-106 0 obj
+109 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -12826,7 +12668,7 @@ endobj
/Type /Annot
>>
endobj
-107 0 obj
+110 0 obj
<< /Length 26654
>>
stream
@@ -14690,27 +14532,27 @@ Q
endstream
endobj
-108 0 obj
+111 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 107 0 R
+/Contents 110 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/Font << /F2.0 20 0 R
/F1.0 8 0 R
-/F6.0 72 0 R
+/F6.0 75 0 R
/F3.0 43 0 R
>>
-/XObject << /Stamp1 1934 0 R
+/XObject << /Stamp1 1874 0 R
>>
>>
-/Annots [110 0 R 111 0 R 112 0 R 113 0 R 114 0 R 115 0 R 116 0 R 117 0 R 118 0 R 119 0 R 120 0 R 121 0 R 122 0 R 123 0 R 124 0 R 125 0 R 126 0 R 127 0 R 128 0 R 129 0 R 130 0 R 131 0 R 132 0 R 133 0 R 134 0 R 135 0 R 136 0 R 137 0 R 138 0 R 139 0 R 140 0 R 141 0 R]
+/Annots [113 0 R 114 0 R 115 0 R 116 0 R 117 0 R 118 0 R 119 0 R 120 0 R 121 0 R 122 0 R 123 0 R 124 0 R 125 0 R 126 0 R 127 0 R 128 0 R 129 0 R 130 0 R 131 0 R 132 0 R 133 0 R 134 0 R 135 0 R 136 0 R 137 0 R 138 0 R 139 0 R 140 0 R 141 0 R 142 0 R 143 0 R 144 0 R]
>>
endobj
-109 0 obj
-[108 0 R /XYZ 0 841.89 null]
+112 0 obj
+[111 0 R /XYZ 0 841.89 null]
endobj
-110 0 obj
+113 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -14721,7 +14563,7 @@ endobj
/Type /Annot
>>
endobj
-111 0 obj
+114 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -14732,7 +14574,7 @@ endobj
/Type /Annot
>>
endobj
-112 0 obj
+115 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -14743,7 +14585,7 @@ endobj
/Type /Annot
>>
endobj
-113 0 obj
+116 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -14754,7 +14596,7 @@ endobj
/Type /Annot
>>
endobj
-114 0 obj
+117 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -14765,7 +14607,7 @@ endobj
/Type /Annot
>>
endobj
-115 0 obj
+118 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -14776,7 +14618,7 @@ endobj
/Type /Annot
>>
endobj
-116 0 obj
+119 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -14787,7 +14629,7 @@ endobj
/Type /Annot
>>
endobj
-117 0 obj
+120 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -14798,7 +14640,7 @@ endobj
/Type /Annot
>>
endobj
-118 0 obj
+121 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -14809,7 +14651,7 @@ endobj
/Type /Annot
>>
endobj
-119 0 obj
+122 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -14820,7 +14662,7 @@ endobj
/Type /Annot
>>
endobj
-120 0 obj
+123 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -14831,7 +14673,7 @@ endobj
/Type /Annot
>>
endobj
-121 0 obj
+124 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -14842,7 +14684,7 @@ endobj
/Type /Annot
>>
endobj
-122 0 obj
+125 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -14853,7 +14695,7 @@ endobj
/Type /Annot
>>
endobj
-123 0 obj
+126 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -14864,7 +14706,7 @@ endobj
/Type /Annot
>>
endobj
-124 0 obj
+127 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -14875,7 +14717,7 @@ endobj
/Type /Annot
>>
endobj
-125 0 obj
+128 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -14886,7 +14728,7 @@ endobj
/Type /Annot
>>
endobj
-126 0 obj
+129 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -14897,7 +14739,7 @@ endobj
/Type /Annot
>>
endobj
-127 0 obj
+130 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -14908,7 +14750,7 @@ endobj
/Type /Annot
>>
endobj
-128 0 obj
+131 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -14919,7 +14761,7 @@ endobj
/Type /Annot
>>
endobj
-129 0 obj
+132 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -14930,7 +14772,7 @@ endobj
/Type /Annot
>>
endobj
-130 0 obj
+133 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -14941,7 +14783,7 @@ endobj
/Type /Annot
>>
endobj
-131 0 obj
+134 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -14952,7 +14794,7 @@ endobj
/Type /Annot
>>
endobj
-132 0 obj
+135 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -14963,7 +14805,7 @@ endobj
/Type /Annot
>>
endobj
-133 0 obj
+136 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -14974,7 +14816,7 @@ endobj
/Type /Annot
>>
endobj
-134 0 obj
+137 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -14985,7 +14827,7 @@ endobj
/Type /Annot
>>
endobj
-135 0 obj
+138 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -14996,7 +14838,7 @@ endobj
/Type /Annot
>>
endobj
-136 0 obj
+139 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -15007,7 +14849,7 @@ endobj
/Type /Annot
>>
endobj
-137 0 obj
+140 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -15018,7 +14860,7 @@ endobj
/Type /Annot
>>
endobj
-138 0 obj
+141 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -15029,7 +14871,7 @@ endobj
/Type /Annot
>>
endobj
-139 0 obj
+142 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -15040,7 +14882,7 @@ endobj
/Type /Annot
>>
endobj
-140 0 obj
+143 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -15051,7 +14893,7 @@ endobj
/Type /Annot
>>
endobj
-141 0 obj
+144 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -15062,7 +14904,7 @@ endobj
/Type /Annot
>>
endobj
-142 0 obj
+145 0 obj
<< /Length 20140
>>
stream
@@ -16292,28 +16134,28 @@ Q
endstream
endobj
-143 0 obj
+146 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 142 0 R
+/Contents 145 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/Font << /F1.0 8 0 R
/F3.0 43 0 R
/F2.0 20 0 R
-/F5.1 65 0 R
+/F5.1 68 0 R
/F3.1 55 0 R
>>
-/XObject << /Stamp1 1934 0 R
+/XObject << /Stamp1 1874 0 R
>>
>>
-/Annots [145 0 R 146 0 R 147 0 R 149 0 R 150 0 R 151 0 R 152 0 R]
+/Annots [148 0 R 149 0 R 150 0 R 152 0 R 153 0 R 154 0 R 155 0 R]
>>
endobj
-144 0 obj
-[143 0 R /XYZ 0 756.33 null]
+147 0 obj
+[146 0 R /XYZ 0 756.33 null]
endobj
-145 0 obj
+148 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -16324,7 +16166,7 @@ endobj
/Type /Annot
>>
endobj
-146 0 obj
+149 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -16335,7 +16177,7 @@ endobj
/Type /Annot
>>
endobj
-147 0 obj
+150 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -16346,10 +16188,10 @@ endobj
/Type /Annot
>>
endobj
-148 0 obj
-[143 0 R /XYZ 0 573.7900000000001 null]
+151 0 obj
+[146 0 R /XYZ 0 573.7900000000001 null]
endobj
-149 0 obj
+152 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -16360,7 +16202,7 @@ endobj
/Type /Annot
>>
endobj
-150 0 obj
+153 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -16371,7 +16213,7 @@ endobj
/Type /Annot
>>
endobj
-151 0 obj
+154 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -16382,7 +16224,7 @@ endobj
/Type /Annot
>>
endobj
-152 0 obj
+155 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -16393,16 +16235,16 @@ endobj
/Type /Annot
>>
endobj
-153 0 obj
-[143 0 R /XYZ 0 192.27000000000027 null]
+156 0 obj
+[146 0 R /XYZ 0 192.27000000000027 null]
endobj
-154 0 obj
+157 0 obj
<< /Type /XObject
/Subtype /Image
/Height 441
/Width 789
/BitsPerComponent 8
-/ColorSpace [/Indexed /DeviceRGB 255 155 0 R]
+/ColorSpace [/Indexed /DeviceRGB 255 158 0 R]
/Length 9715
/Filter [/FlateDecode]
/DecodeParms [<< /Predictor 15
@@ -16478,14 +16320,14 @@ P
|` >� X�� �V �+ ����
endstream
endobj
-155 0 obj
+158 0 obj
<< /Length 768
>>
stream
8]�8^�9_�:`�>b�:a�;b�;c�<e�=f�>h�?i�Kl�Qq�Ao�Cp�Ds�Et�Gx�Hz�J}�J~�P�q�?o�Cj�Vu�E~�Qf�bU��O��P��U��U��X��[��]��a��f��l��p��r��x��x��}��W��Y��^��a��g��l��o��x��������щ�ӌ�Ԏ�Ւ�֔�ך�ٜ�ڟ�ۡ�Ȥ�ݳˀ�ӓ�Ӕ�ǥ��ߴ�ӯ����������ܪ�ҷ��������������������������������������������������������������������������������������������������������������������������������������������
endstream
endobj
-156 0 obj
+159 0 obj
<< /Length 11012
>>
stream
@@ -17174,25 +17016,25 @@ Q
endstream
endobj
-157 0 obj
+160 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 156 0 R
+/Contents 159 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/XObject << /I2 154 0 R
-/Stamp1 1934 0 R
+/XObject << /I2 157 0 R
+/Stamp1 1874 0 R
>>
/Font << /F1.0 8 0 R
/F3.0 43 0 R
-/F5.1 65 0 R
+/F5.1 68 0 R
/F2.0 20 0 R
>>
>>
-/Annots [158 0 R 159 0 R 160 0 R]
+/Annots [161 0 R 162 0 R 163 0 R]
>>
endobj
-158 0 obj
+161 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -17203,7 +17045,7 @@ endobj
/Type /Annot
>>
endobj
-159 0 obj
+162 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -17214,7 +17056,7 @@ endobj
/Type /Annot
>>
endobj
-160 0 obj
+163 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -17225,13 +17067,13 @@ endobj
/Type /Annot
>>
endobj
-161 0 obj
-[157 0 R /XYZ 0 281.73304182509503 null]
+164 0 obj
+[160 0 R /XYZ 0 281.73304182509503 null]
endobj
-162 0 obj
-[157 0 R /XYZ 0 154.533041825095 null]
+165 0 obj
+[160 0 R /XYZ 0 154.533041825095 null]
endobj
-163 0 obj
+166 0 obj
<< /Length 19888
>>
stream
@@ -18497,24 +18339,24 @@ Q
endstream
endobj
-164 0 obj
+167 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 163 0 R
+/Contents 166 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/Font << /F3.0 43 0 R
/F3.1 55 0 R
/F1.0 8 0 R
/F2.0 20 0 R
>>
-/XObject << /Stamp1 1934 0 R
+/XObject << /Stamp1 1874 0 R
>>
>>
-/Annots [165 0 R 168 0 R 169 0 R 170 0 R 171 0 R 173 0 R 174 0 R 175 0 R 177 0 R 178 0 R 179 0 R]
+/Annots [168 0 R 171 0 R 172 0 R 173 0 R 174 0 R 176 0 R 177 0 R 178 0 R 180 0 R 181 0 R 182 0 R]
>>
endobj
-165 0 obj
+168 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -18525,13 +18367,13 @@ endobj
/Type /Annot
>>
endobj
-166 0 obj
-[164 0 R /XYZ 0 662.33 null]
+169 0 obj
+[167 0 R /XYZ 0 662.33 null]
endobj
-167 0 obj
-[164 0 R /XYZ 0 535.1300000000002 null]
+170 0 obj
+[167 0 R /XYZ 0 535.1300000000002 null]
endobj
-168 0 obj
+171 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -18542,7 +18384,7 @@ endobj
/Type /Annot
>>
endobj
-169 0 obj
+172 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -18553,7 +18395,7 @@ endobj
/Type /Annot
>>
endobj
-170 0 obj
+173 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -18564,7 +18406,7 @@ endobj
/Type /Annot
>>
endobj
-171 0 obj
+174 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -18575,10 +18417,10 @@ endobj
/Type /Annot
>>
endobj
-172 0 obj
-[164 0 R /XYZ 0 271.17000000000024 null]
+175 0 obj
+[167 0 R /XYZ 0 271.17000000000024 null]
endobj
-173 0 obj
+176 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -18589,7 +18431,7 @@ endobj
/Type /Annot
>>
endobj
-174 0 obj
+177 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -18600,7 +18442,7 @@ endobj
/Type /Annot
>>
endobj
-175 0 obj
+178 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -18611,10 +18453,10 @@ endobj
/Type /Annot
>>
endobj
-176 0 obj
-[164 0 R /XYZ 0 194.3300000000002 null]
+179 0 obj
+[167 0 R /XYZ 0 194.3300000000002 null]
endobj
-177 0 obj
+180 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -18625,7 +18467,7 @@ endobj
/Type /Annot
>>
endobj
-178 0 obj
+181 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -18636,7 +18478,7 @@ endobj
/Type /Annot
>>
endobj
-179 0 obj
+182 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -18647,7 +18489,7 @@ endobj
/Type /Annot
>>
endobj
-180 0 obj
+183 0 obj
<< /Length 41878
>>
stream
@@ -21510,27 +21352,27 @@ Q
endstream
endobj
-181 0 obj
+184 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 180 0 R
+/Contents 183 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F5.1 65 0 R
+/Font << /F5.1 68 0 R
/F1.0 8 0 R
/F2.0 20 0 R
/F3.0 43 0 R
>>
-/XObject << /Stamp1 1934 0 R
+/XObject << /Stamp1 1874 0 R
>>
>>
-/Annots [183 0 R 184 0 R 185 0 R 187 0 R]
+/Annots [186 0 R 187 0 R 188 0 R 190 0 R]
>>
endobj
-182 0 obj
-[181 0 R /XYZ 0 706.99 null]
+185 0 obj
+[184 0 R /XYZ 0 706.99 null]
endobj
-183 0 obj
+186 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -21541,7 +21383,7 @@ endobj
/Type /Annot
>>
endobj
-184 0 obj
+187 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -21552,7 +21394,7 @@ endobj
/Type /Annot
>>
endobj
-185 0 obj
+188 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -21563,10 +21405,10 @@ endobj
/Type /Annot
>>
endobj
-186 0 obj
-[181 0 R /XYZ 0 452.15000000000015 null]
+189 0 obj
+[184 0 R /XYZ 0 452.15000000000015 null]
endobj
-187 0 obj
+190 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -21577,7 +21419,7 @@ endobj
/Type /Annot
>>
endobj
-188 0 obj
+191 0 obj
<< /Length 8485
>>
stream
@@ -22196,21 +22038,21 @@ Q
endstream
endobj
-189 0 obj
+192 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 188 0 R
+/Contents 191 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/Font << /F1.0 8 0 R
/F3.0 43 0 R
>>
-/XObject << /Stamp1 1934 0 R
+/XObject << /Stamp1 1874 0 R
>>
>>
>>
endobj
-190 0 obj
+193 0 obj
<< /Length 17750
>>
stream
@@ -23452,37 +23294,37 @@ Q
endstream
endobj
-191 0 obj
+194 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 190 0 R
+/Contents 193 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/Font << /F2.0 20 0 R
/F1.0 8 0 R
-/F6.0 72 0 R
+/F6.0 75 0 R
/F3.0 43 0 R
>>
-/XObject << /Stamp1 1934 0 R
+/XObject << /Stamp1 1874 0 R
>>
>>
-/Annots [195 0 R 196 0 R 197 0 R 198 0 R 199 0 R 200 0 R 201 0 R 202 0 R 203 0 R 204 0 R 205 0 R 206 0 R 207 0 R 208 0 R 209 0 R 210 0 R 211 0 R 212 0 R]
+/Annots [198 0 R 199 0 R 200 0 R 201 0 R 202 0 R 203 0 R 204 0 R 205 0 R 206 0 R 207 0 R 208 0 R 209 0 R 210 0 R 211 0 R 212 0 R 213 0 R 214 0 R 215 0 R]
>>
endobj
-192 0 obj
-[191 0 R /XYZ 0 841.89 null]
+195 0 obj
+[194 0 R /XYZ 0 841.89 null]
endobj
-193 0 obj
+196 0 obj
<< /Limits [(__rgsvc) (__rgsvc_intro_public-api)]
-/Names [(__rgsvc) 17 0 R (__rgsvc_application-layer-api_CommandContext_screencast) 682 0 R (__rgsvc_application-layer-api_InteractionContext_Related-Classes) 754 0 R (__rgsvc_core-domain-api_EventBusService_Configuration) 1064 0 R (__rgsvc_core-domain-api_EventBusService_api-and-implementation) 1026 0 R (__rgsvc_core-domain-api_EventBusService_event-hierarchy) 1051 0 R (__rgsvc_integration-api_JaxbService_api-and-implementation) 1197 0 R (__rgsvc_intro_commands-and-events) 73 0 R (__rgsvc_intro_overriding-the-services) 63 0 R (__rgsvc_intro_public-api) 51 0 R]
+/Names [(__rgsvc) 17 0 R (__rgsvc_application-layer-api_CommandContext_screencast) 674 0 R (__rgsvc_application-layer-api_InteractionContext_Related-Classes) 746 0 R (__rgsvc_core-domain-api_EventBusService_Configuration) 1016 0 R (__rgsvc_core-domain-api_EventBusService_api-and-implementation) 978 0 R (__rgsvc_core-domain-api_EventBusService_event-hierarchy) 1003 0 R (__rgsvc_integration-api_JaxbService_api-and-implementation) 1146 0 R (__rgsvc_intro_commands-and-events) 76 0 R (__rgsvc_intro_overriding-the-services) 66 0 R (__rgsvc_intro_public-api) 51 0 R]
>>
endobj
-194 0 obj
+197 0 obj
<< /Limits [(_rgsvc_presentation-layer-api) (_rgsvc_presentation-layer-spi_GridService)]
-/Names [(_rgsvc_presentation-layer-api) 109 0 R (_rgsvc_presentation-layer-api_AcceptHeaderService) 144 0 R (_rgsvc_presentation-layer-spi) 192 0 R (_rgsvc_presentation-layer-spi_ContentMappingService) 291 0 R (_rgsvc_presentation-layer-spi_ContentMappingService_implementations) 299 0 R (_rgsvc_presentation-layer-spi_EmailNotificationService) 310 0 R (_rgsvc_presentation-layer-spi_ErrorReportingService) 325 0 R (_rgsvc_presentation-layer-spi_ExceptionRecognizer) 339 0 R (_rgsvc_presentation-layer-spi_GridLoaderService) 352 0 R (_rgsvc_presentation-layer-spi_GridService) 363 0 R]
+/Names [(_rgsvc_presentation-layer-api) 112 0 R (_rgsvc_presentation-layer-api_AcceptHeaderService) 147 0 R (_rgsvc_presentation-layer-spi) 195 0 R (_rgsvc_presentation-layer-spi_ContentMappingService) 294 0 R (_rgsvc_presentation-layer-spi_ContentMappingService_implementations) 302 0 R (_rgsvc_presentation-layer-spi_EmailNotificationService) 313 0 R (_rgsvc_presentation-layer-spi_ErrorReportingService) 328 0 R (_rgsvc_presentation-layer-spi_ExceptionRecognizer) 342 0 R (_rgsvc_presentation-layer-spi_GridLoaderService) 355 0 R (_rgsvc_presentation-layer-spi_GridService) 366 0 R]
>>
endobj
-195 0 obj
+198 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -23493,7 +23335,7 @@ endobj
/Type /Annot
>>
endobj
-196 0 obj
+199 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -23504,7 +23346,7 @@ endobj
/Type /Annot
>>
endobj
-197 0 obj
+200 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -23515,7 +23357,7 @@ endobj
/Type /Annot
>>
endobj
-198 0 obj
+201 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -23526,7 +23368,7 @@ endobj
/Type /Annot
>>
endobj
-199 0 obj
+202 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -23537,7 +23379,7 @@ endobj
/Type /Annot
>>
endobj
-200 0 obj
+203 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -23548,7 +23390,7 @@ endobj
/Type /Annot
>>
endobj
-201 0 obj
+204 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -23559,7 +23401,7 @@ endobj
/Type /Annot
>>
endobj
-202 0 obj
+205 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -23570,7 +23412,7 @@ endobj
/Type /Annot
>>
endobj
-203 0 obj
+206 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -23581,7 +23423,7 @@ endobj
/Type /Annot
>>
endobj
-204 0 obj
+207 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -23592,7 +23434,7 @@ endobj
/Type /Annot
>>
endobj
-205 0 obj
+208 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -23603,7 +23445,7 @@ endobj
/Type /Annot
>>
endobj
-206 0 obj
+209 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -23614,7 +23456,7 @@ endobj
/Type /Annot
>>
endobj
-207 0 obj
+210 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -23625,7 +23467,7 @@ endobj
/Type /Annot
>>
endobj
-208 0 obj
+211 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -23636,7 +23478,7 @@ endobj
/Type /Annot
>>
endobj
-209 0 obj
+212 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -23647,7 +23489,7 @@ endobj
/Type /Annot
>>
endobj
-210 0 obj
+213 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -23658,7 +23500,7 @@ endobj
/Type /Annot
>>
endobj
-211 0 obj
+214 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -23669,7 +23511,7 @@ endobj
/Type /Annot
>>
endobj
-212 0 obj
+215 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -23680,7 +23522,7 @@ endobj
/Type /Annot
>>
endobj
-213 0 obj
+216 0 obj
<< /Length 28868
>>
stream
@@ -25741,23 +25583,23 @@ Q
endstream
endobj
-214 0 obj
+217 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 213 0 R
+/Contents 216 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/Font << /F2.0 20 0 R
/F3.0 43 0 R
/F1.0 8 0 R
>>
-/XObject << /Stamp1 1934 0 R
+/XObject << /Stamp1 1874 0 R
>>
>>
-/Annots [215 0 R 216 0 R 217 0 R 218 0 R 219 0 R 220 0 R 221 0 R 222 0 R 223 0 R 224 0 R 225 0 R 226 0 R 227 0 R 228 0 R 229 0 R 230 0 R 231 0 R 232 0 R 233 0 R 234 0 R 235 0 R 236 0 R 237 0 R 238 0 R 239 0 R 240 0 R 241 0 R 242 0 R 243 0 R 244 0 R 245 0 R 246 0 R 247 0 R]
+/Annots [218 0 R 219 0 R 220 0 R 221 0 R 222 0 R 223 0 R 224 0 R 225 0 R 226 0 R 227 0 R 228 0 R 229 0 R 230 0 R 231 0 R 232 0 R 233 0 R 234 0 R 235 0 R 236 0 R 237 0 R 238 0 R 239 0 R 240 0 R 241 0 R 242 0 R 243 0 R 244 0 R 245 0 R 246 0 R 247 0 R 248 0 R 249 0 R 250 0 R]
>>
endobj
-215 0 obj
+218 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -25768,7 +25610,7 @@ endobj
/Type /Annot
>>
endobj
-216 0 obj
+219 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -25779,7 +25621,7 @@ endobj
/Type /Annot
>>
endobj
-217 0 obj
+220 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -25790,7 +25632,7 @@ endobj
/Type /Annot
>>
endobj
-218 0 obj
+221 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -25801,7 +25643,7 @@ endobj
/Type /Annot
>>
endobj
-219 0 obj
+222 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -25812,7 +25654,7 @@ endobj
/Type /Annot
>>
endobj
-220 0 obj
+223 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -25823,7 +25665,7 @@ endobj
/Type /Annot
>>
endobj
-221 0 obj
+224 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -25834,7 +25676,7 @@ endobj
/Type /Annot
>>
endobj
-222 0 obj
+225 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -25845,7 +25687,7 @@ endobj
/Type /Annot
>>
endobj
-223 0 obj
+226 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -25856,7 +25698,7 @@ endobj
/Type /Annot
>>
endobj
-224 0 obj
+227 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -25867,7 +25709,7 @@ endobj
/Type /Annot
>>
endobj
-225 0 obj
+228 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -25878,7 +25720,7 @@ endobj
/Type /Annot
>>
endobj
-226 0 obj
+229 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -25889,7 +25731,7 @@ endobj
/Type /Annot
>>
endobj
-227 0 obj
+230 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -25900,7 +25742,7 @@ endobj
/Type /Annot
>>
endobj
-228 0 obj
+231 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -25911,7 +25753,7 @@ endobj
/Type /Annot
>>
endobj
-229 0 obj
+232 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -25922,7 +25764,7 @@ endobj
/Type /Annot
>>
endobj
-230 0 obj
+233 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -25933,7 +25775,7 @@ endobj
/Type /Annot
>>
endobj
-231 0 obj
+234 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -25944,7 +25786,7 @@ endobj
/Type /Annot
>>
endobj
-232 0 obj
+235 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -25955,7 +25797,7 @@ endobj
/Type /Annot
>>
endobj
-233 0 obj
+236 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -25966,7 +25808,7 @@ endobj
/Type /Annot
>>
endobj
-234 0 obj
+237 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -25977,7 +25819,7 @@ endobj
/Type /Annot
>>
endobj
-235 0 obj
+238 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -25988,7 +25830,7 @@ endobj
/Type /Annot
>>
endobj
-236 0 obj
+239 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -25999,7 +25841,7 @@ endobj
/Type /Annot
>>
endobj
-237 0 obj
+240 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -26010,7 +25852,7 @@ endobj
/Type /Annot
>>
endobj
-238 0 obj
+241 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -26021,7 +25863,7 @@ endobj
/Type /Annot
>>
endobj
-239 0 obj
+242 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -26032,7 +25874,7 @@ endobj
/Type /Annot
>>
endobj
-240 0 obj
+243 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -26043,7 +25885,7 @@ endobj
/Type /Annot
>>
endobj
-241 0 obj
+244 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -26054,7 +25896,7 @@ endobj
/Type /Annot
>>
endobj
-242 0 obj
+245 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -26065,7 +25907,7 @@ endobj
/Type /Annot
>>
endobj
-243 0 obj
+246 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -26076,7 +25918,7 @@ endobj
/Type /Annot
>>
endobj
-244 0 obj
+247 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -26087,7 +25929,7 @@ endobj
/Type /Annot
>>
endobj
-245 0 obj
+248 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -26098,7 +25940,7 @@ endobj
/Type /Annot
>>
endobj
-246 0 obj
+249 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -26109,7 +25951,7 @@ endobj
/Type /Annot
>>
endobj
-247 0 obj
+250 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -26120,7 +25962,7 @@ endobj
/Type /Annot
>>
endobj
-248 0 obj
+251 0 obj
<< /Length 23013
>>
stream
@@ -27785,23 +27627,23 @@ Q
endstream
endobj
-249 0 obj
+252 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 248 0 R
+/Contents 251 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/Font << /F2.0 20 0 R
/F3.0 43 0 R
/F1.0 8 0 R
>>
-/XObject << /Stamp1 1934 0 R
+/XObject << /Stamp1 1874 0 R
>>
>>
-/Annots [250 0 R 251 0 R 252 0 R 253 0 R 254 0 R 255 0 R 256 0 R 257 0 R 258 0 R 259 0 R 260 0 R 261 0 R 262 0 R 263 0 R 264 0 R 265 0 R 266 0 R 267 0 R 268 0 R 269 0 R 270 0 R 271 0 R 272 0 R 273 0 R 274 0 R 275 0 R 276 0 R 277 0 R 278 0 R]
+/Annots [253 0 R 254 0 R 255 0 R 256 0 R 257 0 R 258 0 R 259 0 R 260 0 R 261 0 R 262 0 R 263 0 R 264 0 R 265 0 R 266 0 R 267 0 R 268 0 R 269 0 R 270 0 R 271 0 R 272
<TRUNCATED>
[08/39] isis-site git commit: ISIS-1810: updates docs for 2.0.0-M1
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/274edd1d/content/versions/SNAPSHOT/guides/ugbtb/ugbtb.html
----------------------------------------------------------------------
diff --git a/content/versions/SNAPSHOT/guides/ugbtb/ugbtb.html b/content/versions/SNAPSHOT/guides/ugbtb/ugbtb.html
index cb599b2..c2b30bb 100644
--- a/content/versions/SNAPSHOT/guides/ugbtb/ugbtb.html
+++ b/content/versions/SNAPSHOT/guides/ugbtb/ugbtb.html
@@ -580,14 +580,14 @@ msgstr "Ich heisse {firstName} {lastName}."</code></pre>
<p>then the translation would be: "Ich heisse James Bond".</p>
</div>
<div class="paragraph">
- <p>The same class is used in <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_DomainObjectContainer"><code>DomainObjectContainer</code></a> so that you can raise translatable info, warning and error messages; each of the relevant methods are overloaded.</p>
+ <p>The same class is used in <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_MessageService"><code>MessageService</code></a> so that you can raise translatable info, warning and error messages; each of the relevant methods are overloaded.</p>
</div>
<div class="paragraph">
<p>For example:</p>
</div>
<div class="listingblock">
<div class="content">
- <pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">interface</span> <span class="class">DomainObjectContainer</span> {
+ <pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">interface</span> <span class="class">MessageService</span> {
<span class="type">void</span> informUser(<span class="predefined-type">String</span> message);
<span class="type">void</span> informUser(
TranslatableMessage message,
@@ -1497,7 +1497,7 @@ log4j.additivity.org.apache.isis.core.runtime.services.i18n.po.PotWriter=false</
<p>The framework provides default implementations for many of the <a href="../rgsvc/rgsvc.html">domain services</a>. This is convenient, but sometimes you will want to replace the default implementation with your own service implementation.</p>
</div>
<div class="paragraph">
- <p>For example, suppose you wanted to provide your own implementation of <a href="../rgsvc/rgsvc.html#_rgsvc_api_LocaleProvider"><code>LocaleProvider</code></a>. The trick is to use the <a href="../rgant/rgant.html#_rgant-DomainService_menuOrder"><code>@DomainService#menuOrder()</code></a> attribute, specifying a low number (typically <code>"1"</code>).</p>
+ <p>For example, suppose you wanted to provide your own implementation of <a href="../rgsvc/rgsvc.html#_rgsvc_presentation-layer-spi_LocaleProvider"><code>LocaleProvider</code></a>. The trick is to use the <a href="../rgant/rgant.html#_rgant-DomainService_menuOrder"><code>@DomainService#menuOrder()</code></a> attribute, specifying a low number (typically <code>"1"</code>).</p>
</div>
<div class="paragraph">
<p>Here’s how:</p>
@@ -2124,7 +2124,7 @@ serviceRegistry.injectServicesInto(viewModel);</code></pre>
<span class="keyword">if</span>(original != <span class="predefined-constant">null</span>) { <i class="conum" data-value="2"></i><b>(2)</b>
<span class="keyword">return</span> original;
}
- container.flush(); <i class="conum" data-value="3"></i><b>(3)</b>
+ repositoryService.flush(); <i class="conum" data-value="3"></i><b>(3)</b>
<span class="directive">final</span> BreadcrumbModelProvider wicketSession = <i class="conum" data-value="4"></i><b>(4)</b>
(BreadcrumbModelProvider) AuthenticatedWebSession.get();
@@ -2150,7 +2150,7 @@ serviceRegistry.injectServicesInto(viewModel);</code></pre>
<span class="annotation">@Inject</span>
HomePageProviderService homePageProviderService;
<span class="annotation">@Inject</span>
- DomainObjectContainer container;
+ RepositoryService repositoryService;
}</code></pre>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/isis-site/blob/274edd1d/content/versions/SNAPSHOT/guides/ugbtb/ugbtb.pdf
----------------------------------------------------------------------
diff --git a/content/versions/SNAPSHOT/guides/ugbtb/ugbtb.pdf b/content/versions/SNAPSHOT/guides/ugbtb/ugbtb.pdf
index 06567ed..f73aae5 100644
--- a/content/versions/SNAPSHOT/guides/ugbtb/ugbtb.pdf
+++ b/content/versions/SNAPSHOT/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:20180812182557+01'00')
-/ModDate (D:20180812182557+01'00')
+/CreationDate (D:20180814003931+02'00')
+/ModDate (D:20180814003931+02'00')
>>
endobj
2 0 obj
@@ -9941,7 +9941,7 @@ endobj
>>
endobj
73 0 obj
-<< /Length 24000
+<< /Length 23976
>>
stream
q
@@ -10023,7 +10023,7 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-0.117 Tw
+0.580 Tw
BT
48.24 687.9259999999999 Td
@@ -10038,12 +10038,12 @@ ET
0.694 0.129 0.275 scn
0.694 0.129 0.275 SCN
-0.117 Tw
+0.580 Tw
BT
-175.57476406249998 687.9259999999999 Td
+178.34996630859376 687.9259999999999 Td
/F3.0 10.5 Tf
-<446f6d61696e4f626a656374436f6e7461696e6572> Tj
+<4d65737361676553657276696365> Tj
ET
@@ -10053,12 +10053,12 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-0.117 Tw
+0.580 Tw
BT
-285.8247640625 687.9259999999999 Td
+251.84996630859376 687.9259999999999 Td
/F1.0 10.5 Tf
-[<20736f207468617420796f752063616e2072> 20.01953125 <61697365207472> 20.01953125 <616e736c617461626c6520696e666f2c207761726e696e6720616e64>] TJ
+[<20736f207468617420796f752063616e2072> 20.01953125 <61697365207472> 20.01953125 <616e736c617461626c6520696e666f2c207761726e696e6720616e64206572726f72>] TJ
ET
@@ -10071,7 +10071,7 @@ ET
BT
48.24 672.146 Td
/F1.0 10.5 Tf
-<6572726f72206d657373616765733b2065616368206f66207468652072656c6576616e74206d6574686f647320617265206f7665726c6f616465642e> Tj
+<6d657373616765733b2065616368206f66207468652072656c6576616e74206d6574686f647320617265206f7665726c6f616465642e> Tj
ET
0.000 0.000 0.000 SCN
@@ -10164,7 +10164,7 @@ ET
BT
152.74 605.725 Td
/F3.0 11 Tf
-<446f6d61696e4f626a656374436f6e7461696e6572> Tj
+<4d65737361676553657276696365> Tj
ET
0.000 0.000 0.000 SCN
@@ -10173,7 +10173,7 @@ ET
0.200 0.200 0.200 SCN
BT
-268.24 605.725 Td
+229.74 605.725 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -10184,7 +10184,7 @@ ET
0.200 0.200 0.200 SCN
BT
-273.74 605.725 Td
+235.24 605.725 Td
/F3.0 11 Tf
<7b> Tj
ET
@@ -11502,10 +11502,10 @@ endobj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
-/URI (../rgsvc/rgsvc.pdf#_rgsvc_core-domain-api_DomainObjectContainer)
+/URI (../rgsvc/rgsvc.pdf#_rgsvc_core-domain-api_MessageService)
>>
/Subtype /Link
-/Rect [175.57476406249998 686.4559999999999 285.8247640625 696.9559999999999]
+/Rect [178.34996630859376 686.4559999999999 251.84996630859376 696.9559999999999]
/Type /Annot
>>
endobj
@@ -28897,7 +28897,7 @@ endobj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
-/URI (../rgsvc/rgsvc.pdf#_rgsvc_api_LocaleProvider)
+/URI (../rgsvc/rgsvc.pdf#_rgsvc_presentation-layer-spi_LocaleProvider)
>>
/Subtype /Link
/Rect [423.1879753605769 697.8359999999999 496.6879753605769 708.3359999999999]
@@ -46506,7 +46506,7 @@ endobj
>>
endobj
247 0 obj
-<< /Length 50470
+<< /Length 50478
>>
stream
q
@@ -47328,7 +47328,7 @@ ET
BT
103.24000000000001 665.145 Td
/F3.0 11 Tf
-<636f6e7461696e6572> Tj
+<7265706f7369746f727953657276696365> Tj
ET
0.000 0.000 0.000 SCN
@@ -47337,7 +47337,7 @@ ET
0.200 0.200 0.200 SCN
BT
-152.74 665.145 Td
+196.74 665.145 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -47348,7 +47348,7 @@ ET
0.200 0.200 0.200 SCN
BT
-158.24 665.145 Td
+202.24 665.145 Td
/F3.0 11 Tf
<666c757368> Tj
ET
@@ -47359,7 +47359,7 @@ ET
0.200 0.200 0.200 SCN
BT
-185.74 665.145 Td
+229.74 665.145 Td
/F3.0 11 Tf
<28> Tj
ET
@@ -47370,7 +47370,7 @@ ET
0.200 0.200 0.200 SCN
BT
-191.24 665.145 Td
+235.24 665.145 Td
/F3.0 11 Tf
<29> Tj
ET
@@ -47381,7 +47381,7 @@ ET
0.200 0.200 0.200 SCN
BT
-196.74 665.145 Td
+240.74 665.145 Td
/F3.0 11 Tf
<3b> Tj
ET
@@ -47392,9 +47392,9 @@ ET
0.200 0.200 0.200 SCN
BT
-202.24 665.145 Td
+246.24 665.145 Td
/F3.0 11 Tf
-<202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020> Tj
+<20202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020> Tj
ET
0.000 0.000 0.000 SCN
@@ -49748,7 +49748,7 @@ ET
BT
81.24000000000001 281.9049999999998 Td
/F3.0 11 Tf
-<446f6d61696e4f626a656374436f6e7461696e6572> Tj
+<5265706f7369746f727953657276696365> Tj
ET
0.000 0.000 0.000 SCN
@@ -49757,7 +49757,7 @@ ET
0.200 0.200 0.200 SCN
BT
-196.74 281.9049999999998 Td
+174.74 281.9049999999998 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -49768,9 +49768,9 @@ ET
0.200 0.200 0.200 SCN
BT
-202.24 281.9049999999998 Td
+180.24 281.9049999999998 Td
/F3.0 11 Tf
-<636f6e7461696e6572> Tj
+<7265706f7369746f727953657276696365> Tj
ET
0.000 0.000 0.000 SCN
@@ -49779,7 +49779,7 @@ ET
0.200 0.200 0.200 SCN
BT
-251.74 281.9049999999998 Td
+273.74 281.9049999999998 Td
/F3.0 11 Tf
<3b> Tj
ET
@@ -92211,180 +92211,180 @@ xref
0000164737 00000 n
0000164993 00000 n
0000165199 00000 n
-0000189253 00000 n
-0000189536 00000 n
-0000189782 00000 n
-0000189838 00000 n
-0000190089 00000 n
-0000190145 00000 n
-0000190348 00000 n
-0000212172 00000 n
-0000212424 00000 n
-0000212479 00000 n
-0000221882 00000 n
-0000222138 00000 n
-0000222193 00000 n
-0000222416 00000 n
-0000233541 00000 n
-0000233767 00000 n
-0000244315 00000 n
-0000244541 00000 n
-0000255399 00000 n
-0000255662 00000 n
-0000255717 00000 n
-0000255938 00000 n
-0000256146 00000 n
-0000283768 00000 n
-0000284050 00000 n
-0000284306 00000 n
-0000284362 00000 n
-0000302998 00000 n
-0000303312 00000 n
-0000303527 00000 n
-0000303745 00000 n
-0000303974 00000 n
-0000304032 00000 n
-0000304090 00000 n
-0000304136 00000 n
-0000320664 00000 n
-0000320923 00000 n
-0000320980 00000 n
-0000321232 00000 n
-0000321289 00000 n
-0000321347 00000 n
-0000321405 00000 n
-0000321933 00000 n
-0000322531 00000 n
-0000334784 00000 n
-0000335038 00000 n
-0000335084 00000 n
-0000335141 00000 n
-0000369796 00000 n
-0000370129 00000 n
-0000370175 00000 n
-0000370357 00000 n
-0000370552 00000 n
-0000370757 00000 n
-0000371005 00000 n
-0000371062 00000 n
-0000371328 00000 n
-0000371590 00000 n
-0000371851 00000 n
-0000390197 00000 n
-0000390519 00000 n
-0000390565 00000 n
-0000390798 00000 n
-0000391028 00000 n
-0000391256 00000 n
-0000391470 00000 n
-0000409759 00000 n
-0000413716 00000 n
-0000420685 00000 n
-0000421017 00000 n
-0000421223 00000 n
-0000421280 00000 n
-0000421523 00000 n
-0000421736 00000 n
-0000421949 00000 n
-0000422190 00000 n
-0000422434 00000 n
-0000422647 00000 n
-0000450357 00000 n
-0000453926 00000 n
-0000454789 00000 n
-0000455042 00000 n
-0000472124 00000 n
-0000472431 00000 n
-0000472477 00000 n
-0000472683 00000 n
-0000472893 00000 n
-0000473108 00000 n
-0000473323 00000 n
-0000473538 00000 n
-0000473742 00000 n
-0000473799 00000 n
-0000473856 00000 n
-0000474082 00000 n
-0000484829 00000 n
-0000487984 00000 n
-0000488283 00000 n
-0000488479 00000 n
-0000488525 00000 n
-0000496824 00000 n
-0000497025 00000 n
-0000497229 00000 n
-0000506196 00000 n
-0000523248 00000 n
-0000523576 00000 n
-0000523777 00000 n
-0000533262 00000 n
-0000533472 00000 n
-0000533698 00000 n
-0000533912 00000 n
-0000534127 00000 n
-0000553106 00000 n
-0000553381 00000 n
-0000553427 00000 n
-0000553622 00000 n
-0000553852 00000 n
-0000554078 00000 n
-0000583622 00000 n
-0000583936 00000 n
-0000584178 00000 n
-0000584414 00000 n
-0000584645 00000 n
-0000584691 00000 n
-0000603900 00000 n
-0000604212 00000 n
-0000604258 00000 n
-0000604483 00000 n
-0000604540 00000 n
-0000604791 00000 n
-0000605045 00000 n
-0000605103 00000 n
-0000605350 00000 n
-0000605552 00000 n
-0000605743 00000 n
-0000621971 00000 n
-0000622254 00000 n
-0000622311 00000 n
-0000622515 00000 n
-0000622711 00000 n
-0000622969 00000 n
-0000623027 00000 n
-0000623699 00000 n
-0000623937 00000 n
-0000653996 00000 n
-0000654237 00000 n
-0000688989 00000 n
-0000689272 00000 n
-0000689474 00000 n
-0000689663 00000 n
-0000689720 00000 n
-0000689944 00000 n
-0000690189 00000 n
-0000730555 00000 n
-0000730809 00000 n
-0000730866 00000 n
-0000737582 00000 n
-0000767911 00000 n
-0000768202 00000 n
-0000768395 00000 n
-0000775147 00000 n
-0000775368 00000 n
-0000817246 00000 n
-0000817500 00000 n
-0000817558 00000 n
-0000827682 00000 n
-0000828005 00000 n
-0000828051 00000 n
-0000828108 00000 n
-0000828334 00000 n
-0000828391 00000 n
-0000828615 00000 n
-0000828790 00000 n
-0000829040 00000 n
-0000829258 00000 n
+0000189229 00000 n
+0000189512 00000 n
+0000189755 00000 n
+0000189811 00000 n
+0000190062 00000 n
+0000190118 00000 n
+0000190321 00000 n
+0000212145 00000 n
+0000212397 00000 n
+0000212452 00000 n
+0000221855 00000 n
+0000222111 00000 n
+0000222166 00000 n
+0000222389 00000 n
+0000233514 00000 n
+0000233740 00000 n
+0000244288 00000 n
+0000244514 00000 n
+0000255372 00000 n
+0000255635 00000 n
+0000255690 00000 n
+0000255911 00000 n
+0000256119 00000 n
+0000283741 00000 n
+0000284023 00000 n
+0000284279 00000 n
+0000284335 00000 n
+0000302971 00000 n
+0000303285 00000 n
+0000303500 00000 n
+0000303718 00000 n
+0000303947 00000 n
+0000304005 00000 n
+0000304063 00000 n
+0000304109 00000 n
+0000320637 00000 n
+0000320896 00000 n
+0000320953 00000 n
+0000321205 00000 n
+0000321262 00000 n
+0000321320 00000 n
+0000321378 00000 n
+0000321906 00000 n
+0000322504 00000 n
+0000334757 00000 n
+0000335011 00000 n
+0000335057 00000 n
+0000335114 00000 n
+0000369769 00000 n
+0000370102 00000 n
+0000370148 00000 n
+0000370330 00000 n
+0000370525 00000 n
+0000370730 00000 n
+0000370978 00000 n
+0000371035 00000 n
+0000371301 00000 n
+0000371563 00000 n
+0000371824 00000 n
+0000390170 00000 n
+0000390492 00000 n
+0000390538 00000 n
+0000390771 00000 n
+0000391001 00000 n
+0000391229 00000 n
+0000391443 00000 n
+0000409732 00000 n
+0000413689 00000 n
+0000420658 00000 n
+0000420990 00000 n
+0000421196 00000 n
+0000421253 00000 n
+0000421496 00000 n
+0000421709 00000 n
+0000421922 00000 n
+0000422163 00000 n
+0000422407 00000 n
+0000422620 00000 n
+0000450330 00000 n
+0000453899 00000 n
+0000454762 00000 n
+0000455015 00000 n
+0000472097 00000 n
+0000472404 00000 n
+0000472450 00000 n
+0000472656 00000 n
+0000472866 00000 n
+0000473081 00000 n
+0000473296 00000 n
+0000473511 00000 n
+0000473715 00000 n
+0000473772 00000 n
+0000473829 00000 n
+0000474055 00000 n
+0000484802 00000 n
+0000487957 00000 n
+0000488256 00000 n
+0000488452 00000 n
+0000488498 00000 n
+0000496797 00000 n
+0000496998 00000 n
+0000497202 00000 n
+0000506169 00000 n
+0000523221 00000 n
+0000523549 00000 n
+0000523750 00000 n
+0000533235 00000 n
+0000533445 00000 n
+0000533671 00000 n
+0000533885 00000 n
+0000534100 00000 n
+0000553079 00000 n
+0000553354 00000 n
+0000553400 00000 n
+0000553595 00000 n
+0000553844 00000 n
+0000554070 00000 n
+0000583614 00000 n
+0000583928 00000 n
+0000584170 00000 n
+0000584406 00000 n
+0000584637 00000 n
+0000584683 00000 n
+0000603892 00000 n
+0000604204 00000 n
+0000604250 00000 n
+0000604475 00000 n
+0000604532 00000 n
+0000604783 00000 n
+0000605037 00000 n
+0000605095 00000 n
+0000605342 00000 n
+0000605544 00000 n
+0000605735 00000 n
+0000621963 00000 n
+0000622246 00000 n
+0000622303 00000 n
+0000622507 00000 n
+0000622703 00000 n
+0000622961 00000 n
+0000623019 00000 n
+0000623691 00000 n
+0000623929 00000 n
+0000653988 00000 n
+0000654229 00000 n
+0000688981 00000 n
+0000689264 00000 n
+0000689466 00000 n
+0000689655 00000 n
+0000689712 00000 n
+0000689936 00000 n
+0000690181 00000 n
+0000730547 00000 n
+0000730801 00000 n
+0000730858 00000 n
+0000737574 00000 n
+0000767903 00000 n
+0000768194 00000 n
+0000768387 00000 n
+0000775139 00000 n
+0000775360 00000 n
+0000817238 00000 n
+0000817492 00000 n
+0000817550 00000 n
+0000827674 00000 n
+0000827997 00000 n
+0000828043 00000 n
+0000828100 00000 n
+0000828326 00000 n
+0000828383 00000 n
+0000828607 00000 n
+0000828782 00000 n
+0000829032 00000 n
+0000829250 00000 n
0000879783 00000 n
0000880024 00000 n
0000902064 00000 n
http://git-wip-us.apache.org/repos/asf/isis-site/blob/274edd1d/content/versions/SNAPSHOT/guides/ugfun/ugfun.html
----------------------------------------------------------------------
diff --git a/content/versions/SNAPSHOT/guides/ugfun/ugfun.html b/content/versions/SNAPSHOT/guides/ugfun/ugfun.html
index 9b6c6ff..1ce5993 100644
--- a/content/versions/SNAPSHOT/guides/ugfun/ugfun.html
+++ b/content/versions/SNAPSHOT/guides/ugfun/ugfun.html
@@ -1988,31 +1988,19 @@ table.CodeRay td.code>pre{padding:0}
<div class="ulist">
<ul>
<li> <p><strong>hide</strong> phase allows the subscriber to hide the member</p> </li>
- <li> <p><strong>disable</strong> phase allows the subscriber to disable the member.<br></p> </li>
- </ul>
- </div>
- <div class="paragraph">
- <p>For a property this makes it read-only; for an action this makes it "greyed out". (Collections are implicitly read-only).</p>
- </div>
- <div class="ulist">
- <ul>
- <li> <p><strong>validate</strong> phase allows the subscriber to validate the proposed change.</p> </li>
- </ul>
- </div>
- <div class="paragraph">
- <p>For a property this means validating the proposed new value of the property; for an action this means validating the action parameter arguments. For example, a referential integrity restrict could be implemented here.</p>
- </div>
- <div class="ulist">
- <ul>
- <li> <p><strong>executing</strong> phase is prior to the actual property edit/action invocation, allowing the subscriber to perform side-effects.<br></p> </li>
- </ul>
- </div>
- <div class="paragraph">
- <p>For example, a cascade delete could be implemented here.</p>
- </div>
- <div class="ulist">
- <ul>
- <li> <p><strong>executed</strong> phase is after the actual property edit/action invocation.<br></p>
+ <li> <p><strong>disable</strong> phase allows the subscriber to disable the member.</p>
+ <div class="paragraph">
+ <p>For a property this makes it read-only; for an action this makes it "greyed out". (Collections are implicitly read-only).</p>
+ </div> </li>
+ <li> <p><strong>validate</strong> phase allows the subscriber to validate the proposed change.</p>
+ <div class="paragraph">
+ <p>For a property this means validating the proposed new value of the property; for an action this means validating the action parameter arguments. For example, a referential integrity restrict could be implemented here.</p>
+ </div> </li>
+ <li> <p><strong>executing</strong> phase is prior to the actual property edit/action invocation, allowing the subscriber to perform side-effects.</p>
+ <div class="paragraph">
+ <p>For example, a cascade delete could be implemented here.</p>
+ </div> </li>
+ <li> <p><strong>executed</strong> phase is after the actual property edit/action invocation.</p>
<div class="paragraph">
<p>For example, a business audit event could be implemented here.</p>
</div> </li>
@@ -6854,19 +6842,16 @@ public <span class="type">class</span> <span class="class">ToDoItemV1_1</span> <
<p>When a domain object is rendered, the framework will automatically instantiate all required mixins and delegate to them dynamically. If writing integration tests or fixtures, or (sometimes) just regular domain logic, then you may need to instantiate mixins directly.</p>
</div>
<div class="paragraph">
- <p>For this you can use the xref:../rgsvc/rgsvc.adoc#_rgsvc_core-domain-api_DomainObjectContainer_object-creation-api[<code>DomainObjectContainer#mixin(…)</code> method.</p>
+ <p>For this you can use the xref:../rgsvc/rgsvc.adoc#_rgsvc_core-domain-api_FactoryService[<code>FactoryService#mixin(…)</code> method.</p>
</div>
<div class="paragraph">
<p>For example:</p>
</div>
<div class="listingblock">
<div class="content">
- <pre class="CodeRay highlight"><code data-lang="java">DocumentHolder_documents mixin = container.mixin(DocumentHolder_documents.class, customer);</code></pre>
+ <pre class="CodeRay highlight"><code data-lang="java">DocumentHolder_documents mixin = factoryService.mixin(DocumentHolder_documents.class, customer);</code></pre>
</div>
</div>
- <div class="paragraph">
- <p>The <a href="../ugtst/ugtst.html#__ugtst_integ-test-support_bootstrapping_IntegrationTestAbstract"><code>IntegrationTestAbstract</code></a> and <a href="../rgcms/rgcms.html#_rgcms_classes_super_FixtureScript"><code>FixtureScript</code></a> classes both provide a <code>mixin(…)</code> convenience method.</p>
- </div>
<div id="_ugfun_programming-model_mixins_contributed-services" class="paragraph">
<p>= Contributed services (deprecated)</p>
</div>
@@ -7552,14 +7537,17 @@ 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 (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>
+ <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).</p>
+ </div>
+ <div class="paragraph">
+ <p>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>
</table>
</div>
<div class="paragraph">
- <p>The framework also supports i18n: locale-specific names and descriptions. for more information, see the <a href="../ugbtb/ugbtb.html#_ugbtb_i18n">beyond-the-basics</a> guide.</p>
+ <p>The framework also supports i18n: locale-specific names and descriptions. For more information, see the <a href="../ugbtb/ugbtb.html#_ugbtb_i18n">beyond-the-basics</a> guide.</p>
</div>
<div id="_ugfun_ui-hints_eager-rendering" class="paragraph">
<p>= Eager rendering :Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. <a href="http://www.apache.org/licenses/LICENSE-2.0" class="bare">http://www.apache.org/licenses/LICENSE-2.0</a> . Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.</p>
@@ -7634,7 +7622,7 @@ public <span class="type">class</span> <span class="class">ToDoItemV1_1</span> <
<td class="icon"> <i class="fa icon-note" title="Note"></i> </td>
<td class="content">
<div class="paragraph">
- <p>The main domain services used are <a href="../rgsvc/rgsvc.html#_rgsvc_persistence-layer-api_RepositoryService"><code>RepositoryService</code></a> and <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_FactoryService"><code>FactoryService</code></a>. These (and some other services) replace the now deprecated <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_DomainObjectContainer"><code>DomainObjectContainer</code></a>.</p>
+ <p>The main domain services used are <a href="../rgsvc/rgsvc.html#_rgsvc_persistence-layer-api_RepositoryService"><code>RepositoryService</code></a> and <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_FactoryService"><code>FactoryService</code></a>.</p>
</div> </td>
</tr>
</tbody>
@@ -8410,18 +8398,11 @@ repositoryService.remove(customer);</code></pre>
</div>
<div class="ulist">
<ul>
- <li> <p><a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_DomainObjectContainer"><code>DomainObjectContainer</code></a>; mostly deprecated, replaced by:</p>
- <div class="ulist">
- <ul>
- <li> <p><a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_ClockService"><code>ClockService</code></a></p> </li>
- <li> <p><a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_ConfigurationService"><code>ConfigurationService</code></a></p> </li>
- <li> <p><a href="../rgsvc/rgsvc.html#_rgsvc_application-layer-api_MessageService"><code>MessageService</code></a></p> </li>
- <li> <p><a href="../rgsvc/rgsvc.html#_rgsvc_persistence-layer-api_RepositoryService"><code>RepositoryService</code></a></p> </li>
- <li> <p><a href="../rgsvc/rgsvc.html#_rgsvc_metadata-api_ServiceRegistry"><code>ServiceRegistry</code></a></p> </li>
- <li> <p><a href="../rgsvc/rgsvc.html#_rgsvc_application-layer-api_TitleService"><code>TitleService</code></a></p> </li>
- <li> <p><a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_UserService"><code>UserService</code></a></p> </li>
- </ul>
- </div> </li>
+ <li> <p><a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_ClockService"><code>ClockService</code></a></p> </li>
+ <li> <p><a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_ConfigurationService"><code>ConfigurationService</code></a></p> </li>
+ <li> <p><a href="../rgsvc/rgsvc.html#_rgsvc_persistence-layer-api_RepositoryService"><code>RepositoryService</code></a></p> </li>
+ <li> <p><a href="../rgsvc/rgsvc.html#_rgsvc_metadata-api_ServiceRegistry"><code>ServiceRegistry</code></a></p> </li>
+ <li> <p><a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_UserService"><code>UserService</code></a></p> </li>
<li> <p><a href="../rgsvc/rgsvc.html#_rgsvc_persistence-layer-api_IsisJdoSupport"><code>IsisJdoSupport</code></a></p> </li>
<li> <p><a href="../rgsvc/rgsvc.html#_rgsvc_application-layer-api_WrapperFactory"><code>WrapperFactory</code></a></p> </li>
<li> <p><a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_EventBusService"><code>EventBusService</code></a></p> </li>
@@ -8486,7 +8467,9 @@ repositoryService.remove(customer);</code></pre>
<li> <p><a href="../rgsvc/rgsvc.html#_rgsvc_application-layer-spi_HomePageProviderService"><code>HomePageProviderService</code></a></p> </li>
<li> <p><a href="../rgsvc/rgsvc.html#_rgsvc_presentation-layer-spi_HintStore"><code>HintStore</code></a> (SPI)</p> </li>
<li> <p><a href="../rgsvc/rgsvc.html#_rgsvc_metadata-api_LayoutService"><code>LayoutService</code></a></p> </li>
+ <li> <p><a href="../rgsvc/rgsvc.html#_rgsvc_application-layer-api_MessageService"><code>MessageService</code></a></p> </li>
<li> <p><a href="../rgsvc/rgsvc.html#_rgsvc_presentation-layer-spi_RoutingService"><code>RoutingService</code></a> (SPI)</p> </li>
+ <li> <p><a href="../rgsvc/rgsvc.html#_rgsvc_application-layer-api_TitleService"><code>TitleService</code></a></p> </li>
<li> <p><a href="../rgsvc/rgsvc.html#_rgsvc_presentation-layer-spi_UrlEncodingService"><code>UrlEncodingService</code></a> (SPI)</p> </li>
</ul>
</div>
[31/39] isis-site git commit: ISIS-1810: updates docs for 2.0.0-M1
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/274edd1d/content/versions/2.0.0-M1/guides/rgcfg/rgcfg.pdf
----------------------------------------------------------------------
diff --git a/content/versions/2.0.0-M1/guides/rgcfg/rgcfg.pdf b/content/versions/2.0.0-M1/guides/rgcfg/rgcfg.pdf
index 5609f91..1071280 100644
--- a/content/versions/2.0.0-M1/guides/rgcfg/rgcfg.pdf
+++ b/content/versions/2.0.0-M1/guides/rgcfg/rgcfg.pdf
@@ -4,8 +4,8 @@
<< /Title <feff0043006f0072006500200043006f006e0066006900672019006e002000500072006f0070006500720074006900650073>
/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:20180812182428+01'00')
-/ModDate (D:20180812182428+01'00')
+/CreationDate (D:20180814003807+02'00')
+/ModDate (D:20180814003807+02'00')
>>
endobj
2 0 obj
http://git-wip-us.apache.org/repos/asf/isis-site/blob/274edd1d/content/versions/2.0.0-M1/guides/rgcms/rgcms.html
----------------------------------------------------------------------
diff --git a/content/versions/2.0.0-M1/guides/rgcms/rgcms.html b/content/versions/2.0.0-M1/guides/rgcms/rgcms.html
index 296e499..7d9da36 100644
--- a/content/versions/2.0.0-M1/guides/rgcms/rgcms.html
+++ b/content/versions/2.0.0-M1/guides/rgcms/rgcms.html
@@ -1153,7 +1153,7 @@ table.CodeRay td.code>pre{padding:0}
<p>The <code>default…()</code> supporting method is called for action parameters to return the initial argument value. This may be some sensible default (eg today’s date, or 0 or 1), or — for an action that is modifying the state of an object — might default to the current value of a corresponding property.</p>
</div>
<div class="paragraph">
- <p>The method is <em>also</em> called for properties in the case when an object is newly instantiated using <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_DomainObjectContainer"><code>DomainObjectContainer#newTransientInstance(…)</code></a>. This is a much less common use case. If a default is not specified then properties are initialized to a default based on their type (eg 0 or <code>false</code>).</p>
+ <p>The method is <em>also</em> called for properties in the case when an object is newly instantiated using <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_RepositoryService"><code>RepositoryService#instantiate(…)</code></a> or <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_FactoryService"><code>FactoryService#instantiate(…)</code></a>. This is a much less common use case. If a default is not specified then properties are initialized to a default based on their type (eg 0 or <code>false</code>).</p>
</div>
<div class="paragraph">
<p>The signature of the supporting method depends on whether it is for an action parameter or a property.</p>
@@ -1294,7 +1294,7 @@ table.CodeRay td.code>pre{padding:0}
<p>There are, in fact, two other ways to set properties of a newly instantiated object to default values.</p>
</div>
<div class="paragraph">
- <p>The first is to use the <a href="../rgcms/rgcms.html#_rgcms_methods_lifecycle_created"><code>created()</code></a> callback, called by the framework when <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_DomainObjectContainer"><code>DomainObjectContainer#newTransientInstance(…)</code></a> is called. This method is called after any dependencies have been injected into the service.</p>
+ <p>The first is to use the <a href="../rgcms/rgcms.html#_rgcms_methods_lifecycle_created"><code>created()</code></a> callback, called by the framework when <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_RepositoryService"><code>RepositoryService#instantiate(…)</code></a> or <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_FactoryService"><code>FactoryService#instantiate(…)</code></a> is called. This method is called after any services have been injected into the domain object.</p>
</div>
<div class="paragraph">
<p>The second is more straightforward: simply initialize properties in the constructor. However, this cannot use any injected services as they will not have been initialized.</p>
@@ -2190,9 +2190,7 @@ table.CodeRay td.code>pre{padding:0}
<pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="directive">final</span> <span class="type">class</span> <span class="class">ToDoAppDomainModule</span> {
<span class="directive">private</span> ToDoAppDomainModule(){}
<span class="directive">public</span> <span class="directive">abstract</span> <span class="directive">static</span> <span class="type">class</span> <span class="class">PropertyDomainEvent</span><S,T>
- <span class="directive">extends</span> org.apache.isis.applib.events.domain.PropertyDomainEvent<S,T> {
- ...
- }
+ <span class="directive">extends</span> org.apache.isis.applib.events.domain.PropertyDomainEvent<S,T> { }
...
}</code></pre>
</div>
@@ -2203,10 +2201,7 @@ table.CodeRay td.code>pre{padding:0}
<div class="listingblock">
<div class="content">
<pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">class</span> <span class="class">ToDoItem</span> ... {
- <span class="directive">public</span> <span class="directive">static</span> <span class="type">class</span> <span class="class">DescriptionDomainEvent</span>
- <span class="directive">extends</span> PropertyDomainEvent<<span class="predefined-type">String</span>> {
- ...
- }
+ <span class="directive">public</span> <span class="directive">static</span> <span class="type">class</span> <span class="class">DescriptionDomainEvent</span> <span class="directive">extends</span> PropertyDomainEvent<<span class="predefined-type">String</span>> { }
<span class="annotation">@Property</span>(
domainEvent = DescriptionDomainEvent.class
)
@@ -2574,20 +2569,14 @@ table.CodeRay td.code>pre{padding:0}
<td class="icon"> <i class="fa icon-warning" title="Warning"></i> </td>
<td class="content">
<div class="paragraph">
- <p>Note that these callbacks are fired by Apache Isis rather than JDO. In the future we may deprecate them because there are better mechanisms available using listeners/subscribers:</p>
- </div>
- <div class="ulist">
- <ul>
- <li> <p>in Isis 1.9.0 and earlier, you may therefore want to consider using the JDO API directly to set up a lifecycle listener; see <a href="../rgcms/rgcms.html#_rgcms_methods_lifecycle_jdo-api">here</a> for further discussion.</p> </li>
- <li> <p>alternatively, you can use a subscriber for the <a href="../rgcms/rgcms.html#_rgcms_classes_lifecycleevent">lifecycle event</a>s fired in Isis.</p> </li>
- </ul>
+ <p>Note that these callbacks are fired by Apache Isis rather than JDO. In the future we may deprecate them because there are better mechanisms available using a subscriber for the <a href="../rgcms/rgcms.html#_rgcms_classes_lifecycleevent">lifecycle event</a>s.</p>
</div> </td>
</tr>
</tbody>
</table>
</div>
<div class="paragraph">
- <p>The lifecycle callback methods supported by Isis are:</p>
+ <p>The lifecycle callback methods supported by Apache Isis are:</p>
</div>
<table class="tableblock frame-all grid-all spread">
<caption class="title">
@@ -2609,7 +2598,7 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p>called when an object has just been created using <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_DomainObjectContainer"><code>newTransientInstance()</code></a></p>
+ <p>called when an object has just been created using <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_FactoryService"><code>FactoryService#instantiate(..)</code></a> or <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_RepositoryService"><code>RepositoryService#instantiate(…)</code></a></p>
</div>
</div></td>
</tr>
@@ -2678,84 +2667,6 @@ table.CodeRay td.code>pre{padding:0}
</tr>
</tbody>
</table>
- <div class="paragraph">
- <p>Some lifecycle methods have been deprecated:</p>
- </div>
- <table class="tableblock frame-all grid-all spread">
- <caption class="title">
- Table 4. Deprecated lifecycle methods
- </caption>
- <colgroup>
- <col style="width: 20%;">
- <col style="width: 80%;">
- </colgroup>
- <thead>
- <tr>
- <th class="tableblock halign-left valign-top">Method</th>
- <th class="tableblock halign-left valign-top">Notes</th>
- </tr>
- </thead>
- <tbody>
- <tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><code>deleted()</code></p></td>
- <td class="tableblock halign-left valign-top">
- <div>
- <div class="paragraph">
- <p>Replaced by <a href="../rgcms/rgcms.html#_rgcms_methods_lifecycle_removed"><code>removed()</code></a></p>
- </div>
- </div></td>
- </tr>
- <tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><code>deleting()</code></p></td>
- <td class="tableblock halign-left valign-top">
- <div>
- <div class="paragraph">
- <p>Replaced by <a href="../rgcms/rgcms.html#_rgcms_methods_lifecycle_removing"><code>removing()</code></a></p>
- </div>
- </div></td>
- </tr>
- <tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><code>loading()</code></p></td>
- <td class="tableblock halign-left valign-top">
- <div>
- <div class="paragraph">
- <p>callback for when the (persistent) object is just about to be loaded from the object store.<br></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>This method is never called.</p>
- </div> </td>
- </tr>
- </tbody>
- </table>
- </div>
- </div></td>
- </tr>
- <tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><code>saved()</code></p></td>
- <td class="tableblock halign-left valign-top">
- <div>
- <div class="paragraph">
- <p>Replaced by <a href="../rgcms/rgcms.html#_rgcms_methods_lifecycle_persisted"><code>persisted()</code></a></p>
- </div>
- </div></td>
- </tr>
- <tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><code>saving()</code></p></td>
- <td class="tableblock halign-left valign-top">
- <div>
- <div class="paragraph">
- <p>Replaced by <a href="../rgcms/rgcms.html#_rgcms_methods_lifecycle_persisting"><code>persisting()</code></a></p>
- </div>
- </div></td>
- </tr>
- </tbody>
- </table>
<div class="sect3">
<h4 id="_rgcms_methods_lifecycle_created">2.3.1. <code>created()</code></h4>
<div class="btn-group" style="float: right; font-size: small; padding: 6px; margin-top: -55px; ">
@@ -2769,7 +2680,7 @@ table.CodeRay td.code>pre{padding:0}
</ul>
</div>
<div class="paragraph">
- <p>The <code>created()</code> lifecycle callback method is called when an object has just been created using <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_DomainObjectContainer"><code>newTransientInstance()</code></a></p>
+ <p>The <code>created()</code> lifecycle callback method is called when an object has just been created using <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_RepositoryService"><code>RepositoryService#instantiate(…)</code></a> or <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_FactoryService"><code>FactoryService#instantiate(…)</code></a></p>
</div>
<div class="admonitionblock tip">
<table>
@@ -3565,7 +3476,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
<table class="tableblock frame-all grid-all spread">
<caption class="title">
- Table 5. Convenience Superclasses
+ Table 4. Convenience Superclasses
</caption>
<colgroup>
<col style="width: 25%;">
@@ -3583,39 +3494,6 @@ table.CodeRay td.code>pre{padding:0}
</thead>
<tbody>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="../rgcms/rgcms.html#_rgcms_classes_super_AbstractContainedObject"><code>o.a.i.applib.</code><br> <code>AbstractContainedObject</code></a></p></td>
- <td class="tableblock halign-left valign-top">
- <div>
- <div class="paragraph">
- <p><code>o.a.i.core</code><br> <code>isis-core-applib</code></p>
- </div>
- </div></td>
- <td class="tableblock halign-left valign-top"><p class="tableblock">(abstract class)</p></td>
- <td class="tableblock halign-left valign-top"></td>
- </tr>
- <tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="../rgcms/rgcms.html#_rgcms_classes_super_AbstractDomainObject"><code>o.a.i.applib.</code><br> <code>AbstractDomainObject</code></a></p></td>
- <td class="tableblock halign-left valign-top">
- <div>
- <div class="paragraph">
- <p><code>o.a.i.core</code><br> <code>isis-core-applib</code></p>
- </div>
- </div></td>
- <td class="tableblock halign-left valign-top"><p class="tableblock">(abstract class)</p></td>
- <td class="tableblock halign-left valign-top"></td>
- </tr>
- <tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="../rgcms/rgcms.html#_rgcms_classes_super_AbstractFactoryAndRepository"><code>o.a.i.applib.</code><br> <code>AbstractFactoryAndRepository</code></a></p></td>
- <td class="tableblock halign-left valign-top">
- <div>
- <div class="paragraph">
- <p><code>o.a.i.core</code><br> <code>isis-core-applib</code></p>
- </div>
- </div></td>
- <td class="tableblock halign-left valign-top"><p class="tableblock">(abstract class)</p></td>
- <td class="tableblock halign-left valign-top"></td>
- </tr>
- <tr>
<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="../rgcms/rgcms.html#_rgcms_classes_super_AbstractService"><code>o.a.i.applib.</code><br> <code>AbstractService</code></a></p></td>
<td class="tableblock halign-left valign-top">
<div>
@@ -3667,98 +3545,13 @@ table.CodeRay td.code>pre{padding:0}
<p><code>o.a.i.core</code><br> <code>isis-core-applib</code></p>
</div>
</div></td>
- <td class="tableblock halign-left valign-top"><p class="tableblock">(abstract class).<br> <code>FixtureScriptsDefault</code> is a default implementation that is used when the alternative <a href="../rgsvc/rgsvc.html#_rgsvc_api_FixtureScriptsSpecificationProvider"><code>FixtureScriptsSpecificationProvider</code></a> is provided (and no other implementation of <code>FixtureScripts</code> was found).</p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock">(abstract class).<br> <code>FixtureScriptsDefault</code> is a default implementation that is used when the alternative <a href="../rgsvc/rgsvc.html#_rgsvc_testing_FixtureScriptsSpecificationProvider"><code>FixtureScriptsSpecificationProvider</code></a> is provided (and no other implementation of <code>FixtureScripts</code> was found).</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">depends on:<br> <code>ClassDiscoveryService</code></p></td>
</tr>
</tbody>
</table>
<div class="sect3">
- <h4 id="_rgcms_classes_super_AbstractContainedObject">3.2.1. <code>AbstractContainedObject</code></h4>
- <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="https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_classes_super_AbstractContainedObject.adoc""><i class="fa fa-pencil-square-o"></i> 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/rgcms/_rgcms_classes_super_AbstractContainedObject.adoc" target="_blank"><i class="fa fa-pencil-square-o fa-fw" aria-hidden="true"></i> Edit</a></li>
- <li><a href="https://github.com/apache/isis/commits/master/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_classes_super_AbstractContainedObject.adoc" target="_blank"><i class="fa fa-clock-o fa-fw" aria-hidden="true"></i> History</a></li>
- <li><a href="https://github.com/apache/isis/raw/master/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_classes_super_AbstractContainedObject.adoc" target="_blank"><i class="fa fa-file-text-o fa-fw" aria-hidden="true"></i> Raw</a></li>
- <li><a href="https://github.com/apache/isis/blame/master/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_classes_super_AbstractContainedObject.adoc" target="_blank"><i class="fa fa-hand-o-right fa-fw" aria-hidden="true"></i> Blame</a></li>
- </ul>
- </div>
- <div class="paragraph">
- <p>This class is a convenience superclass for domain objects and services, providing general purpose methods for interacting with the framework. These include:</p>
- </div>
- <div class="ulist">
- <ul>
- <li> <p><code>allMatches(Query)</code> - search for all objects matching the specified <code>Query</code>.<br></p>
- <div class="paragraph">
- <p>+ Note that this, and other similar methods (eg <code>firstMatch(…)</code>, <code>uniqueMatch(…)</code>) will automatically flush the current transaction.</p>
- </div> </li>
- <li> <p><code>newTransientInstance(Class)</code> - to create a new instance of an object, with any services injected into it</p> </li>
- <li> <p><code>persistIfNotAlready(Object)</code> - to persist an object<br></p>
- <div class="paragraph">
- <p>In fact, the object is queued up to be persisted, and is only actually persisted either when the transaction commits, or when the transaction is flushed (typically when a query is performed).</p>
- </div> </li>
- <li> <p><code>warnUser(String)</code> - generate a warning to the user</p> </li>
- <li> <p><code>getContainer()</code> - which returns the <code>DomainObjectContainer</code></p> </li>
- </ul>
- </div>
- <div class="paragraph">
- <p>Each of these methods simply delegates to an equivalent method in <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_DomainObjectContainer"><code>DomainObjectContainer</code></a>.</p>
- </div>
- <div class="admonitionblock tip">
- <table>
- <tbody>
- <tr>
- <td class="icon"> <i class="fa icon-tip" title="Tip"></i> </td>
- <td class="content">
- <div class="paragraph">
- <p>In practice we find that there’s little to gain from subclassing; it’s easier/less obscure to simply inject <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_DomainObjectContainer"><code>DomainObjectContainer</code></a> into a simple pojo class.</p>
- </div> </td>
- </tr>
- </tbody>
- </table>
- </div>
- </div>
- <div class="sect3">
- <h4 id="_rgcms_classes_super_AbstractDomainObject">3.2.2. <code>AbstractDomainObject</code></h4>
- <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="https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_classes_super_AbstractDomainObject.adoc""><i class="fa fa-pencil-square-o"></i> 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/rgcms/_rgcms_classes_super_AbstractDomainObject.adoc" target="_blank"><i class="fa fa-pencil-square-o fa-fw" aria-hidden="true"></i> Edit</a></li>
- <li><a href="https://github.com/apache/isis/commits/master/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_classes_super_AbstractDomainObject.adoc" target="_blank"><i class="fa fa-clock-o fa-fw" aria-hidden="true"></i> History</a></li>
- <li><a href="https://github.com/apache/isis/raw/master/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_classes_super_AbstractDomainObject.adoc" target="_blank"><i class="fa fa-file-text-o fa-fw" aria-hidden="true"></i> Raw</a></li>
- <li><a href="https://github.com/apache/isis/blame/master/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_classes_super_AbstractDomainObject.adoc" target="_blank"><i class="fa fa-hand-o-right fa-fw" aria-hidden="true"></i> Blame</a></li>
- </ul>
- </div>
- <div class="paragraph">
- <p>This class extends <a href="../rgcms/rgcms.html#_rgcms_classes_super_AbstractContainedObject"><code>AbstractContainedObject</code></a>, adding in convenience methods for managing the persistence lifecycle of the object instance.</p>
- </div>
- <div class="paragraph">
- <p>Each of these methods, eg <code>isPersistent(…)</code>, delegates to an equivalent method in <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_DomainObjectContainer"><code>DomainObjectContainer</code></a>.</p>
- </div>
- </div>
- <div class="sect3">
- <h4 id="_rgcms_classes_super_AbstractFactoryAndRepository">3.2.3. <code>AbstractFactoryAndRepository</code></h4>
- <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="https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_classes_super_AbstractFactoryAndRepository.adoc""><i class="fa fa-pencil-square-o"></i> 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/rgcms/_rgcms_classes_super_AbstractFactoryAndRepository.adoc" target="_blank"><i class="fa fa-pencil-square-o fa-fw" aria-hidden="true"></i> Edit</a></li>
- <li><a href="https://github.com/apache/isis/commits/master/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_classes_super_AbstractFactoryAndRepository.adoc" target="_blank"><i class="fa fa-clock-o fa-fw" aria-hidden="true"></i> History</a></li>
- <li><a href="https://github.com/apache/isis/raw/master/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_classes_super_AbstractFactoryAndRepository.adoc" target="_blank"><i class="fa fa-file-text-o fa-fw" aria-hidden="true"></i> Raw</a></li>
- <li><a href="https://github.com/apache/isis/blame/master/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_classes_super_AbstractFactoryAndRepository.adoc" target="_blank"><i class="fa fa-hand-o-right fa-fw" aria-hidden="true"></i> Blame</a></li>
- </ul>
- </div>
- <div class="paragraph">
- <p>This class extends <a href="../rgcms/rgcms.html#_rgcms_classes_super_AbstractContainedObject"><code>AbstractContainedObject</code></a>. Its intent was to be a convenience subclass for services acting as either a repository or a factory, however note that all of the methods that it defines are now deprecated.</p>
- </div>
- <div class="paragraph">
- <p>Instead, indicate that a service is repository using the <a href="../rgant/rgant.html#_rgant-DomainService_repositoryFor"><code>@DomainService#repositoryFor()</code></a> attribute.</p>
- </div>
- </div>
- <div class="sect3">
- <h4 id="_rgcms_classes_super_AbstractService">3.2.4. <code>AbstractService</code></h4>
+ <h4 id="_rgcms_classes_super_AbstractService">3.2.1. <code>AbstractService</code></h4>
<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="https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_classes_super_AbstractService.adoc""><i class="fa fa-pencil-square-o"></i> 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>
@@ -3770,14 +3563,14 @@ table.CodeRay td.code>pre{padding:0}
</ul>
</div>
<div class="paragraph">
- <p>This class extends <a href="../rgcms/rgcms.html#_rgcms_classes_super_AbstractContainedObject"><code>AbstractContainedObject</code></a>, adding in an implementation of <code>getId()</code> based upon the classes name.</p>
+ <p>This class provides an implementation of the optional <code>getId()</code> method for domain services, based upon the classes name.</p>
</div>
<div class="paragraph">
- <p>In practice there is little to gain from subclassing; simply inject <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_DomainObjectContainer"><code>DomainObjectContainer</code></a> for broadly equivalent functionality.</p>
+ <p>In practice there is little to gain from subclassing. Instead annotated with <a href="../rgant/rgant.html#_rgant_DomainService"><code>@DomainService</code></a> and specify its <a href="../rgant/rgant.html#_rgant_DomainService_objectType"><code>#objectType()</code></a></p>
</div>
</div>
<div class="sect3">
- <h4 id="_rgcms_classes_super_AbstractSubscriber">3.2.5. <code>AbstractSubscriber</code></h4>
+ <h4 id="_rgcms_classes_super_AbstractSubscriber">3.2.2. <code>AbstractSubscriber</code></h4>
<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="https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_classes_super_AbstractSubscriber.adoc""><i class="fa fa-pencil-square-o"></i> 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>
@@ -3799,7 +3592,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect3">
- <h4 id="_rgcms_classes_super_AbstractViewModel">3.2.6. <code>AbstractViewModel</code></h4>
+ <h4 id="_rgcms_classes_super_AbstractViewModel">3.2.3. <code>AbstractViewModel</code></h4>
<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="https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_classes_super_AbstractViewModel.adoc""><i class="fa fa-pencil-square-o"></i> 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>
@@ -3811,7 +3604,7 @@ table.CodeRay td.code>pre{padding:0}
</ul>
</div>
<div class="paragraph">
- <p>This class extends <a href="../rgcms/rgcms.html#_rgcms_classes_super_AbstractContainedObject"><code>AbstractContainedObject</code></a>, also implementing the <a href="../rgcms/rgcms.html#_rgcms_classes_super_ViewModel"><code>ViewModel</code></a> interface. In and of itself it provides no new behaviour.</p>
+ <p>This class simply implements the <a href="../rgcms/rgcms.html#_rgcms_classes_super_ViewModel"><code>ViewModel</code></a> interface, however the methods are still abstract. In and of itself it provides no new behaviour.</p>
</div>
<div class="admonitionblock tip">
<table>
@@ -3820,7 +3613,7 @@ table.CodeRay td.code>pre{padding:0}
<td class="icon"> <i class="fa icon-tip" title="Tip"></i> </td>
<td class="content">
<div class="paragraph">
- <p>As an alternative, consider simply annotating the view model class with {@link org.apache.isis.applib.annotation.ViewModel}.</p>
+ <p>As an alternative, consider simply annotating the view model class with {@link org.apache.isis.applib.annotation.ViewModel} annotation.</p>
</div> </td>
</tr>
</tbody>
@@ -3828,7 +3621,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect3">
- <h4 id="_rgcms_classes_super_FixtureScript">3.2.7. <code>FixtureScript</code></h4>
+ <h4 id="_rgcms_classes_super_FixtureScript">3.2.4. <code>FixtureScript</code></h4>
<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="https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_classes_super_FixtureScript.adoc""><i class="fa fa-pencil-square-o"></i> 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>
@@ -3858,7 +3651,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect3">
- <h4 id="_rgcms_classes_super_FixtureScripts">3.2.8. <code>FixtureScripts</code></h4>
+ <h4 id="_rgcms_classes_super_FixtureScripts">3.2.5. <code>FixtureScripts</code></h4>
<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="https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_classes_super_FixtureScripts.adoc""><i class="fa fa-pencil-square-o"></i> 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>
@@ -3903,7 +3696,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
<table class="tableblock frame-all grid-all spread">
<caption class="title">
- Table 6. Domain Event Classes
+ Table 5. Domain Event Classes
</caption>
<colgroup>
<col style="width: 25%;">
@@ -4406,7 +4199,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
<table class="tableblock frame-all grid-all spread">
<caption class="title">
- Table 7. UI Event Classes
+ Table 6. UI Event Classes
</caption>
<colgroup>
<col style="width: 25%;">
@@ -4593,7 +4386,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
<table class="tableblock frame-all grid-all spread">
<caption class="title">
- Table 8. Lifecycle Event Classes
+ Table 7. Lifecycle Event Classes
</caption>
<colgroup>
<col style="width: 25%;">
@@ -4630,7 +4423,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">(abstract class).<br> <code>ObjectCreatedEvent.Default</code> is the concrete implementation that is used.</p></td>
- <td class="tableblock halign-left valign-top"><p class="tableblock">Broadcast when an object is first instantiated using the <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_DomainObjectContainer_object-creation-api"><code>DomainObjectContainer</code></a>'s <code>#newTransientInstance(…)</code> method.</p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock">Broadcast when an object is first instantiated using the <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_FactoryService"><code>FactoryService</code></a>'s <code>#instantiate(…)</code> method.</p></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="../rgcms/rgcms.html#_rgcms_classes_lifecycleevent_ObjectLoadedDomainEvent"><code>o.a.i.applib.</code><br> <code>ObjectLoadedEvent</code></a></p></td>
@@ -4652,7 +4445,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">(abstract class).<br> <code>ObjectPersistedEvent.Default</code> is the concrete implementation that is used.</p></td>
- <td class="tableblock halign-left valign-top"><p class="tableblock">Broadcast when an object is first saved (inserted) into the database using the <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_DomainObjectContainer_object-persistence-api"><code>DomainObjectContainer</code></a>'s <code>#persist(…)</code> method.</p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock">Broadcast when an object is first saved (inserted) into the database using the <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_RepositoryService"><code>RepositoryService</code></a>'s <code>#persist(…)</code> method.</p></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="../rgcms/rgcms.html#_rgcms_classes_lifecycleevent_ObjectPersistingDomainEvent"><code>o.a.i.applib.</code><br> <code>ObjectPersistingEvent</code></a></p></td>
@@ -4663,7 +4456,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">(abstract class).<br> <code>ObjectPersistingEvent.Default</code> is the concrete implementation that is used.</p></td>
- <td class="tableblock halign-left valign-top"><p class="tableblock">Broadcast when an object is about to be saved (inserted) into the database using the <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_DomainObjectContainer_object-persistence-api"><code>DomainObjectContainer</code></a>'s <code>#persist(…)</code> method.</p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock">Broadcast when an object is about to be saved (inserted) into the database using the <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_RepositoryService"><code>RepositoryService</code></a>'s <code>#persist(…)</code> method.</p></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="../rgcms/rgcms.html#_rgcms_classes_lifecycleevent_ObjectRemovingDomainEvent"><code>o.a.i.applib.</code><br> <code>ObjectRemovingEvent</code></a></p></td>
@@ -4674,7 +4467,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">(abstract class).<br> <code>ObjectRemovingEvent.Default</code> is the concrete implementation that is used.</p></td>
- <td class="tableblock halign-left valign-top"><p class="tableblock">Broadcast when an object is about to be deleted from the database using the <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_DomainObjectContainer_object-persistence-api"><code>DomainObjectContainer</code></a>'s <code>#remove(…)</code> method.</p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock">Broadcast when an object is about to be deleted from the database using the <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_RepositoryService"><code>RepositoryService</code></a>'s <code>#remove(…)</code> method.</p></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="../rgcms/rgcms.html#_rgcms_classes_lifecycleevent_ObjectUpdatedDomainEvent"><code>o.a.i.applib.</code><br> <code>ObjectUpdatedEvent</code></a></p></td>
@@ -4685,7 +4478,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">(abstract class).<br> <code>ObjectUpdatedEvent.Default</code> is the concrete implementation that is used.</p></td>
- <td class="tableblock halign-left valign-top"><p class="tableblock">Broadcast when an object has just been updated in the database. This is done either explicitly when the current transaction is flushed using the <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_DomainObjectContainer_object-persistence-api"><code>DomainObjectContainer</code></a>'s <code>#flush(…)</code> method, else is done implicitly when the transaction commits at the end of the user request.</p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock">Broadcast when an object has just been updated in the database. This is done either explicitly when the current transaction is flushed using the <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_RepositoryService"><code>RepositoryService</code></a>'s <code>#flush(…)</code> method, else is done implicitly when the transaction commits at the end of the user request.</p></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="../rgcms/rgcms.html#_rgcms_classes_lifecycleevent_ObjectUpdatingDomainEvent"><code>o.a.i.applib.</code><br> <code>ObjectUpdatingEvent</code></a></p></td>
@@ -4696,7 +4489,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">(abstract class).<br> <code>ObjectUpdatingEvent.Default</code> is the concrete implementation that is used.</p></td>
- <td class="tableblock halign-left valign-top"><p class="tableblock">Broadcast when an object is about to be updated in the database. This is done either explicitly when the current transaction is flushed using the <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_DomainObjectContainer_object-persistence-api"><code>DomainObjectContainer</code></a>'s <code>#flush(…)</code> method, else is done implicitly when the transaction commits at the end of the user request.</p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock">Broadcast when an object is about to be updated in the database. This is done either explicitly when the current transaction is flushed using the <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_RepositoryService"><code>RepositoryService</code></a>'s <code>#flush(…)</code> method, else is done implicitly when the transaction commits at the end of the user request.</p></td>
</tr>
</tbody>
</table>
@@ -4743,23 +4536,10 @@ table.CodeRay td.code>pre{padding:0}
</ul>
</div>
<div class="paragraph">
- <p>Subclass of <a href="../rgcms/rgcms.html#_rgcms_classes_lifecycleevent_AbstractLifecycleEvent"><code>AbstractLifecycleEvent</code></a>, broadcast when an object is first instantiated using the <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_DomainObjectContainer_object-creation-api"><code>DomainObjectContainer</code></a>'s <code>#newTransientInstance(…)</code> method.</p>
+ <p>Subclass of <a href="../rgcms/rgcms.html#_rgcms_classes_lifecycleevent_AbstractLifecycleEvent"><code>AbstractLifecycleEvent</code></a>, broadcast when an object is first instantiated using the <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_FactoryService"><code>FactoryServuce</code></a>'s <code>#instantiate(…)</code> method.</p>
</div>
<div class="paragraph">
- <p><code>ObjectCreatedEvent.Default</code> is the concrete implementation that is used.</p>
- </div>
- <div class="admonitionblock note">
- <table>
- <tbody>
- <tr>
- <td class="icon"> <i class="fa icon-note" title="Note"></i> </td>
- <td class="content">
- <div class="paragraph">
- <p>In the future this may be generalized to allow arbitrary subclasses to be broadcast, see ISIS-803.</p>
- </div> </td>
- </tr>
- </tbody>
- </table>
+ <p><code>ObjectCreatedEvent.Default</code> is the implementation that is used by default, but this can be overridden using <a href="../rgant/rgant.html#_rgant_DomainObject_createdLifecycleEvent"><code>@DomainObject#createdLifecycleEvent()</code></a>.</p>
</div>
</div>
<div class="sect3">
@@ -4807,23 +4587,10 @@ table.CodeRay td.code>pre{padding:0}
</ul>
</div>
<div class="paragraph">
- <p>Subclass of <a href="../rgcms/rgcms.html#_rgcms_classes_lifecycleevent_AbstractLifecycleEvent"><code>AbstractLifecycleEvent</code></a>, broadcast when an object is first saved (inserted) into the database using the <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_DomainObjectContainer_object-persistence-api"><code>DomainObjectContainer</code></a>'s <code>#persist(…)</code> method.</p>
+ <p>Subclass of <a href="../rgcms/rgcms.html#_rgcms_classes_lifecycleevent_AbstractLifecycleEvent"><code>AbstractLifecycleEvent</code></a>, broadcast when an object is first saved (inserted) into the database using the <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_RepositoryService"><code>RepositoryService</code></a>'s <code>#persist(…)</code> method.</p>
</div>
<div class="paragraph">
- <p><code>ObjectPersistedEvent.Default</code> is the concrete implementation that is used.</p>
- </div>
- <div class="admonitionblock note">
- <table>
- <tbody>
- <tr>
- <td class="icon"> <i class="fa icon-note" title="Note"></i> </td>
- <td class="content">
- <div class="paragraph">
- <p>In the future this may be generalized to allow arbitrary subclasses to be broadcast, see ISIS-803.</p>
- </div> </td>
- </tr>
- </tbody>
- </table>
+ <p><code>ObjectPersistedEvent.Default</code> is the implementation that is used by default, but this can be overridden using <a href="../rgant/rgant.html#_rgant_DomainObject_persistedLifecycleEvent"><code>@DomainObject#persistedLifecycleEvent()</code></a>.</p>
</div>
</div>
<div class="sect3">
@@ -4839,23 +4606,10 @@ table.CodeRay td.code>pre{padding:0}
</ul>
</div>
<div class="paragraph">
- <p>Subclass of <a href="../rgcms/rgcms.html#_rgcms_classes_lifecycleevent_AbstractLifecycleEvent"><code>AbstractLifecycleEvent</code></a>, broadcast when an object is about to be saved (inserted) into the database using the <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_DomainObjectContainer_object-persistence-api"><code>DomainObjectContainer</code></a>'s <code>#persist(…)</code> method.</p>
+ <p>Subclass of <a href="../rgcms/rgcms.html#_rgcms_classes_lifecycleevent_AbstractLifecycleEvent"><code>AbstractLifecycleEvent</code></a>, broadcast when an object is about to be saved (inserted) into the database using the <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_RepositoryService"><code>RepositoryService</code></a>'s <code>#persist(…)</code> method.</p>
</div>
<div class="paragraph">
- <p><code>ObjectPersistingEvent.Default</code> is the concrete implementation that is used.</p>
- </div>
- <div class="admonitionblock note">
- <table>
- <tbody>
- <tr>
- <td class="icon"> <i class="fa icon-note" title="Note"></i> </td>
- <td class="content">
- <div class="paragraph">
- <p>In the future this may be generalized to allow arbitrary subclasses to be broadcast, see ISIS-803.</p>
- </div> </td>
- </tr>
- </tbody>
- </table>
+ <p><code>ObjectPersistingEvent.Default</code> is the implementation that is used by default, but this can be overridden using <a href="../rgant/rgant.html#_rgant_DomainObject_persistingLifecycleEvent"><code>@DomainObject#persistingLifecycleEvent()</code></a>.</p>
</div>
</div>
<div class="sect3">
@@ -4871,23 +4625,10 @@ table.CodeRay td.code>pre{padding:0}
</ul>
</div>
<div class="paragraph">
- <p>Subclass of <a href="../rgcms/rgcms.html#_rgcms_classes_lifecycleevent_AbstractLifecycleEvent"><code>AbstractLifecycleEvent</code></a>, broadcast when an object is about to be deleted from the database using the <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_DomainObjectContainer_object-persistence-api"><code>DomainObjectContainer</code></a>'s <code>#remove(…)</code> method.</p>
+ <p>Subclass of <a href="../rgcms/rgcms.html#_rgcms_classes_lifecycleevent_AbstractLifecycleEvent"><code>AbstractLifecycleEvent</code></a>, broadcast when an object is about to be deleted from the database using the <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_RepositoryService"><code>RepositoryService</code></a>'s <code>#remove(…)</code> method.</p>
</div>
<div class="paragraph">
- <p><code>ObjectRemovingEvent.Default</code> is the concrete implementation that is used.</p>
- </div>
- <div class="admonitionblock note">
- <table>
- <tbody>
- <tr>
- <td class="icon"> <i class="fa icon-note" title="Note"></i> </td>
- <td class="content">
- <div class="paragraph">
- <p>In the future this may be generalized to allow arbitrary subclasses to be broadcast, see ISIS-803.</p>
- </div> </td>
- </tr>
- </tbody>
- </table>
+ <p><code>ObjectRemovingEvent.Default</code> is the implementation that is used by default, but this can be overridden using <a href="../rgant/rgant.html#_rgant_DomainObject_removingLifecycleEvent"><code>@DomainObject#removingLifecycleEvent()</code></a>.</p>
</div>
</div>
<div class="sect3">
@@ -4903,23 +4644,10 @@ table.CodeRay td.code>pre{padding:0}
</ul>
</div>
<div class="paragraph">
- <p>Subclass of <a href="../rgcms/rgcms.html#_rgcms_classes_lifecycleevent_AbstractLifecycleEvent"><code>AbstractLifecycleEvent</code></a>, broadcast when an object has just been updated in the database. This is done either explicitly when the current transaction is flushed using the <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_DomainObjectContainer_object-persistence-api"><code>DomainObjectContainer</code></a>'s <code>#flush(…)</code> method, else is done implicitly when the transaction commits at the end of the user request.</p>
+ <p>Subclass of <a href="../rgcms/rgcms.html#_rgcms_classes_lifecycleevent_AbstractLifecycleEvent"><code>AbstractLifecycleEvent</code></a>, broadcast when an object has just been updated in the database. This is done either explicitly when the current transaction is flushed using the <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_RepositoryService"><code>RepositoryService</code></a>'s <code>#flush(…)</code> method, else is done implicitly when the transaction commits at the end of the user request.</p>
</div>
<div class="paragraph">
- <p><code>ObjectUpdatedEvent.Default</code> is the concrete implementation that is used.</p>
- </div>
- <div class="admonitionblock note">
- <table>
- <tbody>
- <tr>
- <td class="icon"> <i class="fa icon-note" title="Note"></i> </td>
- <td class="content">
- <div class="paragraph">
- <p>In the future this may be generalized to allow arbitrary subclasses to be broadcast, see ISIS-803.</p>
- </div> </td>
- </tr>
- </tbody>
- </table>
+ <p><code>ObjectUpdatedEvent.Default</code> is the implementation that is used by default, but this can be overridden using <a href="../rgant/rgant.html#_rgant_DomainObject_updatedLifecycleEvent"><code>@DomainObject#updatedLifecycleEvent()</code></a>.</p>
</div>
</div>
<div class="sect3">
@@ -4935,23 +4663,10 @@ table.CodeRay td.code>pre{padding:0}
</ul>
</div>
<div class="paragraph">
- <p>Subclass of <a href="../rgcms/rgcms.html#_rgcms_classes_lifecycleevent_AbstractLifecycleEvent"><code>AbstractLifecycleEvent</code></a>, broadcast when an object is about to be updated in the database. This is done either explicitly when the current transaction is flushed using the <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_DomainObjectContainer_object-persistence-api"><code>DomainObjectContainer</code></a>'s <code>#flush(…)</code> method, else is done implicitly when the transaction commits at the end of the user request.</p>
+ <p>Subclass of <a href="../rgcms/rgcms.html#_rgcms_classes_lifecycleevent_AbstractLifecycleEvent"><code>AbstractLifecycleEvent</code></a>, broadcast when an object is about to be updated in the database. This is done either explicitly when the current transaction is flushed using the <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_RepositoryService"><code>RepositoryService</code></a>'s <code>#flush(…)</code> method, else is done implicitly when the transaction commits at the end of the user request.</p>
</div>
<div class="paragraph">
- <p><code>ObjectUpdatingEvent.Default</code> is the concrete implementation that is used.</p>
- </div>
- <div class="admonitionblock note">
- <table>
- <tbody>
- <tr>
- <td class="icon"> <i class="fa icon-note" title="Note"></i> </td>
- <td class="content">
- <div class="paragraph">
- <p>In the future this may be generalized to allow arbitrary subclasses to be broadcast, see ISIS-803.</p>
- </div> </td>
- </tr>
- </tbody>
- </table>
+ <p><code>ObjectUpdatingEvent.Default</code> is the implementation that is used by default, but this can be overridden using <a href="../rgant/rgant.html#_rgant_DomainObject_updatingLifecycleEvent"><code>@DomainObject#updatingLifecycleEvent()</code></a>.</p>
</div>
</div>
</div>
@@ -5743,7 +5458,7 @@ table.CodeRay td.code>pre{padding:0}
</table>
</div>
<div class="paragraph">
- <p>Modules in the (non-ASF) <a href="http://platform.incode.org" target="_blank">Incode Platform</a> that either have domain entity that implement and/or services that contribute this interface are:</p>
+ <p>Modules in the (non-ASF) <a href="http://platform.incode.org" target="_blank">Incode Platform</a> that have domain entity/ies that implement this interface, and/or services that contribute this interface are:</p>
</div>
<div class="ulist">
<ul>
[26/39] isis-site git commit: ISIS-1810: updates docs for 2.0.0-M1
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/274edd1d/content/versions/2.0.0-M1/guides/rgsvc/rgsvc.pdf
----------------------------------------------------------------------
diff --git a/content/versions/2.0.0-M1/guides/rgsvc/rgsvc.pdf b/content/versions/2.0.0-M1/guides/rgsvc/rgsvc.pdf
index 738ef32..8ff195c 100644
--- a/content/versions/2.0.0-M1/guides/rgsvc/rgsvc.pdf
+++ b/content/versions/2.0.0-M1/guides/rgsvc/rgsvc.pdf
@@ -4,16 +4,16 @@
<< /Title (Domain Services)
/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:20180812182515+01'00')
-/ModDate (D:20180812182515+01'00')
+/CreationDate (D:20180814003851+02'00')
+/ModDate (D:20180814003851+02'00')
>>
endobj
2 0 obj
<< /Type /Catalog
/Pages 3 0 R
/Names 18 0 R
-/Outlines 1935 0 R
-/PageLabels 2022 0 R
+/Outlines 1875 0 R
+/PageLabels 1961 0 R
/PageMode /UseOutlines
/OpenAction [7 0 R /FitH 842.89]
/ViewerPreferences << /DisplayDocTitle true
@@ -22,8 +22,8 @@ endobj
endobj
3 0 obj
<< /Type /Pages
-/Count 156
-/Kids [7 0 R 10 0 R 12 0 R 14 0 R 16 0 R 38 0 R 50 0 R 62 0 R 71 0 R 77 0 R 105 0 R 108 0 R 143 0 R 157 0 R 164 0 R 181 0 R 189 0 R 191 0 R 214 0 R 249 0 R 280 0 R 298 0 R 309 0 R 320 0 R 329 0 R 334 0 R 341 0 R 344 0 R 350 0 R 355 0 R 368 0 R 384 0 R 396 0 R 411 0 R 418 0 R 430 0 R 446 0 R 454 0 R 465 0 R 472 0 R 480 0 R 493 0 R 507 0 R 516 0 R 523 0 R 556 0 R 603 0 R 612 0 R 619 0 R 627 0 R 640 0 R 654 0 R 663 0 R 665 0 R 667 0 R 675 0 R 689 0 R 691 0 R 702 0 R 709 0 R 725 0 R 735 0 R 740 0 R 753 0 R 768 0 R 775 0 R 783 0 R 790 0 R 794 0 R 803 0 R 809 0 R 823 0 R 826 0 R 849 0 R 859 0 R 875 0 R 890 0 R 905 0 R 915 0 R 943 0 R 969 0 R 974 0 R 979 0 R 986 0 R 1006 0 R 1015 0 R 1032 0 R 1047 0 R 1050 0 R 1053 0 R 1057 0 R 1063 0 R 1076 0 R 1084 0 R 1096 0 R 1104 0 R 1112 0 R 1119 0 R 1150 0 R 1159 0 R 1164 0 R 1173 0 R 1179 0 R 1186 0 R 1192 0 R 1199 0 R 1212 0 R 1221 0 R 1225 0 R 1229 0 R 1231 0 R 1235 0 R 1243 0 R 1271 0 R 1287 0 R 1294 0 R 1306 0 R 1321 0 R 1328 0 R 1337 0 R 1352
0 R 1361 0 R 1402 0 R 1412 0 R 1421 0 R 1431 0 R 1439 0 R 1450 0 R 1457 0 R 1487 0 R 1494 0 R 1505 0 R 1510 0 R 1517 0 R 1521 0 R 1527 0 R 1536 0 R 1544 0 R 1549 0 R 1557 0 R 1560 0 R 1566 0 R 1569 0 R 1573 0 R 1578 0 R 1582 0 R 1602 0 R 1608 0 R 1617 0 R 1632 0 R 1638 0 R 1650 0 R 1661 0 R 1666 0 R 1672 0 R 1689 0 R]
+/Count 154
+/Kids [7 0 R 10 0 R 12 0 R 14 0 R 16 0 R 38 0 R 50 0 R 65 0 R 74 0 R 80 0 R 108 0 R 111 0 R 146 0 R 160 0 R 167 0 R 184 0 R 192 0 R 194 0 R 217 0 R 252 0 R 283 0 R 301 0 R 312 0 R 323 0 R 332 0 R 337 0 R 344 0 R 347 0 R 353 0 R 358 0 R 370 0 R 385 0 R 398 0 R 413 0 R 421 0 R 431 0 R 447 0 R 456 0 R 468 0 R 475 0 R 483 0 R 496 0 R 510 0 R 519 0 R 526 0 R 559 0 R 597 0 R 606 0 R 613 0 R 621 0 R 634 0 R 648 0 R 657 0 R 659 0 R 661 0 R 669 0 R 681 0 R 683 0 R 694 0 R 701 0 R 717 0 R 727 0 R 732 0 R 745 0 R 760 0 R 767 0 R 775 0 R 782 0 R 786 0 R 795 0 R 801 0 R 815 0 R 818 0 R 841 0 R 851 0 R 867 0 R 882 0 R 897 0 R 907 0 R 939 0 R 949 0 R 955 0 R 960 0 R 970 0 R 988 0 R 999 0 R 1002 0 R 1005 0 R 1009 0 R 1015 0 R 1027 0 R 1035 0 R 1047 0 R 1055 0 R 1061 0 R 1068 0 R 1098 0 R 1107 0 R 1113 0 R 1122 0 R 1128 0 R 1135 0 R 1141 0 R 1148 0 R 1162 0 R 1171 0 R 1175 0 R 1179 0 R 1181 0 R 1185 0 R 1193 0 R 1218 0 R 1234 0 R 1241 0 R 1253 0 R 1268 0 R 1274 0 R 1283 0 R 1299 0 R 1308 0 R 1349 0
R 1359 0 R 1368 0 R 1377 0 R 1386 0 R 1397 0 R 1404 0 R 1431 0 R 1438 0 R 1449 0 R 1454 0 R 1461 0 R 1465 0 R 1471 0 R 1480 0 R 1488 0 R 1493 0 R 1500 0 R 1503 0 R 1509 0 R 1512 0 R 1516 0 R 1521 0 R 1525 0 R 1545 0 R 1550 0 R 1561 0 R 1574 0 R 1580 0 R 1592 0 R 1604 0 R 1609 0 R 1615 0 R 1632 0 R]
>>
endobj
4 0 obj
@@ -80,11 +80,11 @@ endobj
<< /Type /Font
/BaseFont /AAAACH+NotoSerif
/Subtype /TrueType
-/FontDescriptor 2024 0 R
+/FontDescriptor 1963 0 R
/FirstChar 32
/LastChar 255
-/Widths 2026 0 R
-/ToUnicode 2025 0 R
+/Widths 1965 0 R
+/ToUnicode 1964 0 R
>>
endobj
9 0 obj
@@ -1948,11 +1948,11 @@ endobj
/F3.0 43 0 R
>>
>>
-/Annots [1696 0 R 1697 0 R 1698 0 R 1699 0 R 1700 0 R 1701 0 R 1702 0 R 1703 0 R 1704 0 R 1705 0 R 1706 0 R 1707 0 R 1708 0 R 1709 0 R 1710 0 R 1711 0 R 1712 0 R 1713 0 R 1714 0 R 1715 0 R 1716 0 R 1717 0 R 1718 0 R 1719 0 R 1720 0 R 1721 0 R 1722 0 R 1723 0 R 1724 0 R 1725 0 R 1726 0 R 1727 0 R 1728 0 R 1729 0 R 1730 0 R 1731 0 R 1732 0 R 1733 0 R 1734 0 R 1735 0 R 1736 0 R 1737 0 R 1738 0 R 1739 0 R 1740 0 R 1741 0 R 1742 0 R 1743 0 R 1744 0 R 1745 0 R 1746 0 R 1747 0 R 1748 0 R 1749 0 R 1750 0 R 1751 0 R 1752 0 R 1753 0 R 1754 0 R 1755 0 R 1756 0 R 1757 0 R 1758 0 R 1759 0 R 1760 0 R 1761 0 R 1762 0 R 1763 0 R 1764 0 R 1765 0 R 1766 0 R 1767 0 R 1768 0 R 1769 0 R 1770 0 R 1771 0 R 1772 0 R 1773 0 R 1774 0 R 1775 0 R 1776 0 R 1777 0 R 1778 0 R 1779 0 R 1780 0 R 1781 0 R 1782 0 R 1783 0 R 1784 0 R 1785 0 R 1786 0 R 1787 0 R 1788 0 R 1789 0 R 1790 0 R 1791 0 R 1792 0 R 1793 0 R 1794 0 R 1795 0 R 1796 0 R 1797 0 R 1798 0 R 1799 0 R]
+/Annots [1639 0 R 1640 0 R 1641 0 R 1642 0 R 1643 0 R 1644 0 R 1645 0 R 1646 0 R 1647 0 R 1648 0 R 1649 0 R 1650 0 R 1651 0 R 1652 0 R 1653 0 R 1654 0 R 1655 0 R 1656 0 R 1657 0 R 1658 0 R 1659 0 R 1660 0 R 1661 0 R 1662 0 R 1663 0 R 1664 0 R 1665 0 R 1666 0 R 1667 0 R 1668 0 R 1669 0 R 1670 0 R 1671 0 R 1672 0 R 1673 0 R 1674 0 R 1675 0 R 1676 0 R 1677 0 R 1678 0 R 1679 0 R 1680 0 R 1681 0 R 1682 0 R 1683 0 R 1684 0 R 1685 0 R 1686 0 R 1687 0 R 1688 0 R 1689 0 R 1690 0 R 1691 0 R 1692 0 R 1693 0 R 1694 0 R 1695 0 R 1696 0 R 1697 0 R 1698 0 R 1699 0 R 1700 0 R 1701 0 R 1702 0 R 1703 0 R 1704 0 R 1705 0 R 1706 0 R 1707 0 R 1708 0 R 1709 0 R 1710 0 R 1711 0 R 1712 0 R 1713 0 R 1714 0 R 1715 0 R 1716 0 R 1717 0 R 1718 0 R 1719 0 R 1720 0 R 1721 0 R 1722 0 R 1723 0 R 1724 0 R 1725 0 R 1726 0 R 1727 0 R 1728 0 R 1729 0 R 1730 0 R 1731 0 R 1732 0 R 1733 0 R 1734 0 R 1735 0 R 1736 0 R 1737 0 R 1738 0 R 1739 0 R 1740 0 R 1741 0 R 1742 0 R]
>>
endobj
11 0 obj
-<< /Length 39940
+<< /Length 39962
>>
stream
q
@@ -2514,7 +2514,7 @@ ET
BT
79.9485 591.3959999999997 Td
/F3.0 10.5 Tf
-<446f6d61696e4f626a656374436f6e7461696e6572> Tj
+<4576656e7442757353657276696365> Tj
ET
0.000 0.000 0.000 SCN
@@ -2523,9 +2523,9 @@ ET
0.200 0.200 0.200 SCN
BT
-191.89324999999997 591.3959999999997 Td
+159.82624999999996 591.3959999999997 Td
/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -2565,7 +2565,7 @@ ET
BT
79.9485 572.9159999999997 Td
/F3.0 10.5 Tf
-<4576656e7442757353657276696365> Tj
+<466163746f727953657276696365> Tj
ET
0.000 0.000 0.000 SCN
@@ -2574,9 +2574,9 @@ ET
0.200 0.200 0.200 SCN
BT
-159.82624999999996 572.9159999999997 Td
+154.48174999999992 572.9159999999997 Td
/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -2594,7 +2594,7 @@ ET
BT
535.3009999999999 572.9159999999997 Td
/F1.0 10.5 Tf
-<3831> Tj
+<3837> Tj
ET
0.000 0.000 0.000 SCN
@@ -2616,7 +2616,7 @@ ET
BT
79.9485 554.4359999999997 Td
/F3.0 10.5 Tf
-<466163746f727953657276696365> Tj
+<53637261746368706164> Tj
ET
0.000 0.000 0.000 SCN
@@ -2625,9 +2625,9 @@ ET
0.200 0.200 0.200 SCN
BT
-154.48174999999992 554.4359999999997 Td
+138.44824999999992 554.4359999999997 Td
/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -2645,7 +2645,7 @@ ET
BT
535.3009999999999 554.4359999999997 Td
/F1.0 10.5 Tf
-<3839> Tj
+<3838> Tj
ET
0.000 0.000 0.000 SCN
@@ -2667,7 +2667,7 @@ ET
BT
79.9485 535.9559999999997 Td
/F3.0 10.5 Tf
-<53637261746368706164> Tj
+<5573657253657276696365> Tj
ET
0.000 0.000 0.000 SCN
@@ -2705,20 +2705,9 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 517.4759999999997 Td
+48.24 517.4759999999997 Td
/F1.0 10.5 Tf
-<372e372e20> Tj
-ET
-
-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
-
-BT
-79.9485 517.4759999999997 Td
-/F3.0 10.5 Tf
-<5573657253657276696365> Tj
+[<382e20496e74656772> 20.01953125 <6174696f6e20415049>] TJ
ET
0.000 0.000 0.000 SCN
@@ -2756,47 +2745,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24 498.9959999999997 Td
-/F1.0 10.5 Tf
-[<382e20496e74656772> 20.01953125 <6174696f6e20415049>] TJ
-ET
-
-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
-
-BT
-138.44824999999992 498.9959999999997 Td
-/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-
-BT
-533.94125 498.9959999999997 Td
-/F1.0 5.25 Tf
-<ca> Tj
-ET
-
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-BT
-535.3009999999999 498.9959999999997 Td
-/F1.0 10.5 Tf
-<3934> Tj
-ET
-
-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
-
-BT
-60.24 480.5159999999997 Td
+60.24 498.9959999999997 Td
/F1.0 10.5 Tf
<382e312e20> Tj
ET
@@ -2807,7 +2756,7 @@ ET
0.694 0.129 0.275 SCN
BT
-79.9485 480.5159999999997 Td
+79.9485 498.9959999999997 Td
/F3.0 10.5 Tf
<426f6f6b6d61726b53657276696365> Tj
ET
@@ -2818,7 +2767,7 @@ ET
0.200 0.200 0.200 SCN
BT
-159.82624999999996 480.5159999999997 Td
+159.82624999999996 498.9959999999997 Td
/F1.0 10.5 Tf
<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
@@ -2827,7 +2776,7 @@ ET
0.000 0.000 0.000 scn
BT
-533.94125 480.5159999999997 Td
+533.94125 498.9959999999997 Td
/F1.0 5.25 Tf
<ca> Tj
ET
@@ -2836,9 +2785,9 @@ ET
0.200 0.200 0.200 SCN
BT
-535.3009999999999 480.5159999999997 Td
+535.3009999999999 498.9959999999997 Td
/F1.0 10.5 Tf
-<3935> Tj
+<3933> Tj
ET
0.000 0.000 0.000 SCN
@@ -2847,7 +2796,7 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 462.03599999999966 Td
+60.24 480.5159999999997 Td
/F1.0 10.5 Tf
<382e322e20> Tj
ET
@@ -2858,7 +2807,7 @@ ET
0.694 0.129 0.275 SCN
BT
-79.9485 462.03599999999966 Td
+79.9485 480.5159999999997 Td
/F3.0 10.5 Tf
<456d61696c53657276696365> Tj
ET
@@ -2869,7 +2818,7 @@ ET
0.200 0.200 0.200 SCN
BT
-143.79274999999996 462.03599999999966 Td
+143.79274999999996 480.5159999999997 Td
/F1.0 10.5 Tf
<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
@@ -2878,7 +2827,7 @@ ET
0.000 0.000 0.000 scn
BT
-533.94125 462.03599999999966 Td
+533.94125 480.5159999999997 Td
/F1.0 5.25 Tf
<ca> Tj
ET
@@ -2887,9 +2836,9 @@ ET
0.200 0.200 0.200 SCN
BT
-535.3009999999999 462.03599999999966 Td
+535.3009999999999 480.5159999999997 Td
/F1.0 10.5 Tf
-<3937> Tj
+<3935> Tj
ET
0.000 0.000 0.000 SCN
@@ -2898,7 +2847,7 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 443.55599999999964 Td
+60.24 462.03599999999966 Td
/F1.0 10.5 Tf
<382e332e20> Tj
ET
@@ -2909,7 +2858,7 @@ ET
0.694 0.129 0.275 SCN
BT
-79.9485 443.55599999999964 Td
+79.9485 462.03599999999966 Td
/F3.0 10.5 Tf
<4a61786253657276696365> Tj
ET
@@ -2920,16 +2869,16 @@ ET
0.200 0.200 0.200 SCN
BT
-143.26774999999992 443.55599999999964 Td
+138.44824999999992 462.03599999999966 Td
/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
BT
-528.07175 443.55599999999964 Td
+533.94125 462.03599999999966 Td
/F1.0 5.25 Tf
<ca> Tj
ET
@@ -2938,9 +2887,9 @@ ET
0.200 0.200 0.200 SCN
BT
-529.4314999999999 443.55599999999964 Td
+535.3009999999999 462.03599999999966 Td
/F1.0 10.5 Tf
-<313031> Tj
+<3939> Tj
ET
0.000 0.000 0.000 SCN
@@ -2949,7 +2898,7 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 425.0759999999996 Td
+60.24 443.55599999999964 Td
/F1.0 10.5 Tf
<382e342e20> Tj
ET
@@ -2960,7 +2909,7 @@ ET
0.694 0.129 0.275 SCN
BT
-79.9485 425.0759999999996 Td
+79.9485 443.55599999999964 Td
/F3.0 10.5 Tf
<4d656d656e746f53657276696365> Tj
ET
@@ -2971,7 +2920,7 @@ ET
0.200 0.200 0.200 SCN
BT
-153.4485 425.0759999999996 Td
+153.4485 443.55599999999964 Td
/F1.0 10.5 Tf
<20286465707265636174656429> Tj
ET
@@ -2982,7 +2931,7 @@ ET
0.200 0.200 0.200 SCN
BT
-223.43524999999994 425.0759999999996 Td
+223.43524999999994 443.55599999999964 Td
/F1.0 10.5 Tf
<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
@@ -2991,7 +2940,7 @@ ET
0.000 0.000 0.000 scn
BT
-528.07175 425.0759999999996 Td
+528.07175 443.55599999999964 Td
/F1.0 5.25 Tf
<ca> Tj
ET
@@ -3000,9 +2949,9 @@ ET
0.200 0.200 0.200 SCN
BT
-529.4314999999999 425.0759999999996 Td
+529.4314999999999 443.55599999999964 Td
/F1.0 10.5 Tf
-<313032> Tj
+<313030> Tj
ET
0.000 0.000 0.000 SCN
@@ -3011,7 +2960,7 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 406.5959999999996 Td
+60.24 425.0759999999996 Td
/F1.0 10.5 Tf
<382e352e20> Tj
ET
@@ -3022,7 +2971,7 @@ ET
0.694 0.129 0.275 SCN
BT
-79.9485 406.5959999999996 Td
+79.9485 425.0759999999996 Td
/F3.0 10.5 Tf
<586d6c536e617073686f7453657276696365> Tj
ET
@@ -3033,7 +2982,7 @@ ET
0.200 0.200 0.200 SCN
BT
-175.33474999999993 406.5959999999996 Td
+175.33474999999993 425.0759999999996 Td
/F1.0 10.5 Tf
<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
@@ -3042,7 +2991,7 @@ ET
0.000 0.000 0.000 scn
BT
-528.07175 406.5959999999996 Td
+528.07175 425.0759999999996 Td
/F1.0 5.25 Tf
<ca> Tj
ET
@@ -3051,9 +3000,9 @@ ET
0.200 0.200 0.200 SCN
BT
-529.4314999999999 406.5959999999996 Td
+529.4314999999999 425.0759999999996 Td
/F1.0 10.5 Tf
-<313034> Tj
+<313032> Tj
ET
0.000 0.000 0.000 SCN
@@ -3062,7 +3011,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24 388.1159999999996 Td
+48.24 406.5959999999996 Td
/F1.0 10.5 Tf
<392e204d6574616461746120415049> Tj
ET
@@ -3073,7 +3022,7 @@ ET
0.200 0.200 0.200 SCN
BT
-132.5787499999999 388.1159999999996 Td
+132.5787499999999 406.5959999999996 Td
/F1.0 10.5 Tf
<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
@@ -3082,7 +3031,7 @@ ET
0.000 0.000 0.000 scn
BT
-528.07175 388.1159999999996 Td
+528.07175 406.5959999999996 Td
/F1.0 5.25 Tf
<ca> Tj
ET
@@ -3091,9 +3040,9 @@ ET
0.200 0.200 0.200 SCN
BT
-529.4314999999999 388.1159999999996 Td
+529.4314999999999 406.5959999999996 Td
/F1.0 10.5 Tf
-<313039> Tj
+<313037> Tj
ET
0.000 0.000 0.000 SCN
@@ -3102,7 +3051,7 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 369.63599999999957 Td
+60.24 388.1159999999996 Td
/F1.0 10.5 Tf
<392e312e20> Tj
ET
@@ -3113,7 +3062,7 @@ ET
0.694 0.129 0.275 SCN
BT
-79.9485 369.63599999999957 Td
+79.9485 388.1159999999996 Td
/F3.0 10.5 Tf
<4170706c69636174696f6e466561747572655265706f7369746f7279> Tj
ET
@@ -3124,7 +3073,7 @@ ET
0.200 0.200 0.200 SCN
BT
-228.77974999999992 369.63599999999957 Td
+228.77974999999992 388.1159999999996 Td
/F1.0 10.5 Tf
<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
@@ -3133,7 +3082,7 @@ ET
0.000 0.000 0.000 scn
BT
-528.07175 369.63599999999957 Td
+528.07175 388.1159999999996 Td
/F1.0 5.25 Tf
<ca> Tj
ET
@@ -3142,9 +3091,9 @@ ET
0.200 0.200 0.200 SCN
BT
-529.4314999999999 369.63599999999957 Td
+529.4314999999999 388.1159999999996 Td
/F1.0 10.5 Tf
-<313130> Tj
+<313038> Tj
ET
0.000 0.000 0.000 SCN
@@ -3153,7 +3102,7 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 351.15599999999955 Td
+60.24 369.63599999999957 Td
/F1.0 10.5 Tf
<392e322e20> Tj
ET
@@ -3164,7 +3113,7 @@ ET
0.694 0.129 0.275 SCN
BT
-79.9485 351.15599999999955 Td
+79.9485 369.63599999999957 Td
/F3.0 10.5 Tf
<4c61796f757453657276696365> Tj
ET
@@ -3175,7 +3124,7 @@ ET
0.200 0.200 0.200 SCN
BT
-153.95674999999994 351.15599999999955 Td
+153.95674999999994 369.63599999999957 Td
/F1.0 10.5 Tf
<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
@@ -3184,7 +3133,7 @@ ET
0.000 0.000 0.000 scn
BT
-528.07175 351.15599999999955 Td
+528.07175 369.63599999999957 Td
/F1.0 5.25 Tf
<ca> Tj
ET
@@ -3193,9 +3142,9 @@ ET
0.200 0.200 0.200 SCN
BT
-529.4314999999999 351.15599999999955 Td
+529.4314999999999 369.63599999999957 Td
/F1.0 10.5 Tf
-<313132> Tj
+<313130> Tj
ET
0.000 0.000 0.000 SCN
@@ -3204,7 +3153,7 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 332.67599999999953 Td
+60.24 351.15599999999955 Td
/F1.0 10.5 Tf
<392e332e20> Tj
ET
@@ -3215,7 +3164,7 @@ ET
0.694 0.129 0.275 SCN
BT
-79.9485 332.67599999999953 Td
+79.9485 351.15599999999955 Td
/F3.0 10.5 Tf
<4d6574614d6f64656c53657276696365> Tj
ET
@@ -3226,7 +3175,7 @@ ET
0.200 0.200 0.200 SCN
BT
-164.6457499999999 332.67599999999953 Td
+164.6457499999999 351.15599999999955 Td
/F1.0 10.5 Tf
<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
@@ -3235,7 +3184,7 @@ ET
0.000 0.000 0.000 scn
BT
-528.07175 332.67599999999953 Td
+528.07175 351.15599999999955 Td
/F1.0 5.25 Tf
<ca> Tj
ET
@@ -3244,9 +3193,9 @@ ET
0.200 0.200 0.200 SCN
BT
-529.4314999999999 332.67599999999953 Td
+529.4314999999999 351.15599999999955 Td
/F1.0 10.5 Tf
-<313133> Tj
+<313131> Tj
ET
0.000 0.000 0.000 SCN
@@ -3255,7 +3204,7 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 314.1959999999995 Td
+60.24 332.67599999999953 Td
/F1.0 10.5 Tf
<392e342e20> Tj
ET
@@ -3266,7 +3215,7 @@ ET
0.694 0.129 0.275 SCN
BT
-79.9485 314.1959999999995 Td
+79.9485 332.67599999999953 Td
/F3.0 10.5 Tf
<536572766963655265676973747279> Tj
ET
@@ -3277,7 +3226,7 @@ ET
0.200 0.200 0.200 SCN
BT
-164.6457499999999 314.1959999999995 Td
+164.6457499999999 332.67599999999953 Td
/F1.0 10.5 Tf
<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
@@ -3286,7 +3235,7 @@ ET
0.000 0.000 0.000 scn
BT
-528.07175 314.1959999999995 Td
+528.07175 332.67599999999953 Td
/F1.0 5.25 Tf
<ca> Tj
ET
@@ -3295,9 +3244,9 @@ ET
0.200 0.200 0.200 SCN
BT
-529.4314999999999 314.1959999999995 Td
+529.4314999999999 332.67599999999953 Td
/F1.0 10.5 Tf
-<313135> Tj
+<313133> Tj
ET
0.000 0.000 0.000 SCN
@@ -3306,7 +3255,7 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 295.7159999999995 Td
+60.24 314.1959999999995 Td
/F1.0 10.5 Tf
<392e352e20> Tj
ET
@@ -3317,7 +3266,7 @@ ET
0.694 0.129 0.275 SCN
BT
-79.9485 295.7159999999995 Td
+79.9485 314.1959999999995 Td
/F3.0 10.5 Tf
<5377616767657253657276696365> Tj
ET
@@ -3328,7 +3277,7 @@ ET
0.200 0.200 0.200 SCN
BT
-159.30124999999992 295.7159999999995 Td
+159.30124999999992 314.1959999999995 Td
/F1.0 10.5 Tf
<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
@@ -3337,7 +3286,7 @@ ET
0.000 0.000 0.000 scn
BT
-528.07175 295.7159999999995 Td
+528.07175 314.1959999999995 Td
/F1.0 5.25 Tf
<ca> Tj
ET
@@ -3346,9 +3295,9 @@ ET
0.200 0.200 0.200 SCN
BT
-529.4314999999999 295.7159999999995 Td
+529.4314999999999 314.1959999999995 Td
/F1.0 10.5 Tf
-<313136> Tj
+<313134> Tj
ET
0.000 0.000 0.000 SCN
@@ -3357,7 +3306,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24 277.2359999999995 Td
+48.24 295.7159999999995 Td
/F1.0 10.5 Tf
[<31302e2054> 29.78515625 <657374696e67>] TJ
ET
@@ -3368,7 +3317,7 @@ ET
0.200 0.200 0.200 SCN
BT
-105.85624999999993 277.2359999999995 Td
+105.85624999999993 295.7159999999995 Td
/F1.0 10.5 Tf
<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
@@ -3377,7 +3326,7 @@ ET
0.000 0.000 0.000 scn
BT
-528.07175 277.2359999999995 Td
+528.07175 295.7159999999995 Td
/F1.0 5.25 Tf
<ca> Tj
ET
@@ -3386,9 +3335,9 @@ ET
0.200 0.200 0.200 SCN
BT
-529.4314999999999 277.2359999999995 Td
+529.4314999999999 295.7159999999995 Td
/F1.0 10.5 Tf
-<313138> Tj
+<313136> Tj
ET
0.000 0.000 0.000 SCN
@@ -3397,7 +3346,7 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 258.75599999999946 Td
+60.24 277.2359999999995 Td
/F1.0 10.5 Tf
<31302e312e20> Tj
ET
@@ -3408,7 +3357,7 @@ ET
0.694 0.129 0.275 SCN
BT
-85.81800000000001 258.75599999999946 Td
+85.81800000000001 277.2359999999995 Td
/F3.0 10.5 Tf
<457865637574696f6e506172616d657465727353657276696365> Tj
ET
@@ -3419,7 +3368,7 @@ ET
0.200 0.200 0.200 SCN
BT
-223.43524999999994 258.75599999999946 Td
+223.43524999999994 277.2359999999995 Td
/F1.0 10.5 Tf
<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
@@ -3428,7 +3377,7 @@ ET
0.000 0.000 0.000 scn
BT
-528.07175 258.75599999999946 Td
+528.07175 277.2359999999995 Td
/F1.0 5.25 Tf
<ca> Tj
ET
@@ -3437,9 +3386,9 @@ ET
0.200 0.200 0.200 SCN
BT
-529.4314999999999 258.75599999999946 Td
+529.4314999999999 277.2359999999995 Td
/F1.0 10.5 Tf
-<313139> Tj
+<313137> Tj
ET
0.000 0.000 0.000 SCN
@@ -3448,7 +3397,7 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 240.27599999999947 Td
+60.24 258.75599999999946 Td
/F1.0 10.5 Tf
<31302e322e20> Tj
ET
@@ -3459,7 +3408,7 @@ ET
0.694 0.129 0.275 SCN
BT
-85.81800000000001 240.27599999999947 Td
+85.81800000000001 258.75599999999946 Td
/F3.0 10.5 Tf
<4669787475726553637269707473> Tj
ET
@@ -3470,7 +3419,7 @@ ET
0.200 0.200 0.200 SCN
BT
-164.6457499999999 240.27599999999947 Td
+164.6457499999999 258.75599999999946 Td
/F1.0 10.5 Tf
<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
@@ -3479,7 +3428,7 @@ ET
0.000 0.000 0.000 scn
BT
-528.07175 240.27599999999947 Td
+528.07175 258.75599999999946 Td
/F1.0 5.25 Tf
<ca> Tj
ET
@@ -3488,9 +3437,9 @@ ET
0.200 0.200 0.200 SCN
BT
-529.4314999999999 240.27599999999947 Td
+529.4314999999999 258.75599999999946 Td
/F1.0 10.5 Tf
-<313139> Tj
+<313137> Tj
ET
0.000 0.000 0.000 SCN
@@ -3499,7 +3448,7 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 221.79599999999948 Td
+60.24 240.27599999999947 Td
/F1.0 10.5 Tf
<31302e332e20> Tj
ET
@@ -3510,7 +3459,7 @@ ET
0.694 0.129 0.275 SCN
BT
-85.81800000000001 221.79599999999948 Td
+85.81800000000001 240.27599999999947 Td
/F3.0 10.5 Tf
<466978747572655363726970747353706563> Tj
ET
@@ -3521,7 +3470,7 @@ ET
0.694 0.129 0.275 SCN
BT
-180.318 221.79599999999948 Td
+180.318 240.27599999999947 Td
/F4.0 10.5 Tf
<d5> Tj
ET
@@ -3532,7 +3481,7 @@ ET
0.694 0.129 0.275 SCN
BT
-183.342 221.79599999999948 Td
+183.342 240.27599999999947 Td
/F3.0 10.5 Tf
<6e50726f7669646572> Tj
ET
@@ -3543,7 +3492,7 @@ ET
0.200 0.200 0.200 SCN
BT
-239.46874999999994 221.79599999999948 Td
+239.46874999999994 240.27599999999947 Td
/F1.0 10.5 Tf
<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
@@ -3552,7 +3501,7 @@ ET
0.000 0.000 0.000 scn
BT
-528.07175 221.79599999999948 Td
+528.07175 240.27599999999947 Td
/F1.0 5.25 Tf
<ca> Tj
ET
@@ -3561,9 +3510,9 @@ ET
0.200 0.200 0.200 SCN
BT
-529.4314999999999 221.79599999999948 Td
+529.4314999999999 240.27599999999947 Td
/F1.0 10.5 Tf
-<313230> Tj
+<313138> Tj
ET
0.000 0.000 0.000 SCN
@@ -3572,7 +3521,7 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 203.3159999999995 Td
+60.24 221.79599999999948 Td
/F1.0 10.5 Tf
<31302e342e20> Tj
ET
@@ -3583,7 +3532,7 @@ ET
0.694 0.129 0.275 SCN
BT
-85.81800000000001 203.3159999999995 Td
+85.81800000000001 221.79599999999948 Td
/F3.0 10.5 Tf
<5375646f53657276696365> Tj
ET
@@ -3594,7 +3543,7 @@ ET
0.200 0.200 0.200 SCN
BT
-148.6122499999999 203.3159999999995 Td
+148.6122499999999 221.79599999999948 Td
/F1.0 10.5 Tf
<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
@@ -3603,7 +3552,7 @@ ET
0.000 0.000 0.000 scn
BT
-528.07175 203.3159999999995 Td
+528.07175 221.79599999999948 Td
/F1.0 5.25 Tf
<ca> Tj
ET
@@ -3612,9 +3561,9 @@ ET
0.200 0.200 0.200 SCN
BT
-529.4314999999999 203.3159999999995 Td
+529.4314999999999 221.79599999999948 Td
/F1.0 10.5 Tf
-<313231> Tj
+<313139> Tj
ET
0.000 0.000 0.000 SCN
@@ -3623,7 +3572,7 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 184.8359999999995 Td
+60.24 203.3159999999995 Td
/F1.0 10.5 Tf
<31302e352e20> Tj
ET
@@ -3634,7 +3583,7 @@ ET
0.694 0.129 0.275 SCN
BT
-85.81800000000001 184.8359999999995 Td
+85.81800000000001 203.3159999999995 Td
/F3.0 10.5 Tf
<5377697463685573657253657276696365> Tj
ET
@@ -3645,7 +3594,7 @@ ET
0.200 0.200 0.200 SCN
BT
-175.068 184.8359999999995 Td
+175.068 203.3159999999995 Td
/F1.0 10.5 Tf
<20286465707265636174656429> Tj
ET
@@ -3656,7 +3605,7 @@ ET
0.200 0.200 0.200 SCN
BT
-244.81324999999993 184.8359999999995 Td
+244.81324999999993 203.3159999999995 Td
/F1.0 10.5 Tf
<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
@@ -3665,7 +3614,7 @@ ET
0.000 0.000 0.000 scn
BT
-528.07175 184.8359999999995 Td
+528.07175 203.3159999999995 Td
/F1.0 5.25 Tf
<ca> Tj
ET
@@ -3674,9 +3623,9 @@ ET
0.200 0.200 0.200 SCN
BT
-529.4314999999999 184.8359999999995 Td
+529.4314999999999 203.3159999999995 Td
/F1.0 10.5 Tf
-<313234> Tj
+<313232> Tj
ET
0.000 0.000 0.000 SCN
@@ -3685,7 +3634,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24 166.3559999999995 Td
+48.24 184.8359999999995 Td
/F1.0 10.5 Tf
[<31312e2050657273697374656e6365204c61> 20.01953125 <79657220415049>] TJ
ET
@@ -3696,7 +3645,7 @@ ET
0.200 0.200 0.200 SCN
BT
-175.33474999999993 166.3559999999995 Td
+175.33474999999993 184.8359999999995 Td
/F1.0 10.5 Tf
<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
@@ -3705,7 +3654,7 @@ ET
0.000 0.000 0.000 scn
BT
-528.07175 166.3559999999995 Td
+528.07175 184.8359999999995 Td
/F1.0 5.25 Tf
<ca> Tj
ET
@@ -3714,9 +3663,9 @@ ET
0.200 0.200 0.200 SCN
BT
-529.4314999999999 166.3559999999995 Td
+529.4314999999999 184.8359999999995 Td
/F1.0 10.5 Tf
-<313235> Tj
+<313233> Tj
ET
0.000 0.000 0.000 SCN
@@ -3725,7 +3674,7 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 147.87599999999952 Td
+60.24 166.3559999999995 Td
/F1.0 10.5 Tf
<31312e312e20> Tj
ET
@@ -3736,7 +3685,7 @@ ET
0.694 0.129 0.275 SCN
BT
-85.81800000000001 147.87599999999952 Td
+85.81800000000001 166.3559999999995 Td
/F3.0 10.5 Tf
<4873716c44624d616e616765724d656e75> Tj
ET
@@ -3747,7 +3696,7 @@ ET
0.200 0.200 0.200 SCN
BT
-180.6792499999999 147.87599999999952 Td
+180.6792499999999 166.3559999999995 Td
/F1.0 10.5 Tf
<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
@@ -3756,7 +3705,7 @@ ET
0.000 0.000 0.000 scn
BT
-528.07175 147.87599999999952 Td
+528.07175 166.3559999999995 Td
/F1.0 5.25 Tf
<ca> Tj
ET
@@ -3765,9 +3714,9 @@ ET
0.200 0.200 0.200 SCN
BT
-529.4314999999999 147.87599999999952 Td
+529.4314999999999 166.3559999999995 Td
/F1.0 10.5 Tf
-<313235> Tj
+<313233> Tj
ET
0.000 0.000 0.000 SCN
@@ -3776,7 +3725,7 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 129.39599999999953 Td
+60.24 147.87599999999952 Td
/F1.0 10.5 Tf
<31312e322e20> Tj
ET
@@ -3787,7 +3736,7 @@ ET
0.694 0.129 0.275 SCN
BT
-85.81800000000001 129.39599999999953 Td
+85.81800000000001 147.87599999999952 Td
/F3.0 10.5 Tf
<497369734a646f537570706f7274> Tj
ET
@@ -3798,7 +3747,7 @@ ET
0.200 0.200 0.200 SCN
BT
-164.6457499999999 129.39599999999953 Td
+164.6457499999999 147.87599999999952 Td
/F1.0 10.5 Tf
<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
@@ -3807,7 +3756,7 @@ ET
0.000 0.000 0.000 scn
BT
-528.07175 129.39599999999953 Td
+528.07175 147.87599999999952 Td
/F1.0 5.25 Tf
<ca> Tj
ET
@@ -3816,9 +3765,9 @@ ET
0.200 0.200 0.200 SCN
BT
-529.4314999999999 129.39599999999953 Td
+529.4314999999999 147.87599999999952 Td
/F1.0 10.5 Tf
-<313236> Tj
+<313234> Tj
ET
0.000 0.000 0.000 SCN
@@ -3827,7 +3776,7 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 110.91599999999954 Td
+60.24 129.39599999999953 Td
/F1.0 10.5 Tf
<31312e332e20> Tj
ET
@@ -3838,7 +3787,7 @@ ET
0.694 0.129 0.275 SCN
BT
-85.81800000000001 110.91599999999954 Td
+85.81800000000001 129.39599999999953 Td
/F3.0 10.5 Tf
<4d65747269637353657276696365> Tj
ET
@@ -3849,7 +3798,7 @@ ET
0.200 0.200 0.200 SCN
BT
-164.6457499999999 110.91599999999954 Td
+164.6457499999999 129.39599999999953 Td
/F1.0 10.5 Tf
<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
@@ -3858,7 +3807,7 @@ ET
0.000 0.000 0.000 scn
BT
-528.07175 110.91599999999954 Td
+528.07175 129.39599999999953 Td
/F1.0 5.25 Tf
<ca> Tj
ET
@@ -3867,9 +3816,9 @@ ET
0.200 0.200 0.200 SCN
BT
-529.4314999999999 110.91599999999954 Td
+529.4314999999999 129.39599999999953 Td
/F1.0 10.5 Tf
-<313331> Tj
+<313239> Tj
ET
0.000 0.000 0.000 SCN
@@ -3878,7 +3827,7 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 92.43599999999955 Td
+60.24 110.91599999999954 Td
/F1.0 10.5 Tf
<31312e342e20> Tj
ET
@@ -3889,7 +3838,7 @@ ET
0.694 0.129 0.275 SCN
BT
-85.81800000000001 92.43599999999955 Td
+85.81800000000001 110.91599999999954 Td
/F3.0 10.5 Tf
<5175657279526573756c74734361636865> Tj
ET
@@ -3900,7 +3849,7 @@ ET
0.200 0.200 0.200 SCN
BT
-180.6792499999999 92.43599999999955 Td
+180.6792499999999 110.91599999999954 Td
/F1.0 10.5 Tf
<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
@@ -3909,7 +3858,7 @@ ET
0.000 0.000 0.000 scn
BT
-528.07175 92.43599999999955 Td
+528.07175 110.91599999999954 Td
/F1.0 5.25 Tf
<ca> Tj
ET
@@ -3918,9 +3867,9 @@ ET
0.200 0.200 0.200 SCN
BT
-529.4314999999999 92.43599999999955 Td
+529.4314999999999 110.91599999999954 Td
/F1.0 10.5 Tf
-<313332> Tj
+<313330> Tj
ET
0.000 0.000 0.000 SCN
@@ -3929,7 +3878,7 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 73.95599999999956 Td
+60.24 92.43599999999955 Td
/F1.0 10.5 Tf
<31312e352e20> Tj
ET
@@ -3940,7 +3889,7 @@ ET
0.694 0.129 0.275 SCN
BT
-85.81800000000001 73.95599999999956 Td
+85.81800000000001 92.43599999999955 Td
/F3.0 10.5 Tf
<5265706f7369746f727953657276696365> Tj
ET
@@ -3951,7 +3900,7 @@ ET
0.200 0.200 0.200 SCN
BT
-180.6792499999999 73.95599999999956 Td
+180.6792499999999 92.43599999999955 Td
/F1.0 10.5 Tf
<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
@@ -3960,7 +3909,7 @@ ET
0.000 0.000 0.000 scn
BT
-528.07175 73.95599999999956 Td
+528.07175 92.43599999999955 Td
/F1.0 5.25 Tf
<ca> Tj
ET
@@ -3969,9 +3918,9 @@ ET
0.200 0.200 0.200 SCN
BT
-529.4314999999999 73.95599999999956 Td
+529.4314999999999 92.43599999999955 Td
/F1.0 10.5 Tf
-<313335> Tj
+<313333> Tj
ET
0.000 0.000 0.000 SCN
@@ -3980,7 +3929,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24 55.47599999999957 Td
+48.24 73.95599999999956 Td
/F1.0 10.5 Tf
[<31322e2050657273697374656e6365204c61> 20.01953125 <79657220535049>] TJ
ET
@@ -3991,7 +3940,7 @@ ET
0.200 0.200 0.200 SCN
BT
-175.33474999999993 55.47599999999957 Td
+175.33474999999993 73.95599999999956 Td
/F1.0 10.5 Tf
<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
@@ -4000,7 +3949,7 @@ ET
0.000 0.000 0.000 scn
BT
-528.07175 55.47599999999957 Td
+528.07175 73.95599999999956 Td
/F1.0 5.25 Tf
<ca> Tj
ET
@@ -4009,43 +3958,18 @@ ET
0.200 0.200 0.200 SCN
BT
-529.4314999999999 55.47599999999957 Td
+529.4314999999999 73.95599999999956 Td
/F1.0 10.5 Tf
-<313432> Tj
+<313430> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-Q
-
-endstream
-endobj
-12 0 obj
-<< /Type /Page
-/Parent 3 0 R
-/MediaBox [0 0 595.28 841.89]
-/Contents 11 0 R
-/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F1.0 8 0 R
-/F3.0 43 0 R
-/F4.0 59 0 R
->>
->>
-/Annots [1800 0 R 1801 0 R 1802 0 R 1803 0 R 1804 0 R 1805 0 R 1806 0 R 1807 0 R 1808 0 R 1809 0 R 1810 0 R 1811 0 R 1812 0 R 1813 0 R 1814 0 R 1815 0 R 1816 0 R 1817 0 R 1818 0 R 1819 0 R 1820 0 R 1821 0 R 1822 0 R 1823 0 R 1824 0 R 1825 0 R 1826 0 R 1827 0 R 1828 0 R 1829 0 R 1830 0 R 1831 0 R 1832 0 R 1833 0 R 1834 0 R 1835 0 R 1836 0 R 1837 0 R 1838 0 R 1839 0 R 1840 0 R 1841 0 R 1842 0 R 1843 0 R 1844 0 R 1845 0 R 1846 0 R 1847 0 R 1848 0 R 1849 0 R 1850 0 R 1851 0 R 1852 0 R 1853 0 R 1854 0 R 1855 0 R 1856 0 R 1857 0 R 1858 0 R 1859 0 R 1860 0 R 1861 0 R 1862 0 R 1863 0 R 1864 0 R 1865 0 R 1866 0 R 1867 0 R 1868 0 R 1869 0 R 1870 0 R 1871 0 R 1872 0 R 1873 0 R 1874 0 R 1875 0 R 1876 0 R 1877 0 R 1878 0 R 1879 0 R 1880 0 R 1881 0 R 1882 0 R 1883 0 R 1884 0 R 1885 0 R 1886 0 R 1887 0 R 1888 0 R 1889 0 R 1890 0 R 1891 0 R 1892 0 R 1893 0 R 1894 0 R 1895 0 R 1896 0 R 1897 0 R 1898 0 R 1899 0 R 1900 0 R 1901 0 R 1902 0 R 1903 0 R 1904 0 R 1905 0 R 1906 0 R 1907 0 R 1908 0 R 1909 0
R 1910 0 R 1911 0 R 1912 0 R 1913 0 R 1914 0 R 1915 0 R 1916 0 R 1917 0 R 1918 0 R 1919 0 R]
->>
-endobj
-13 0 obj
-<< /Length 4807
->>
-stream
-q
-/DeviceRGB cs
0.200 0.200 0.200 scn
-/DeviceRGB CS
0.200 0.200 0.200 SCN
BT
-60.24 794.6759999999999 Td
+60.24 55.47599999999957 Td
/F1.0 10.5 Tf
<31322e312e20> Tj
ET
@@ -4056,7 +3980,7 @@ ET
0.694 0.129 0.275 SCN
BT
-85.81800000000001 794.6759999999999 Td
+85.81800000000001 55.47599999999957 Td
/F3.0 10.5 Tf
<4175646974657253657276696365> Tj
ET
@@ -4067,7 +3991,7 @@ ET
0.200 0.200 0.200 SCN
BT
-164.6457499999999 794.6759999999999 Td
+164.6457499999999 55.47599999999957 Td
/F1.0 10.5 Tf
<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
@@ -4076,7 +4000,7 @@ ET
0.000 0.000 0.000 scn
BT
-528.07175 794.6759999999999 Td
+528.07175 55.47599999999957 Td
/F1.0 5.25 Tf
<ca> Tj
ET
@@ -4085,18 +4009,43 @@ ET
0.200 0.200 0.200 SCN
BT
-529.4314999999999 794.6759999999999 Td
+529.4314999999999 55.47599999999957 Td
/F1.0 10.5 Tf
-<313433> Tj
+<313431> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
+Q
+
+endstream
+endobj
+12 0 obj
+<< /Type /Page
+/Parent 3 0 R
+/MediaBox [0 0 595.28 841.89]
+/Contents 11 0 R
+/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
+/Font << /F1.0 8 0 R
+/F3.0 43 0 R
+/F4.0 57 0 R
+>>
+>>
+/Annots [1743 0 R 1744 0 R 1745 0 R 1746 0 R 1747 0 R 1748 0 R 1749 0 R 1750 0 R 1751 0 R 1752 0 R 1753 0 R 1754 0 R 1755 0 R 1756 0 R 1757 0 R 1758 0 R 1759 0 R 1760 0 R 1761 0 R 1762 0 R 1763 0 R 1764 0 R 1765 0 R 1766 0 R 1767 0 R 1768 0 R 1769 0 R 1770 0 R 1771 0 R 1772 0 R 1773 0 R 1774 0 R 1775 0 R 1776 0 R 1777 0 R 1778 0 R 1779 0 R 1780 0 R 1781 0 R 1782 0 R 1783 0 R 1784 0 R 1785 0 R 1786 0 R 1787 0 R 1788 0 R 1789 0 R 1790 0 R 1791 0 R 1792 0 R 1793 0 R 1794 0 R 1795 0 R 1796 0 R 1797 0 R 1798 0 R 1799 0 R 1800 0 R 1801 0 R 1802 0 R 1803 0 R 1804 0 R 1805 0 R 1806 0 R 1807 0 R 1808 0 R 1809 0 R 1810 0 R 1811 0 R 1812 0 R 1813 0 R 1814 0 R 1815 0 R 1816 0 R 1817 0 R 1818 0 R 1819 0 R 1820 0 R 1821 0 R 1822 0 R 1823 0 R 1824 0 R 1825 0 R 1826 0 R 1827 0 R 1828 0 R 1829 0 R 1830 0 R 1831 0 R 1832 0 R 1833 0 R 1834 0 R 1835 0 R 1836 0 R 1837 0 R 1838 0 R 1839 0 R 1840 0 R 1841 0 R 1842 0 R 1843 0 R 1844 0 R 1845 0 R 1846 0 R 1847 0 R 1848 0 R 1849 0 R 1850 0 R 1851 0 R 1852 0
R 1853 0 R 1854 0 R 1855 0 R 1856 0 R 1857 0 R 1858 0 R 1859 0 R 1860 0 R 1861 0 R 1862 0 R]
+>>
+endobj
+13 0 obj
+<< /Length 3820
+>>
+stream
+q
+/DeviceRGB cs
0.200 0.200 0.200 scn
+/DeviceRGB CS
0.200 0.200 0.200 SCN
BT
-60.24 776.1959999999999 Td
+60.24 794.6759999999999 Td
/F1.0 10.5 Tf
<31322e322e20> Tj
ET
@@ -4107,7 +4056,7 @@ ET
0.694 0.129 0.275 SCN
BT
-85.81800000000001 776.1959999999999 Td
+85.81800000000001 794.6759999999999 Td
/F3.0 10.5 Tf
<5075626c697368657253657276696365> Tj
ET
@@ -4118,7 +4067,7 @@ ET
0.200 0.200 0.200 SCN
BT
-175.33474999999993 776.1959999999999 Td
+175.33474999999993 794.6759999999999 Td
/F1.0 10.5 Tf
<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
@@ -4127,7 +4076,7 @@ ET
0.000 0.000 0.000 scn
BT
-528.07175 776.1959999999999 Td
+528.07175 794.6759999999999 Td
/F1.0 5.25 Tf
<ca> Tj
ET
@@ -4136,9 +4085,9 @@ ET
0.200 0.200 0.200 SCN
BT
-529.4314999999999 776.1959999999999 Td
+529.4314999999999 794.6759999999999 Td
/F1.0 10.5 Tf
-<313435> Tj
+<313433> Tj
ET
0.000 0.000 0.000 SCN
@@ -4147,7 +4096,7 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 757.7159999999999 Td
+60.24 776.1959999999999 Td
/F1.0 10.5 Tf
<31322e332e20> Tj
ET
@@ -4158,7 +4107,7 @@ ET
0.694 0.129 0.275 SCN
BT
-85.81800000000001 757.7159999999999 Td
+85.81800000000001 776.1959999999999 Td
/F3.0 10.5 Tf
<55736572526567697374726174696f6e53657276696365> Tj
ET
@@ -4169,7 +4118,7 @@ ET
0.200 0.200 0.200 SCN
BT
-207.40174999999994 757.7159999999999 Td
+207.40174999999994 776.1959999999999 Td
/F1.0 10.5 Tf
<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
@@ -4178,7 +4127,7 @@ ET
0.000 0.000 0.000 scn
BT
-528.07175 757.7159999999999 Td
+528.07175 776.1959999999999 Td
/F1.0 5.25 Tf
<ca> Tj
ET
@@ -4187,9 +4136,9 @@ ET
0.200 0.200 0.200 SCN
BT
-529.4314999999999 757.7159999999999 Td
+529.4314999999999 776.1959999999999 Td
/F1.0 10.5 Tf
-<313438> Tj
+<313436> Tj
ET
0.000 0.000 0.000 SCN
@@ -4198,7 +4147,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24 739.2359999999999 Td
+48.24 757.7159999999999 Td
/F1.0 10.5 Tf
[<31332e20426f6f74737472> 20.01953125 <617070696e6720535049>] TJ
ET
@@ -4209,7 +4158,7 @@ ET
0.200 0.200 0.200 SCN
BT
-159.30124999999992 739.2359999999999 Td
+159.30124999999992 757.7159999999999 Td
/F1.0 10.5 Tf
<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
@@ -4218,7 +4167,7 @@ ET
0.000 0.000 0.000 scn
BT
-528.07175 739.2359999999999 Td
+528.07175 757.7159999999999 Td
/F1.0 5.25 Tf
<ca> Tj
ET
@@ -4227,9 +4176,9 @@ ET
0.200 0.200 0.200 SCN
BT
-529.4314999999999 739.2359999999999 Td
+529.4314999999999 757.7159999999999 Td
/F1.0 10.5 Tf
-<313531> Tj
+<313439> Tj
ET
0.000 0.000 0.000 SCN
@@ -4238,7 +4187,7 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 720.7559999999999 Td
+60.24 739.2359999999999 Td
/F1.0 10.5 Tf
<31332e312e20> Tj
ET
@@ -4249,7 +4198,7 @@ ET
0.694 0.129 0.275 SCN
BT
-85.81800000000001 720.7559999999999 Td
+85.81800000000001 739.2359999999999 Td
/F3.0 10.5 Tf
<436c617373446973636f7665727953657276696365> Tj
ET
@@ -4260,7 +4209,7 @@ ET
0.200 0.200 0.200 SCN
BT
-202.05724999999995 720.7559999999999 Td
+202.05724999999995 739.2359999999999 Td
/F1.0 10.5 Tf
<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
@@ -4269,7 +4218,7 @@ ET
0.000 0.000 0.000 scn
BT
-528.07175 720.7559999999999 Td
+528.07175 739.2359999999999 Td
/F1.0 5.25 Tf
<ca> Tj
ET
@@ -4278,9 +4227,9 @@ ET
0.200 0.200 0.200 SCN
BT
-529.4314999999999 720.7559999999999 Td
+529.4314999999999 739.2359999999999 Td
/F1.0 10.5 Tf
-<313531> Tj
+<313439> Tj
ET
0.000 0.000 0.000 SCN
@@ -4299,7 +4248,7 @@ endobj
/F3.0 43 0 R
>>
>>
-/Annots [1920 0 R 1921 0 R 1922 0 R 1923 0 R 1924 0 R 1925 0 R 1926 0 R 1927 0 R 1928 0 R 1929 0 R 1930 0 R 1931 0 R 1932 0 R 1933 0 R]
+/Annots [1863 0 R 1864 0 R 1865 0 R 1866 0 R 1867 0 R 1868 0 R 1869 0 R 1870 0 R 1871 0 R 1872 0 R 1873 0 R]
>>
endobj
15 0 obj
@@ -4906,7 +4855,7 @@ endobj
/Font << /F2.0 20 0 R
/F1.0 8 0 R
>>
-/XObject << /Stamp1 1934 0 R
+/XObject << /Stamp1 1874 0 R
>>
>>
/Annots [22 0 R 23 0 R 24 0 R 25 0 R 26 0 R 27 0 R 28 0 R 29 0 R 30 0 R 31 0 R 32 0 R 33 0 R 34 0 R 35 0 R 36 0 R]
@@ -4921,18 +4870,18 @@ endobj
>>
endobj
19 0 obj
-<< /Kids [1541 0 R 1542 0 R]
+<< /Kids [1485 0 R 1486 0 R]
>>
endobj
20 0 obj
<< /Type /Font
/BaseFont /AAAACI+NotoSerif-Bold
/Subtype /TrueType
-/FontDescriptor 2028 0 R
+/FontDescriptor 1967 0 R
/FirstChar 32
/LastChar 255
-/Widths 2030 0 R
-/ToUnicode 2029 0 R
+/Widths 1969 0 R
+/ToUnicode 1968 0 R
>>
endobj
21 0 obj
@@ -5499,7 +5448,7 @@ endobj
/F3.0 43 0 R
>>
/XObject << /I1 41 0 R
-/Stamp1 1934 0 R
+/Stamp1 1874 0 R
>>
>>
/Annots [42 0 R 44 0 R 45 0 R 46 0 R 47 0 R 48 0 R]
@@ -5591,11 +5540,11 @@ endobj
<< /Type /Font
/BaseFont /AAAACJ+mplus1mn-regular
/Subtype /TrueType
-/FontDescriptor 2032 0 R
+/FontDescriptor 1971 0 R
/FirstChar 32
/LastChar 255
-/Widths 2034 0 R
-/ToUnicode 2033 0 R
+/Widths 1973 0 R
+/ToUnicode 1972 0 R
>>
endobj
44 0 obj
@@ -5654,7 +5603,7 @@ endobj
>>
endobj
49 0 obj
-<< /Length 28850
+<< /Length 27133
>>
stream
q
@@ -7205,7 +7154,7 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-2.150 Tw
+2.487 Tw
BT
48.239999999999995 159.72600000000008 Td
@@ -7220,27 +7169,27 @@ ET
0.694 0.129 0.275 scn
0.694 0.129 0.275 SCN
-2.150 Tw
+2.487 Tw
BT
-350.12866992187503 159.72600000000008 Td
+352.152544921875 159.72600000000008 Td
/F3.0 10.5 Tf
-<466163746f727953657276696365> Tj
+<466163746f72795365727669636523696e7374616e746961746528> 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
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
-2.150 Tw
+2.487 Tw
BT
-423.62866992187503 159.72600000000008 Td
-/F1.0 10.5 Tf
-<277320> Tj
+493.902544921875 159.72600000000008 Td
+/F4.0 10.5 Tf
+<c9> Tj
ET
@@ -7250,27 +7199,12 @@ ET
0.694 0.129 0.275 scn
0.694 0.129 0.275 SCN
-2.150 Tw
+2.487 Tw
BT
-435.5433349609375 159.72600000000008 Td
+504.402544921875 159.72600000000008 Td
/F3.0 10.5 Tf
-<696e7374616e74696174652829> 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
-
-2.150 Tw
-
-BT
-503.7933349609375 159.72600000000008 Td
-/F1.0 10.5 Tf
-<206d6574686f64> Tj
+<29> Tj
ET
@@ -7280,12 +7214,12 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-0.056 Tw
+2.487 Tw
BT
-48.239999999999995 143.94600000000008 Td
+509.652544921875 159.72600000000008 Td
/F1.0 10.5 Tf
-<286f7220746865206465707265636174656420> Tj
+<206f7220746865> Tj
ET
@@ -7295,70 +7229,43 @@ ET
0.694 0.129 0.275 scn
0.694 0.129 0.275 SCN
-0.056 Tw
-
BT
-143.044875 143.94600000000008 Td
+48.239999999999995 143.94600000000008 Td
/F3.0 10.5 Tf
-<446f6d61696e4f626a656374436f6e7461696e6572> Tj
+<5265706f7369746f72795365727669636523696e7374616e746961746528> 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
-
-0.056 Tw
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
BT
-253.294875 143.94600000000008 Td
-/F1.0 10.5 Tf
-<277320> Tj
+205.74 143.94600000000008 Td
+/F4.0 10.5 Tf
+<c9> 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
-0.056 Tw
-
BT
-263.116 143.94600000000008 Td
+216.24 143.94600000000008 Td
/F3.0 10.5 Tf
-<6e65775472616e7369656e74496e7374616e63652829> 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
-
-0.056 Tw
-
-BT
-378.616 143.94600000000008 Td
-/F1.0 10.5 Tf
-<206d6574686f64292077696c6c206175746f6d61746963616c6c7920696e6a656374> Tj
+<29> 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
BT
-48.239999999999995 128.16600000000008 Td
+221.49 143.94600000000008 Td
/F1.0 10.5 Tf
-<7468652073657276696365732e> Tj
+<27732077696c6c206175746f6d61746963616c6c7920696e6a656374207468652073657276696365732e> Tj
ET
0.000 0.000 0.000 SCN
@@ -7369,7 +7276,7 @@ ET
4.638 Tw
BT
-48.239999999999995 100.38600000000008 Td
+48.239999999999995 116.16600000000008 Td
/F1.0 10.5 Tf
<416c7465726e61746976656c7920746865206f626a6563742063616e20626520696e7374616e7469617465642073696d706c79207573696e6720> Tj
ET
@@ -7384,7 +7291,7 @@ ET
4.638 Tw
BT
-369.2863333333333 100.38600000000008 Td
+369.2863333333333 116.16600000000008 Td
/F3.0 10.5 Tf
<6e6577> Tj
ET
@@ -7399,7 +7306,7 @@ ET
4.638 Tw
BT
-385.0363333333333 100.38600000000008 Td
+385.0363333333333 116.16600000000008 Td
/F1.0 10.5 Tf
<2c207468656e20736572766963657320696e6a6563746564207573696e67> Tj
ET
@@ -7411,163 +7318,65 @@ ET
0.694 0.129 0.275 scn
0.694 0.129 0.275 SCN
-6.506 Tw
-
BT
-48.239999999999995 84.60600000000008 Td
+48.239999999999995 100.38600000000008 Td
/F3.0 10.5 Tf
<536572766963655265676973747279> 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
-6.506 Tw
-
BT
-126.99 84.60600000000008 Td
+126.99 100.38600000000008 Td
/F1.0 10.5 Tf
<277320> 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
-6.506 Tw
-
BT
-143.26108333333332 84.60600000000008 Td
+136.755 100.38600000000008 Td
/F3.0 10.5 Tf
<696e6a6563745365727669636573496e746f28> 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
-6.506 Tw
-
BT
-243.01108333333332 84.60600000000008 Td
+236.505 100.38600000000008 Td
/F4.0 10.5 Tf
<c9> 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
-6.506 Tw
-
BT
-253.51108333333332 84.60600000000008 Td
+247.005 100.38600000000008 Td
/F3.0 10.5 Tf
<29> 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
-
-6.506 Tw
-
-BT
-258.7610833333333 84.60600000000008 Td
-/F1.0 10.5 Tf
-<206d6574686f6420286f7220746865206465707265636174656420> 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
-
-6.506 Tw
-
-BT
-429.7445 84.60600000000008 Td
-/F3.0 10.5 Tf
-<446f6d61696e4f626a656374436f6e7461696e6572> 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
-6.506 Tw
-
BT
-539.9945 84.60600000000008 Td
+252.255 100.38600000000008 Td
/F1.0 10.5 Tf
-<2773> 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
-
-BT
-48.239999999999995 68.82600000000008 Td
-/F3.0 10.5 Tf
-<696e6a6563745365727669636573496e746f28> Tj
-ET
-
-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
-
-BT
-147.99 68.82600000000008 Td
-/F4.0 10.5 Tf
-<c9> Tj
-ET
-
-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
-
-BT
-158.49 68.82600000000008 Td
-/F3.0 10.5 Tf
-<29> Tj
-ET
-
-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
-
-BT
-163.74 68.82600000000008 Td
-/F1.0 10.5 Tf
-<206d6574686f64292e> Tj
+<206d6574686f642e> Tj
ET
0.000 0.000 0.000 SCN
@@ -7606,12 +7415,12 @@ endobj
/F1.0 8 0 R
/F3.0 43 0 R
/F3.1 55 0 R
-/F4.0 59 0 R
+/F4.0 57 0 R
>>
-/XObject << /Stamp1 1934 0 R
+/XObject << /Stamp1 1874 0 R
>>
>>
-/Annots [52 0 R 53 0 R 56 0 R 57 0 R 58 0 R 60 0 R]
+/Annots [52 0 R 53 0 R 56 0 R 58 0 R 59 0 R 60 0 R 61 0 R 62 0 R 63 0 R]
>>
endobj
51 0 obj
@@ -7646,11 +7455,11 @@ endobj
<< /Type /Font
/BaseFont /AAAACK+mplus1mn-regular
/Subtype /TrueType
-/FontDescriptor 2036 0 R
+/FontDescriptor 1975 0 R
/FirstChar 32
/LastChar 255
-/Widths 2038 0 R
-/ToUnicode 2037 0 R
+/Widths 1977 0 R
+/ToUnicode 1976 0 R
>>
endobj
56 0 obj
@@ -7660,55 +7469,88 @@ endobj
/URI (../rgsvc/rgsvc.pdf#_rgsvc_core-domain-api_FactoryService)
>>
/Subtype /Link
-/Rect [350.12866992187503 158.25600000000009 423.62866992187503 168.75600000000009]
+/Rect [352.152544921875 158.25600000000009 493.902544921875 168.75600000000009]
/Type /Annot
>>
endobj
57 0 obj
+<< /Type /Font
+/BaseFont /AAAACL+mplus-1p-regular
+/Subtype /TrueType
+/FontDescriptor 1979 0 R
+/FirstChar 32
+/LastChar 255
+/Widths 1981 0 R
+/ToUnicode 1980 0 R
+>>
+endobj
+58 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
-/URI (../rgsvc/rgsvc.pdf#_rgsvc_core-domain-api_DomainObjectContainer)
+/URI (../rgsvc/rgsvc.pdf#_rgsvc_core-domain-api_FactoryService)
>>
/Subtype /Link
-/Rect [143.044875 142.47600000000008 253.294875 152.97600000000008]
+/Rect [493.902544921875 158.25600000000009 504.402544921875 168.75600000000009]
/Type /Annot
>>
endobj
-58 0 obj
+59 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
-/URI (../rgsvc/rgsvc.pdf#_rgsvc_metadata-api_ServiceRegistry)
+/URI (../rgsvc/rgsvc.pdf#_rgsvc_core-domain-api_FactoryService)
>>
/Subtype /Link
-/Rect [48.239999999999995 83.13600000000008 126.99 93.63600000000008]
+/Rect [504.402544921875 158.25600000000009 509.652544921875 168.75600000000009]
/Type /Annot
>>
endobj
-59 0 obj
-<< /Type /Font
-/BaseFont /AAAACL+mplus-1p-regular
-/Subtype /TrueType
-/FontDescriptor 2040 0 R
-/FirstChar 32
-/LastChar 255
-/Widths 2042 0 R
-/ToUnicode 2041 0 R
->>
-endobj
60 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
-/URI (../rgsvc/rgsvc.pdf#_rgsvc_core-domain-api_DomainObjectContainer)
+/URI (../rgsvc/rgsvc.pdf#_rgsvc_core-domain-api_RepositoryService)
>>
/Subtype /Link
-/Rect [429.7445 83.13600000000008 539.9945 93.63600000000008]
+/Rect [48.239999999999995 142.47600000000008 205.74 152.97600000000008]
/Type /Annot
>>
endobj
61 0 obj
+<< /Border [0 0 0]
+/A << /Type /Action
+/S /URI
+/URI (../rgsvc/rgsvc.pdf#_rgsvc_core-domain-api_RepositoryService)
+>>
+/Subtype /Link
+/Rect [205.74 142.47600000000008 216.24 152.97600000000008]
+/Type /Annot
+>>
+endobj
+62 0 obj
+<< /Border [0 0 0]
+/A << /Type /Action
+/S /URI
+/URI (../rgsvc/rgsvc.pdf#_rgsvc_core-domain-api_RepositoryService)
+>>
+/Subtype /Link
+/Rect [216.24 142.47600000000008 221.49 152.97600000000008]
+/Type /Annot
+>>
+endobj
+63 0 obj
+<< /Border [0 0 0]
+/A << /Type /Action
+/S /URI
+/URI (../rgsvc/rgsvc.pdf#_rgsvc_metadata-api_ServiceRegistry)
+>>
+/Subtype /Link
+/Rect [48.239999999999995 98.91600000000008 126.99 109.41600000000008]
+/Type /Annot
+>>
+endobj
+64 0 obj
<< /Length 16954
>>
stream
@@ -8805,28 +8647,28 @@ Q
endstream
endobj
-62 0 obj
+65 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 61 0 R
+/Contents 64 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/Font << /F2.0 20 0 R
/F1.0 8 0 R
/F3.0 43 0 R
-/F5.1 65 0 R
+/F5.1 68 0 R
/F3.1 55 0 R
>>
-/XObject << /Stamp1 1934 0 R
+/XObject << /Stamp1 1874 0 R
>>
>>
-/Annots [64 0 R 66 0 R 67 0 R 68 0 R 69 0 R]
+/Annots [67 0 R 69 0 R 70 0 R 71 0 R 72 0 R]
>>
endobj
-63 0 obj
-[62 0 R /XYZ 0 841.89 null]
+66 0 obj
+[65 0 R /XYZ 0 841.89 null]
endobj
-64 0 obj
+67 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -8837,18 +8679,18 @@ endobj
/Type /Annot
>>
endobj
-65 0 obj
+68 0 obj
<< /Type /Font
/BaseFont /AAAACM+FontAwesome
/Subtype /TrueType
-/FontDescriptor 2044 0 R
+/FontDescriptor 1983 0 R
/FirstChar 32
/LastChar 255
-/Widths 2046 0 R
-/ToUnicode 2045 0 R
+/Widths 1985 0 R
+/ToUnicode 1984 0 R
>>
endobj
-66 0 obj
+69 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -8859,7 +8701,7 @@ endobj
/Type /Annot
>>
endobj
-67 0 obj
+70 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -8870,7 +8712,7 @@ endobj
/Type /Annot
>>
endobj
-68 0 obj
+71 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -8881,18 +8723,18 @@ endobj
/Type /Annot
>>
endobj
-69 0 obj
+72 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
-/URI (../rgsvc/rgsvc.pdf#_rgsvc_api_LocaleProvider)
+/URI (../rgsvc/rgsvc.pdf#_rgsvc_presentation-layer-spi_LocaleProvider)
>>
/Subtype /Link
/Rect [435.1057991536458 586.9359999999999 508.6057991536458 597.4359999999999]
/Type /Annot
>>
endobj
-70 0 obj
+73 0 obj
<< /Length 25625
>>
stream
@@ -10640,39 +10482,39 @@ Q
endstream
endobj
-71 0 obj
+74 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 70 0 R
+/Contents 73 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/Font << /F3.0 43 0 R
/F3.1 55 0 R
/F1.0 8 0 R
-/F6.0 72 0 R
+/F6.0 75 0 R
/F2.0 20 0 R
>>
-/XObject << /Stamp1 1934 0 R
+/XObject << /Stamp1 1874 0 R
>>
>>
-/Annots [74 0 R 75 0 R]
+/Annots [77 0 R 78 0 R]
>>
endobj
-72 0 obj
+75 0 obj
<< /Type /Font
/BaseFont /AAAACN+NotoSerif-Italic
/Subtype /TrueType
-/FontDescriptor 2048 0 R
+/FontDescriptor 1987 0 R
/FirstChar 32
/LastChar 255
-/Widths 2050 0 R
-/ToUnicode 2049 0 R
+/Widths 1989 0 R
+/ToUnicode 1988 0 R
>>
endobj
-73 0 obj
-[71 0 R /XYZ 0 361.15000000000003 null]
+76 0 obj
+[74 0 R /XYZ 0 361.15000000000003 null]
endobj
-74 0 obj
+77 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -10683,7 +10525,7 @@ endobj
/Type /Annot
>>
endobj
-75 0 obj
+78 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -10694,7 +10536,7 @@ endobj
/Type /Annot
>>
endobj
-76 0 obj
+79 0 obj
<< /Length 26410
>>
stream
@@ -12339,24 +12181,24 @@ Q
endstream
endobj
-77 0 obj
+80 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 76 0 R
+/Contents 79 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/Font << /F1.0 8 0 R
/F3.0 43 0 R
-/F4.0 59 0 R
-/F5.1 65 0 R
+/F4.0 57 0 R
+/F5.1 68 0 R
>>
-/XObject << /Stamp1 1934 0 R
+/XObject << /Stamp1 1874 0 R
>>
>>
-/Annots [78 0 R 79 0 R 80 0 R 81 0 R 82 0 R 83 0 R 84 0 R 85 0 R 86 0 R 87 0 R 88 0 R 89 0 R 90 0 R 91 0 R 92 0 R 93 0 R 94 0 R 95 0 R 96 0 R 97 0 R 98 0 R 99 0 R 100 0 R 101 0 R 102 0 R 103 0 R]
+/Annots [81 0 R 82 0 R 83 0 R 84 0 R 85 0 R 86 0 R 87 0 R 88 0 R 89 0 R 90 0 R 91 0 R 92 0 R 93 0 R 94 0 R 95 0 R 96 0 R 97 0 R 98 0 R 99 0 R 100 0 R 101 0 R 102 0 R 103 0 R 104 0 R 105 0 R 106 0 R]
>>
endobj
-78 0 obj
+81 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -12367,7 +12209,7 @@ endobj
/Type /Annot
>>
endobj
-79 0 obj
+82 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -12378,7 +12220,7 @@ endobj
/Type /Annot
>>
endobj
-80 0 obj
+83 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -12389,7 +12231,7 @@ endobj
/Type /Annot
>>
endobj
-81 0 obj
+84 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -12400,7 +12242,7 @@ endobj
/Type /Annot
>>
endobj
-82 0 obj
+85 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -12411,7 +12253,7 @@ endobj
/Type /Annot
>>
endobj
-83 0 obj
+86 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -12422,7 +12264,7 @@ endobj
/Type /Annot
>>
endobj
-84 0 obj
+87 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -12433,7 +12275,7 @@ endobj
/Type /Annot
>>
endobj
-85 0 obj
+88 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -12444,7 +12286,7 @@ endobj
/Type /Annot
>>
endobj
-86 0 obj
+89 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -12455,7 +12297,7 @@ endobj
/Type /Annot
>>
endobj
-87 0 obj
+90 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -12466,7 +12308,7 @@ endobj
/Type /Annot
>>
endobj
-88 0 obj
+91 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -12477,7 +12319,7 @@ endobj
/Type /Annot
>>
endobj
-89 0 obj
+92 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -12488,7 +12330,7 @@ endobj
/Type /Annot
>>
endobj
-90 0 obj
+93 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -12499,7 +12341,7 @@ endobj
/Type /Annot
>>
endobj
-91 0 obj
+94 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -12510,7 +12352,7 @@ endobj
/Type /Annot
>>
endobj
-92 0 obj
+95 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -12521,7 +12363,7 @@ endobj
/Type /Annot
>>
endobj
-93 0 obj
+96 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -12532,7 +12374,7 @@ endobj
/Type /Annot
>>
endobj
-94 0 obj
+97 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -12543,7 +12385,7 @@ endobj
/Type /Annot
>>
endobj
-95 0 obj
+98 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -12554,7 +12396,7 @@ endobj
/Type /Annot
>>
endobj
-96 0 obj
+99 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -12565,7 +12407,7 @@ endobj
/Type /Annot
>>
endobj
-97 0 obj
+100 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -12576,7 +12418,7 @@ endobj
/Type /Annot
>>
endobj
-98 0 obj
+101 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -12587,7 +12429,7 @@ endobj
/Type /Annot
>>
endobj
-99 0 obj
+102 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -12598,7 +12440,7 @@ endobj
/Type /Annot
>>
endobj
-100 0 obj
+103 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -12609,7 +12451,7 @@ endobj
/Type /Annot
>>
endobj
-101 0 obj
+104 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -12620,7 +12462,7 @@ endobj
/Type /Annot
>>
endobj
-102 0 obj
+105 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -12631,7 +12473,7 @@ endobj
/Type /Annot
>>
endobj
-103 0 obj
+106 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -12642,7 +12484,7 @@ endobj
/Type /Annot
>>
endobj
-104 0 obj
+107 0 obj
<< /Length 2793
>>
stream
@@ -12800,22 +12642,22 @@ Q
endstream
endobj
-105 0 obj
+108 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 104 0 R
+/Contents 107 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/Font << /F1.0 8 0 R
/F3.0 43 0 R
>>
-/XObject << /Stamp1 1934 0 R
+/XObject << /Stamp1 1874 0 R
>>
>>
-/Annots [106 0 R]
+/Annots [109 0 R]
>>
endobj
-106 0 obj
+109 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -12826,7 +12668,7 @@ endobj
/Type /Annot
>>
endobj
-107 0 obj
+110 0 obj
<< /Length 26654
>>
stream
@@ -14690,27 +14532,27 @@ Q
endstream
endobj
-108 0 obj
+111 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 107 0 R
+/Contents 110 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/Font << /F2.0 20 0 R
/F1.0 8 0 R
-/F6.0 72 0 R
+/F6.0 75 0 R
/F3.0 43 0 R
>>
-/XObject << /Stamp1 1934 0 R
+/XObject << /Stamp1 1874 0 R
>>
>>
-/Annots [110 0 R 111 0 R 112 0 R 113 0 R 114 0 R 115 0 R 116 0 R 117 0 R 118 0 R 119 0 R 120 0 R 121 0 R 122 0 R 123 0 R 124 0 R 125 0 R 126 0 R 127 0 R 128 0 R 129 0 R 130 0 R 131 0 R 132 0 R 133 0 R 134 0 R 135 0 R 136 0 R 137 0 R 138 0 R 139 0 R 140 0 R 141 0 R]
+/Annots [113 0 R 114 0 R 115 0 R 116 0 R 117 0 R 118 0 R 119 0 R 120 0 R 121 0 R 122 0 R 123 0 R 124 0 R 125 0 R 126 0 R 127 0 R 128 0 R 129 0 R 130 0 R 131 0 R 132 0 R 133 0 R 134 0 R 135 0 R 136 0 R 137 0 R 138 0 R 139 0 R 140 0 R 141 0 R 142 0 R 143 0 R 144 0 R]
>>
endobj
-109 0 obj
-[108 0 R /XYZ 0 841.89 null]
+112 0 obj
+[111 0 R /XYZ 0 841.89 null]
endobj
-110 0 obj
+113 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -14721,7 +14563,7 @@ endobj
/Type /Annot
>>
endobj
-111 0 obj
+114 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -14732,7 +14574,7 @@ endobj
/Type /Annot
>>
endobj
-112 0 obj
+115 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -14743,7 +14585,7 @@ endobj
/Type /Annot
>>
endobj
-113 0 obj
+116 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -14754,7 +14596,7 @@ endobj
/Type /Annot
>>
endobj
-114 0 obj
+117 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -14765,7 +14607,7 @@ endobj
/Type /Annot
>>
endobj
-115 0 obj
+118 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -14776,7 +14618,7 @@ endobj
/Type /Annot
>>
endobj
-116 0 obj
+119 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -14787,7 +14629,7 @@ endobj
/Type /Annot
>>
endobj
-117 0 obj
+120 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -14798,7 +14640,7 @@ endobj
/Type /Annot
>>
endobj
-118 0 obj
+121 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -14809,7 +14651,7 @@ endobj
/Type /Annot
>>
endobj
-119 0 obj
+122 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -14820,7 +14662,7 @@ endobj
/Type /Annot
>>
endobj
-120 0 obj
+123 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -14831,7 +14673,7 @@ endobj
/Type /Annot
>>
endobj
-121 0 obj
+124 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -14842,7 +14684,7 @@ endobj
/Type /Annot
>>
endobj
-122 0 obj
+125 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -14853,7 +14695,7 @@ endobj
/Type /Annot
>>
endobj
-123 0 obj
+126 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -14864,7 +14706,7 @@ endobj
/Type /Annot
>>
endobj
-124 0 obj
+127 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -14875,7 +14717,7 @@ endobj
/Type /Annot
>>
endobj
-125 0 obj
+128 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -14886,7 +14728,7 @@ endobj
/Type /Annot
>>
endobj
-126 0 obj
+129 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -14897,7 +14739,7 @@ endobj
/Type /Annot
>>
endobj
-127 0 obj
+130 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -14908,7 +14750,7 @@ endobj
/Type /Annot
>>
endobj
-128 0 obj
+131 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -14919,7 +14761,7 @@ endobj
/Type /Annot
>>
endobj
-129 0 obj
+132 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -14930,7 +14772,7 @@ endobj
/Type /Annot
>>
endobj
-130 0 obj
+133 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -14941,7 +14783,7 @@ endobj
/Type /Annot
>>
endobj
-131 0 obj
+134 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -14952,7 +14794,7 @@ endobj
/Type /Annot
>>
endobj
-132 0 obj
+135 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -14963,7 +14805,7 @@ endobj
/Type /Annot
>>
endobj
-133 0 obj
+136 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -14974,7 +14816,7 @@ endobj
/Type /Annot
>>
endobj
-134 0 obj
+137 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -14985,7 +14827,7 @@ endobj
/Type /Annot
>>
endobj
-135 0 obj
+138 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -14996,7 +14838,7 @@ endobj
/Type /Annot
>>
endobj
-136 0 obj
+139 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -15007,7 +14849,7 @@ endobj
/Type /Annot
>>
endobj
-137 0 obj
+140 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -15018,7 +14860,7 @@ endobj
/Type /Annot
>>
endobj
-138 0 obj
+141 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -15029,7 +14871,7 @@ endobj
/Type /Annot
>>
endobj
-139 0 obj
+142 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -15040,7 +14882,7 @@ endobj
/Type /Annot
>>
endobj
-140 0 obj
+143 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -15051,7 +14893,7 @@ endobj
/Type /Annot
>>
endobj
-141 0 obj
+144 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -15062,7 +14904,7 @@ endobj
/Type /Annot
>>
endobj
-142 0 obj
+145 0 obj
<< /Length 20140
>>
stream
@@ -16292,28 +16134,28 @@ Q
endstream
endobj
-143 0 obj
+146 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 142 0 R
+/Contents 145 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/Font << /F1.0 8 0 R
/F3.0 43 0 R
/F2.0 20 0 R
-/F5.1 65 0 R
+/F5.1 68 0 R
/F3.1 55 0 R
>>
-/XObject << /Stamp1 1934 0 R
+/XObject << /Stamp1 1874 0 R
>>
>>
-/Annots [145 0 R 146 0 R 147 0 R 149 0 R 150 0 R 151 0 R 152 0 R]
+/Annots [148 0 R 149 0 R 150 0 R 152 0 R 153 0 R 154 0 R 155 0 R]
>>
endobj
-144 0 obj
-[143 0 R /XYZ 0 756.33 null]
+147 0 obj
+[146 0 R /XYZ 0 756.33 null]
endobj
-145 0 obj
+148 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -16324,7 +16166,7 @@ endobj
/Type /Annot
>>
endobj
-146 0 obj
+149 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -16335,7 +16177,7 @@ endobj
/Type /Annot
>>
endobj
-147 0 obj
+150 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -16346,10 +16188,10 @@ endobj
/Type /Annot
>>
endobj
-148 0 obj
-[143 0 R /XYZ 0 573.7900000000001 null]
+151 0 obj
+[146 0 R /XYZ 0 573.7900000000001 null]
endobj
-149 0 obj
+152 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -16360,7 +16202,7 @@ endobj
/Type /Annot
>>
endobj
-150 0 obj
+153 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -16371,7 +16213,7 @@ endobj
/Type /Annot
>>
endobj
-151 0 obj
+154 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -16382,7 +16224,7 @@ endobj
/Type /Annot
>>
endobj
-152 0 obj
+155 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -16393,16 +16235,16 @@ endobj
/Type /Annot
>>
endobj
-153 0 obj
-[143 0 R /XYZ 0 192.27000000000027 null]
+156 0 obj
+[146 0 R /XYZ 0 192.27000000000027 null]
endobj
-154 0 obj
+157 0 obj
<< /Type /XObject
/Subtype /Image
/Height 441
/Width 789
/BitsPerComponent 8
-/ColorSpace [/Indexed /DeviceRGB 255 155 0 R]
+/ColorSpace [/Indexed /DeviceRGB 255 158 0 R]
/Length 9715
/Filter [/FlateDecode]
/DecodeParms [<< /Predictor 15
@@ -16478,14 +16320,14 @@ P
|` >� X�� �V �+ ����
endstream
endobj
-155 0 obj
+158 0 obj
<< /Length 768
>>
stream
8]�8^�9_�:`�>b�:a�;b�;c�<e�=f�>h�?i�Kl�Qq�Ao�Cp�Ds�Et�Gx�Hz�J}�J~�P�q�?o�Cj�Vu�E~�Qf�bU��O��P��U��U��X��[��]��a��f��l��p��r��x��x��}��W��Y��^��a��g��l��o��x��������щ�ӌ�Ԏ�Ւ�֔�ך�ٜ�ڟ�ۡ�Ȥ�ݳˀ�ӓ�Ӕ�ǥ��ߴ�ӯ����������ܪ�ҷ��������������������������������������������������������������������������������������������������������������������������������������������
endstream
endobj
-156 0 obj
+159 0 obj
<< /Length 11012
>>
stream
@@ -17174,25 +17016,25 @@ Q
endstream
endobj
-157 0 obj
+160 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 156 0 R
+/Contents 159 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/XObject << /I2 154 0 R
-/Stamp1 1934 0 R
+/XObject << /I2 157 0 R
+/Stamp1 1874 0 R
>>
/Font << /F1.0 8 0 R
/F3.0 43 0 R
-/F5.1 65 0 R
+/F5.1 68 0 R
/F2.0 20 0 R
>>
>>
-/Annots [158 0 R 159 0 R 160 0 R]
+/Annots [161 0 R 162 0 R 163 0 R]
>>
endobj
-158 0 obj
+161 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -17203,7 +17045,7 @@ endobj
/Type /Annot
>>
endobj
-159 0 obj
+162 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -17214,7 +17056,7 @@ endobj
/Type /Annot
>>
endobj
-160 0 obj
+163 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -17225,13 +17067,13 @@ endobj
/Type /Annot
>>
endobj
-161 0 obj
-[157 0 R /XYZ 0 281.73304182509503 null]
+164 0 obj
+[160 0 R /XYZ 0 281.73304182509503 null]
endobj
-162 0 obj
-[157 0 R /XYZ 0 154.533041825095 null]
+165 0 obj
+[160 0 R /XYZ 0 154.533041825095 null]
endobj
-163 0 obj
+166 0 obj
<< /Length 19888
>>
stream
@@ -18497,24 +18339,24 @@ Q
endstream
endobj
-164 0 obj
+167 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 163 0 R
+/Contents 166 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/Font << /F3.0 43 0 R
/F3.1 55 0 R
/F1.0 8 0 R
/F2.0 20 0 R
>>
-/XObject << /Stamp1 1934 0 R
+/XObject << /Stamp1 1874 0 R
>>
>>
-/Annots [165 0 R 168 0 R 169 0 R 170 0 R 171 0 R 173 0 R 174 0 R 175 0 R 177 0 R 178 0 R 179 0 R]
+/Annots [168 0 R 171 0 R 172 0 R 173 0 R 174 0 R 176 0 R 177 0 R 178 0 R 180 0 R 181 0 R 182 0 R]
>>
endobj
-165 0 obj
+168 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -18525,13 +18367,13 @@ endobj
/Type /Annot
>>
endobj
-166 0 obj
-[164 0 R /XYZ 0 662.33 null]
+169 0 obj
+[167 0 R /XYZ 0 662.33 null]
endobj
-167 0 obj
-[164 0 R /XYZ 0 535.1300000000002 null]
+170 0 obj
+[167 0 R /XYZ 0 535.1300000000002 null]
endobj
-168 0 obj
+171 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -18542,7 +18384,7 @@ endobj
/Type /Annot
>>
endobj
-169 0 obj
+172 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -18553,7 +18395,7 @@ endobj
/Type /Annot
>>
endobj
-170 0 obj
+173 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -18564,7 +18406,7 @@ endobj
/Type /Annot
>>
endobj
-171 0 obj
+174 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -18575,10 +18417,10 @@ endobj
/Type /Annot
>>
endobj
-172 0 obj
-[164 0 R /XYZ 0 271.17000000000024 null]
+175 0 obj
+[167 0 R /XYZ 0 271.17000000000024 null]
endobj
-173 0 obj
+176 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -18589,7 +18431,7 @@ endobj
/Type /Annot
>>
endobj
-174 0 obj
+177 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -18600,7 +18442,7 @@ endobj
/Type /Annot
>>
endobj
-175 0 obj
+178 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -18611,10 +18453,10 @@ endobj
/Type /Annot
>>
endobj
-176 0 obj
-[164 0 R /XYZ 0 194.3300000000002 null]
+179 0 obj
+[167 0 R /XYZ 0 194.3300000000002 null]
endobj
-177 0 obj
+180 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -18625,7 +18467,7 @@ endobj
/Type /Annot
>>
endobj
-178 0 obj
+181 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -18636,7 +18478,7 @@ endobj
/Type /Annot
>>
endobj
-179 0 obj
+182 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -18647,7 +18489,7 @@ endobj
/Type /Annot
>>
endobj
-180 0 obj
+183 0 obj
<< /Length 41878
>>
stream
@@ -21510,27 +21352,27 @@ Q
endstream
endobj
-181 0 obj
+184 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 180 0 R
+/Contents 183 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F5.1 65 0 R
+/Font << /F5.1 68 0 R
/F1.0 8 0 R
/F2.0 20 0 R
/F3.0 43 0 R
>>
-/XObject << /Stamp1 1934 0 R
+/XObject << /Stamp1 1874 0 R
>>
>>
-/Annots [183 0 R 184 0 R 185 0 R 187 0 R]
+/Annots [186 0 R 187 0 R 188 0 R 190 0 R]
>>
endobj
-182 0 obj
-[181 0 R /XYZ 0 706.99 null]
+185 0 obj
+[184 0 R /XYZ 0 706.99 null]
endobj
-183 0 obj
+186 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -21541,7 +21383,7 @@ endobj
/Type /Annot
>>
endobj
-184 0 obj
+187 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -21552,7 +21394,7 @@ endobj
/Type /Annot
>>
endobj
-185 0 obj
+188 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -21563,10 +21405,10 @@ endobj
/Type /Annot
>>
endobj
-186 0 obj
-[181 0 R /XYZ 0 452.15000000000015 null]
+189 0 obj
+[184 0 R /XYZ 0 452.15000000000015 null]
endobj
-187 0 obj
+190 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -21577,7 +21419,7 @@ endobj
/Type /Annot
>>
endobj
-188 0 obj
+191 0 obj
<< /Length 8485
>>
stream
@@ -22196,21 +22038,21 @@ Q
endstream
endobj
-189 0 obj
+192 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 188 0 R
+/Contents 191 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/Font << /F1.0 8 0 R
/F3.0 43 0 R
>>
-/XObject << /Stamp1 1934 0 R
+/XObject << /Stamp1 1874 0 R
>>
>>
>>
endobj
-190 0 obj
+193 0 obj
<< /Length 17750
>>
stream
@@ -23452,37 +23294,37 @@ Q
endstream
endobj
-191 0 obj
+194 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 190 0 R
+/Contents 193 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/Font << /F2.0 20 0 R
/F1.0 8 0 R
-/F6.0 72 0 R
+/F6.0 75 0 R
/F3.0 43 0 R
>>
-/XObject << /Stamp1 1934 0 R
+/XObject << /Stamp1 1874 0 R
>>
>>
-/Annots [195 0 R 196 0 R 197 0 R 198 0 R 199 0 R 200 0 R 201 0 R 202 0 R 203 0 R 204 0 R 205 0 R 206 0 R 207 0 R 208 0 R 209 0 R 210 0 R 211 0 R 212 0 R]
+/Annots [198 0 R 199 0 R 200 0 R 201 0 R 202 0 R 203 0 R 204 0 R 205 0 R 206 0 R 207 0 R 208 0 R 209 0 R 210 0 R 211 0 R 212 0 R 213 0 R 214 0 R 215 0 R]
>>
endobj
-192 0 obj
-[191 0 R /XYZ 0 841.89 null]
+195 0 obj
+[194 0 R /XYZ 0 841.89 null]
endobj
-193 0 obj
+196 0 obj
<< /Limits [(__rgsvc) (__rgsvc_intro_public-api)]
-/Names [(__rgsvc) 17 0 R (__rgsvc_application-layer-api_CommandContext_screencast) 682 0 R (__rgsvc_application-layer-api_InteractionContext_Related-Classes) 754 0 R (__rgsvc_core-domain-api_EventBusService_Configuration) 1064 0 R (__rgsvc_core-domain-api_EventBusService_api-and-implementation) 1026 0 R (__rgsvc_core-domain-api_EventBusService_event-hierarchy) 1051 0 R (__rgsvc_integration-api_JaxbService_api-and-implementation) 1197 0 R (__rgsvc_intro_commands-and-events) 73 0 R (__rgsvc_intro_overriding-the-services) 63 0 R (__rgsvc_intro_public-api) 51 0 R]
+/Names [(__rgsvc) 17 0 R (__rgsvc_application-layer-api_CommandContext_screencast) 674 0 R (__rgsvc_application-layer-api_InteractionContext_Related-Classes) 746 0 R (__rgsvc_core-domain-api_EventBusService_Configuration) 1016 0 R (__rgsvc_core-domain-api_EventBusService_api-and-implementation) 978 0 R (__rgsvc_core-domain-api_EventBusService_event-hierarchy) 1003 0 R (__rgsvc_integration-api_JaxbService_api-and-implementation) 1146 0 R (__rgsvc_intro_commands-and-events) 76 0 R (__rgsvc_intro_overriding-the-services) 66 0 R (__rgsvc_intro_public-api) 51 0 R]
>>
endobj
-194 0 obj
+197 0 obj
<< /Limits [(_rgsvc_presentation-layer-api) (_rgsvc_presentation-layer-spi_GridService)]
-/Names [(_rgsvc_presentation-layer-api) 109 0 R (_rgsvc_presentation-layer-api_AcceptHeaderService) 144 0 R (_rgsvc_presentation-layer-spi) 192 0 R (_rgsvc_presentation-layer-spi_ContentMappingService) 291 0 R (_rgsvc_presentation-layer-spi_ContentMappingService_implementations) 299 0 R (_rgsvc_presentation-layer-spi_EmailNotificationService) 310 0 R (_rgsvc_presentation-layer-spi_ErrorReportingService) 325 0 R (_rgsvc_presentation-layer-spi_ExceptionRecognizer) 339 0 R (_rgsvc_presentation-layer-spi_GridLoaderService) 352 0 R (_rgsvc_presentation-layer-spi_GridService) 363 0 R]
+/Names [(_rgsvc_presentation-layer-api) 112 0 R (_rgsvc_presentation-layer-api_AcceptHeaderService) 147 0 R (_rgsvc_presentation-layer-spi) 195 0 R (_rgsvc_presentation-layer-spi_ContentMappingService) 294 0 R (_rgsvc_presentation-layer-spi_ContentMappingService_implementations) 302 0 R (_rgsvc_presentation-layer-spi_EmailNotificationService) 313 0 R (_rgsvc_presentation-layer-spi_ErrorReportingService) 328 0 R (_rgsvc_presentation-layer-spi_ExceptionRecognizer) 342 0 R (_rgsvc_presentation-layer-spi_GridLoaderService) 355 0 R (_rgsvc_presentation-layer-spi_GridService) 366 0 R]
>>
endobj
-195 0 obj
+198 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -23493,7 +23335,7 @@ endobj
/Type /Annot
>>
endobj
-196 0 obj
+199 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -23504,7 +23346,7 @@ endobj
/Type /Annot
>>
endobj
-197 0 obj
+200 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -23515,7 +23357,7 @@ endobj
/Type /Annot
>>
endobj
-198 0 obj
+201 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -23526,7 +23368,7 @@ endobj
/Type /Annot
>>
endobj
-199 0 obj
+202 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -23537,7 +23379,7 @@ endobj
/Type /Annot
>>
endobj
-200 0 obj
+203 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -23548,7 +23390,7 @@ endobj
/Type /Annot
>>
endobj
-201 0 obj
+204 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -23559,7 +23401,7 @@ endobj
/Type /Annot
>>
endobj
-202 0 obj
+205 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -23570,7 +23412,7 @@ endobj
/Type /Annot
>>
endobj
-203 0 obj
+206 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -23581,7 +23423,7 @@ endobj
/Type /Annot
>>
endobj
-204 0 obj
+207 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -23592,7 +23434,7 @@ endobj
/Type /Annot
>>
endobj
-205 0 obj
+208 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -23603,7 +23445,7 @@ endobj
/Type /Annot
>>
endobj
-206 0 obj
+209 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -23614,7 +23456,7 @@ endobj
/Type /Annot
>>
endobj
-207 0 obj
+210 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -23625,7 +23467,7 @@ endobj
/Type /Annot
>>
endobj
-208 0 obj
+211 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -23636,7 +23478,7 @@ endobj
/Type /Annot
>>
endobj
-209 0 obj
+212 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -23647,7 +23489,7 @@ endobj
/Type /Annot
>>
endobj
-210 0 obj
+213 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -23658,7 +23500,7 @@ endobj
/Type /Annot
>>
endobj
-211 0 obj
+214 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -23669,7 +23511,7 @@ endobj
/Type /Annot
>>
endobj
-212 0 obj
+215 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -23680,7 +23522,7 @@ endobj
/Type /Annot
>>
endobj
-213 0 obj
+216 0 obj
<< /Length 28868
>>
stream
@@ -25741,23 +25583,23 @@ Q
endstream
endobj
-214 0 obj
+217 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 213 0 R
+/Contents 216 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/Font << /F2.0 20 0 R
/F3.0 43 0 R
/F1.0 8 0 R
>>
-/XObject << /Stamp1 1934 0 R
+/XObject << /Stamp1 1874 0 R
>>
>>
-/Annots [215 0 R 216 0 R 217 0 R 218 0 R 219 0 R 220 0 R 221 0 R 222 0 R 223 0 R 224 0 R 225 0 R 226 0 R 227 0 R 228 0 R 229 0 R 230 0 R 231 0 R 232 0 R 233 0 R 234 0 R 235 0 R 236 0 R 237 0 R 238 0 R 239 0 R 240 0 R 241 0 R 242 0 R 243 0 R 244 0 R 245 0 R 246 0 R 247 0 R]
+/Annots [218 0 R 219 0 R 220 0 R 221 0 R 222 0 R 223 0 R 224 0 R 225 0 R 226 0 R 227 0 R 228 0 R 229 0 R 230 0 R 231 0 R 232 0 R 233 0 R 234 0 R 235 0 R 236 0 R 237 0 R 238 0 R 239 0 R 240 0 R 241 0 R 242 0 R 243 0 R 244 0 R 245 0 R 246 0 R 247 0 R 248 0 R 249 0 R 250 0 R]
>>
endobj
-215 0 obj
+218 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -25768,7 +25610,7 @@ endobj
/Type /Annot
>>
endobj
-216 0 obj
+219 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -25779,7 +25621,7 @@ endobj
/Type /Annot
>>
endobj
-217 0 obj
+220 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -25790,7 +25632,7 @@ endobj
/Type /Annot
>>
endobj
-218 0 obj
+221 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -25801,7 +25643,7 @@ endobj
/Type /Annot
>>
endobj
-219 0 obj
+222 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -25812,7 +25654,7 @@ endobj
/Type /Annot
>>
endobj
-220 0 obj
+223 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -25823,7 +25665,7 @@ endobj
/Type /Annot
>>
endobj
-221 0 obj
+224 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -25834,7 +25676,7 @@ endobj
/Type /Annot
>>
endobj
-222 0 obj
+225 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -25845,7 +25687,7 @@ endobj
/Type /Annot
>>
endobj
-223 0 obj
+226 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -25856,7 +25698,7 @@ endobj
/Type /Annot
>>
endobj
-224 0 obj
+227 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -25867,7 +25709,7 @@ endobj
/Type /Annot
>>
endobj
-225 0 obj
+228 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -25878,7 +25720,7 @@ endobj
/Type /Annot
>>
endobj
-226 0 obj
+229 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -25889,7 +25731,7 @@ endobj
/Type /Annot
>>
endobj
-227 0 obj
+230 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -25900,7 +25742,7 @@ endobj
/Type /Annot
>>
endobj
-228 0 obj
+231 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -25911,7 +25753,7 @@ endobj
/Type /Annot
>>
endobj
-229 0 obj
+232 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -25922,7 +25764,7 @@ endobj
/Type /Annot
>>
endobj
-230 0 obj
+233 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -25933,7 +25775,7 @@ endobj
/Type /Annot
>>
endobj
-231 0 obj
+234 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -25944,7 +25786,7 @@ endobj
/Type /Annot
>>
endobj
-232 0 obj
+235 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -25955,7 +25797,7 @@ endobj
/Type /Annot
>>
endobj
-233 0 obj
+236 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -25966,7 +25808,7 @@ endobj
/Type /Annot
>>
endobj
-234 0 obj
+237 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -25977,7 +25819,7 @@ endobj
/Type /Annot
>>
endobj
-235 0 obj
+238 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -25988,7 +25830,7 @@ endobj
/Type /Annot
>>
endobj
-236 0 obj
+239 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -25999,7 +25841,7 @@ endobj
/Type /Annot
>>
endobj
-237 0 obj
+240 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -26010,7 +25852,7 @@ endobj
/Type /Annot
>>
endobj
-238 0 obj
+241 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -26021,7 +25863,7 @@ endobj
/Type /Annot
>>
endobj
-239 0 obj
+242 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -26032,7 +25874,7 @@ endobj
/Type /Annot
>>
endobj
-240 0 obj
+243 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -26043,7 +25885,7 @@ endobj
/Type /Annot
>>
endobj
-241 0 obj
+244 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -26054,7 +25896,7 @@ endobj
/Type /Annot
>>
endobj
-242 0 obj
+245 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -26065,7 +25907,7 @@ endobj
/Type /Annot
>>
endobj
-243 0 obj
+246 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -26076,7 +25918,7 @@ endobj
/Type /Annot
>>
endobj
-244 0 obj
+247 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -26087,7 +25929,7 @@ endobj
/Type /Annot
>>
endobj
-245 0 obj
+248 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -26098,7 +25940,7 @@ endobj
/Type /Annot
>>
endobj
-246 0 obj
+249 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -26109,7 +25951,7 @@ endobj
/Type /Annot
>>
endobj
-247 0 obj
+250 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -26120,7 +25962,7 @@ endobj
/Type /Annot
>>
endobj
-248 0 obj
+251 0 obj
<< /Length 23013
>>
stream
@@ -27785,23 +27627,23 @@ Q
endstream
endobj
-249 0 obj
+252 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 248 0 R
+/Contents 251 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/Font << /F2.0 20 0 R
/F3.0 43 0 R
/F1.0 8 0 R
>>
-/XObject << /Stamp1 1934 0 R
+/XObject << /Stamp1 1874 0 R
>>
>>
-/Annots [250 0 R 251 0 R 252 0 R 253 0 R 254 0 R 255 0 R 256 0 R 257 0 R 258 0 R 259 0 R 260 0 R 261 0 R 262 0 R 263 0 R 264 0 R 265 0 R 266 0 R 267 0 R 268 0 R 269 0 R 270 0 R 271 0 R 272 0 R 273 0 R 274 0 R 275 0 R 276 0 R 277 0 R 278 0 R]
+/Annots [253 0 R 254 0 R 255 0 R 256 0 R 257 0 R 258 0 R 259 0 R 260 0 R 261 0 R 262 0 R 263 0 R 264 0 R 265 0 R 266 0 R 267 0 R 268 0 R 269 0 R 270 0 R 271 0 R 272
<TRUNCATED>
[23/39] isis-site git commit: ISIS-1810: updates docs for 2.0.0-M1
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/274edd1d/content/versions/2.0.0-M1/guides/ugodn/ugodn.pdf
----------------------------------------------------------------------
diff --git a/content/versions/2.0.0-M1/guides/ugodn/ugodn.pdf b/content/versions/2.0.0-M1/guides/ugodn/ugodn.pdf
index d5c4550..3f0fe06 100644
--- a/content/versions/2.0.0-M1/guides/ugodn/ugodn.pdf
+++ b/content/versions/2.0.0-M1/guides/ugodn/ugodn.pdf
@@ -4,8 +4,8 @@
<< /Title (DataNucleus Object Store)
/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:20180812182701+01'00')
-/ModDate (D:20180812182701+01'00')
+/CreationDate (D:20180814004039+02'00')
+/ModDate (D:20180814004039+02'00')
>>
endobj
2 0 obj
http://git-wip-us.apache.org/repos/asf/isis-site/blob/274edd1d/content/versions/2.0.0-M1/guides/ugsec/ugsec.html
----------------------------------------------------------------------
diff --git a/content/versions/2.0.0-M1/guides/ugsec/ugsec.html b/content/versions/2.0.0-M1/guides/ugsec/ugsec.html
index a11f989..19b0903 100644
--- a/content/versions/2.0.0-M1/guides/ugsec/ugsec.html
+++ b/content/versions/2.0.0-M1/guides/ugsec/ugsec.html
@@ -1549,16 +1549,16 @@ securityManager.cacheManager = $memoryCacheManager</code></pre>
<p>Generally speaking your domain objects (or more generally your application) should be agnostic of the user/roles that are interacting with them; applying security permissions is the responsibility of the framework.</p>
</div>
<div class="paragraph">
- <p>Still, on very rare occasion you may have a need, in which case you can either use Apache Isis' <code>DomainObjectContainer</code> API or you can reach further down the stack and use the JEE Servlet API.</p>
+ <p>Still, on very rare occasion you may have a need, in which case you can either use Apache Isis' <code>UserService</code> API or you can reach further down the stack and use the JEE Servlet API.</p>
</div>
<div class="sect2">
- <h3 id="__code_domainobjectcontainer_code_api">6.1. <code>DomainObjectContainer</code> API</h3>
+ <h3 id="__code_userservice_code_api">6.1. <code>UserService</code> API</h3>
<div class="paragraph">
- <p>The <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_DomainObjectContainer"><code>DomainObjectContainer</code></a> service exposes the following API:</p>
+ <p>The <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_UserService"><code>UserService</code></a> service exposes the following API:</p>
</div>
<div class="listingblock">
<div class="content">
- <pre class="CodeRay highlight"><code data-lang="java"><span class="directive">final</span> UserMemento user = container.getUser();
+ <pre class="CodeRay highlight"><code data-lang="java"><span class="directive">final</span> UserMemento user = userService.getUser();
<span class="directive">final</span> <span class="predefined-type">List</span><RoleMemento> roles = user.getRoles();
<span class="keyword">for</span> (RoleMemento role : roles) {
<span class="predefined-type">String</span> roleName = role.getName();
@@ -1587,7 +1587,7 @@ securityManager.cacheManager = $memoryCacheManager</code></pre>
<div class="sect2">
<h3 id="_servlet_api">6.2. Servlet API</h3>
<div class="paragraph">
- <p>On occasion you may find it necessary to reach below Isis and to the underlying servlet API. For example, the (non-ASF) <a href="http://platform.incode.org" target="_blank">Incode Platform</a>'s togglz module (non-ASF) has a requirement to do this in order to expose its embedded togglz web console. (</p>
+ <p>On occasion you may find it necessary to reach below Apache Isis and to the underlying servlet API. For example, the (non-ASF) <a href="http://platform.incode.org" target="_blank">Incode Platform</a>'s togglz module (non-ASF) has a requirement to do this in order to expose its embedded togglz web console. (</p>
</div>
<div class="admonitionblock tip">
<table>
http://git-wip-us.apache.org/repos/asf/isis-site/blob/274edd1d/content/versions/2.0.0-M1/guides/ugsec/ugsec.pdf
----------------------------------------------------------------------
diff --git a/content/versions/2.0.0-M1/guides/ugsec/ugsec.pdf b/content/versions/2.0.0-M1/guides/ugsec/ugsec.pdf
index 00c91b8..3214832 100644
--- a/content/versions/2.0.0-M1/guides/ugsec/ugsec.pdf
+++ b/content/versions/2.0.0-M1/guides/ugsec/ugsec.pdf
@@ -4,8 +4,8 @@
<< /Title (Security)
/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:20180812182709+01'00')
-/ModDate (D:20180812182709+01'00')
+/CreationDate (D:20180814004048+02'00')
+/ModDate (D:20180814004048+02'00')
>>
endobj
2 0 obj
@@ -88,7 +88,7 @@ endobj
>>
endobj
9 0 obj
-<< /Length 20679
+<< /Length 20699
>>
stream
q
@@ -893,7 +893,7 @@ ET
BT
79.9485 400.7359999999997 Td
/F4.0 10.5 Tf
-<446f6d61696e4f626a656374436f6e7461696e6572> Tj
+<5573657253657276696365> Tj
ET
0.000 0.000 0.000 SCN
@@ -902,7 +902,7 @@ ET
0.200 0.200 0.200 SCN
BT
-190.19850000000002 400.7359999999997 Td
+137.69850000000002 400.7359999999997 Td
/F1.0 10.5 Tf
<20415049> Tj
ET
@@ -913,9 +913,9 @@ ET
0.200 0.200 0.200 SCN
BT
-213.27124999999995 400.7359999999997 Td
+159.82624999999996 400.7359999999997 Td
/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -15539,7 +15539,7 @@ endobj
endobj
159 0 obj
<< /Limits [(caching) (wicket-viewer)]
-/Names [(caching) 184 0 R (code-domainobjectcontainer-code-api) 195 0 R (code-roles-code-section) 84 0 R (code-users-code-section) 83 0 R (code-web-inf-shiro-ini-code) 66 0 R (configuring-shiro-authenticator) 61 0 R (externalized-inirealm) 88 0 R (externalizing-role-perms) 103 0 R (further-reading) 188 0 R (other-guides) 17 0 R (restful-objects-viewer) 219 0 R (servlet-api) 197 0 R (shiro-configuration) 80 0 R (shiro-configuration-2) 96 0 R (telling-apache-isis-to-use-shiro) 55 0 R (terminology) 33 0 R (user-registration) 214 0 R (user-registration-2) 225 0 R (wicket-viewer) 208 0 R]
+/Names [(caching) 184 0 R (code-roles-code-section) 84 0 R (code-users-code-section) 83 0 R (code-userservice-code-api) 195 0 R (code-web-inf-shiro-ini-code) 66 0 R (configuring-shiro-authenticator) 61 0 R (externalized-inirealm) 88 0 R (externalizing-role-perms) 103 0 R (further-reading) 188 0 R (other-guides) 17 0 R (restful-objects-viewer) 219 0 R (servlet-api) 197 0 R (shiro-configuration) 80 0 R (shiro-configuration-2) 96 0 R (telling-apache-isis-to-use-shiro) 55 0 R (terminology) 33 0 R (user-registration) 214 0 R (user-registration-2) 225 0 R (wicket-viewer) 208 0 R]
>>
endobj
160 0 obj
@@ -22512,7 +22512,7 @@ endobj
>>
endobj
192 0 obj
-<< /Length 21260
+<< /Length 21230
>>
stream
q
@@ -22591,7 +22591,7 @@ ET
BT
48.24 678.086 Td
/F4.0 10.5 Tf
-<446f6d61696e4f626a656374436f6e7461696e6572> Tj
+<5573657253657276696365> Tj
ET
0.000 0.000 0.000 SCN
@@ -22600,7 +22600,7 @@ ET
0.200 0.200 0.200 SCN
BT
-158.49 678.086 Td
+105.99000000000001 678.086 Td
/F1.0 10.5 Tf
<20415049206f7220796f752063616e207265616368206675727468657220646f776e2074686520737461636b20616e642075736520746865204a454520536572766c6574204150492e> Tj
ET
@@ -22624,7 +22624,7 @@ ET
BT
83.574 638.2460000000001 Td
/F4.0 18 Tf
-<446f6d61696e4f626a656374436f6e7461696e6572> Tj
+<5573657253657276696365> Tj
ET
0.000 0.000 0.000 SCN
@@ -22633,7 +22633,7 @@ ET
0.200 0.200 0.200 SCN
BT
-272.57399999999996 638.2460000000001 Td
+182.57399999999998 638.2460000000001 Td
/F2.0 18 Tf
<20415049> Tj
ET
@@ -22657,7 +22657,7 @@ ET
BT
69.66 610.2260000000001 Td
/F4.0 10.5 Tf
-<446f6d61696e4f626a656374436f6e7461696e6572> Tj
+<5573657253657276696365> Tj
ET
0.000 0.000 0.000 SCN
@@ -22666,7 +22666,7 @@ ET
0.200 0.200 0.200 SCN
BT
-179.91000000000003 610.2260000000001 Td
+127.41000000000003 610.2260000000001 Td
/F1.0 10.5 Tf
<2073657276696365206578706f7365732074686520666f6c6c6f77696e67204150493a> Tj
ET
@@ -22794,7 +22794,7 @@ ET
BT
196.74 571.5850000000002 Td
/F4.0 11 Tf
-<636f6e7461696e6572> Tj
+<7573657253657276696365> Tj
ET
0.000 0.000 0.000 SCN
@@ -22803,7 +22803,7 @@ ET
0.200 0.200 0.200 SCN
BT
-246.24 571.5850000000002 Td
+257.24 571.5850000000002 Td
/F4.0 11 Tf
<2e> Tj
ET
@@ -22814,7 +22814,7 @@ ET
0.200 0.200 0.200 SCN
BT
-251.74 571.5850000000002 Td
+262.74 571.5850000000002 Td
/F4.0 11 Tf
<67657455736572> Tj
ET
@@ -22825,7 +22825,7 @@ ET
0.200 0.200 0.200 SCN
BT
-290.24 571.5850000000002 Td
+301.24 571.5850000000002 Td
/F4.0 11 Tf
<28> Tj
ET
@@ -22836,7 +22836,7 @@ ET
0.200 0.200 0.200 SCN
BT
-295.74 571.5850000000002 Td
+306.74 571.5850000000002 Td
/F4.0 11 Tf
<29> Tj
ET
@@ -22847,7 +22847,7 @@ ET
0.200 0.200 0.200 SCN
BT
-301.24 571.5850000000002 Td
+312.24 571.5850000000002 Td
/F4.0 11 Tf
<3b> Tj
ET
@@ -23574,12 +23574,12 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-1.042 Tw
+0.062 Tw
BT
48.24 228.50600000000017 Td
/F1.0 10.5 Tf
-[<4f6e206f63636173696f6e20796f75206d61> 20.01953125 <792066696e64206974206e656365737361727920746f2072656163682062656c6f77204973697320616e6420746f2074686520756e6465726c79696e6720736572766c6574204150492e202046> 40.0390625 <6f72>] TJ
+[<4f6e206f63636173696f6e20796f75206d61> 20.01953125 <792066696e64206974206e656365737361727920746f2072656163682062656c6f7720417061636865204973697320616e6420746f2074686520756e6465726c79696e6720736572766c6574204150492e>] TJ
ET
@@ -23589,12 +23589,12 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-0.742 Tw
+0.267 Tw
BT
48.24 212.72600000000017 Td
/F1.0 10.5 Tf
-<6578616d706c652c2074686520286e6f6e2d4153462920> Tj
+[<46> 40.0390625 <6f72206578616d706c652c2074686520286e6f6e2d4153462920>] TJ
ET
@@ -23604,10 +23604,10 @@ ET
0.259 0.545 0.792 scn
0.259 0.545 0.792 SCN
-0.742 Tw
+0.267 Tw
BT
-169.4402142857143 212.72600000000017 Td
+187.7704927455357 212.72600000000017 Td
/F1.0 10.5 Tf
<496e636f646520506c6174666f726d> Tj
ET
@@ -23619,12 +23619,12 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-0.742 Tw
+0.267 Tw
BT
-250.79028571428572 212.72600000000017 Td
+268.64584347098213 212.72600000000017 Td
/F1.0 10.5 Tf
-<277320746f67676c7a206d6f64756c6520286e6f6e2d4153462920686173206120726571756972656d656e7420746f20646f207468697320696e> Tj
+<277320746f67676c7a206d6f64756c6520286e6f6e2d4153462920686173206120726571756972656d656e7420746f20646f2074686973> Tj
ET
@@ -23637,7 +23637,7 @@ ET
BT
48.24 196.94600000000017 Td
/F1.0 10.5 Tf
-<6f7264657220746f206578706f73652069747320656d62656464656420746f67676c7a2077656220636f6e736f6c652e202028> Tj
+<696e206f7264657220746f206578706f73652069747320656d62656464656420746f67676c7a2077656220636f6e736f6c652e202028> Tj
ET
0.000 0.000 0.000 SCN
@@ -23863,10 +23863,10 @@ endobj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
-/URI (../rgsvc/rgsvc.pdf#_rgsvc_core-domain-api_DomainObjectContainer)
+/URI (../rgsvc/rgsvc.pdf#_rgsvc_core-domain-api_UserService)
>>
/Subtype /Link
-/Rect [69.66 608.7560000000001 179.91000000000003 619.2560000000001]
+/Rect [69.66 608.7560000000001 127.41000000000003 619.2560000000001]
/Type /Annot
>>
endobj
@@ -23880,7 +23880,7 @@ endobj
/URI (http://platform.incode.org)
>>
/Subtype /Link
-/Rect [169.4402142857143 209.66000000000017 250.79028571428572 223.94000000000017]
+/Rect [187.7704927455357 209.66000000000017 268.64584347098213 223.94000000000017]
/Type /Annot
>>
endobj
@@ -30796,7 +30796,7 @@ endobj
endobj
268 0 obj
<< /Border [0 0 0]
-/Dest (code-domainobjectcontainer-code-api)
+/Dest (code-userservice-code-api)
/Subtype /Link
/Rect [60.24 397.66999999999973 79.9485 411.9499999999997]
/Type /Annot
@@ -30804,23 +30804,23 @@ endobj
endobj
269 0 obj
<< /Border [0 0 0]
-/Dest (code-domainobjectcontainer-code-api)
+/Dest (code-userservice-code-api)
/Subtype /Link
-/Rect [79.9485 399.2659999999997 190.19850000000002 409.7659999999997]
+/Rect [79.9485 399.2659999999997 137.69850000000002 409.7659999999997]
/Type /Annot
>>
endobj
270 0 obj
<< /Border [0 0 0]
-/Dest (code-domainobjectcontainer-code-api)
+/Dest (code-userservice-code-api)
/Subtype /Link
-/Rect [190.19850000000002 397.66999999999973 210.51600000000002 411.9499999999997]
+/Rect [137.69850000000002 397.66999999999973 158.01600000000002 411.9499999999997]
/Type /Annot
>>
endobj
271 0 obj
<< /Border [0 0 0]
-/Dest (code-domainobjectcontainer-code-api)
+/Dest (code-userservice-code-api)
/Subtype /Link
/Rect [535.3009999999999 397.66999999999973 547.04 411.9499999999997]
/Type /Annot
@@ -31116,7 +31116,7 @@ endobj
>>
endobj
303 0 obj
-<< /Title <feff0036002e0031002e00200044006f006d00610069006e004f0062006a0065006300740043006f006e007400610069006e006500720020004100500049>
+<< /Title <feff0036002e0031002e0020005500730065007200530065007200760069006300650020004100500049>
/Parent 302 0 R
/Count 0
/Next 304 0 R
@@ -31546,338 +31546,338 @@ xref
0000001250 00000 n
0000001430 00000 n
0000001597 00000 n
-0000022329 00000 n
-0000022954 00000 n
-0000034032 00000 n
-0000034373 00000 n
-0000034417 00000 n
-0000034466 00000 n
-0000034512 00000 n
-0000034685 00000 n
-0000034740 00000 n
-0000034944 00000 n
-0000035144 00000 n
-0000035348 00000 n
-0000035541 00000 n
-0000035745 00000 n
-0000035950 00000 n
-0000036155 00000 n
-0000036359 00000 n
-0000036564 00000 n
-0000036769 00000 n
-0000036973 00000 n
-0000037168 00000 n
-0000037372 00000 n
-0000037569 00000 n
-0000037763 00000 n
-0000037818 00000 n
-0000054479 00000 n
-0000054824 00000 n
-0000054999 00000 n
-0000055186 00000 n
-0000055354 00000 n
-0000055529 00000 n
-0000055765 00000 n
-0000055990 00000 n
-0000056204 00000 n
-0000056374 00000 n
-0000056629 00000 n
-0000056879 00000 n
-0000057072 00000 n
-0000057287 00000 n
-0000057502 00000 n
-0000057751 00000 n
-0000075644 00000 n
-0000075965 00000 n
-0000076009 00000 n
-0000076234 00000 n
-0000076459 00000 n
-0000076514 00000 n
-0000076793 00000 n
-0000077039 00000 n
-0000077214 00000 n
-0000086987 00000 n
-0000087240 00000 n
-0000087296 00000 n
-0000103740 00000 n
-0000104016 00000 n
-0000104208 00000 n
-0000104263 00000 n
-0000104319 00000 n
-0000104526 00000 n
-0000105430 00000 n
-0000105660 00000 n
-0000105866 00000 n
-0000115577 00000 n
-0000115865 00000 n
-0000115909 00000 n
-0000115964 00000 n
-0000116210 00000 n
-0000116458 00000 n
-0000143031 00000 n
-0000143276 00000 n
-0000143547 00000 n
-0000143602 00000 n
-0000155669 00000 n
-0000155908 00000 n
-0000155963 00000 n
-0000156018 00000 n
-0000170801 00000 n
-0000171097 00000 n
-0000171337 00000 n
-0000171393 00000 n
-0000171659 00000 n
-0000171714 00000 n
-0000171926 00000 n
-0000200737 00000 n
-0000203181 00000 n
-0000203448 00000 n
-0000203676 00000 n
-0000203731 00000 n
-0000219937 00000 n
-0000220201 00000 n
-0000220422 00000 n
-0000220633 00000 n
-0000232974 00000 n
-0000233259 00000 n
-0000233317 00000 n
-0000233363 00000 n
-0000233629 00000 n
-0000234855 00000 n
-0000235113 00000 n
-0000327905 00000 n
-0000329944 00000 n
-0000330173 00000 n
-0000416095 00000 n
-0000418134 00000 n
-0000419166 00000 n
-0000419411 00000 n
-0000419639 00000 n
-0000507731 00000 n
-0000509770 00000 n
-0000511132 00000 n
-0000511390 00000 n
-0000511604 00000 n
-0000603390 00000 n
-0000605436 00000 n
-0000606001 00000 n
-0000606246 00000 n
-0000606466 00000 n
-0000703946 00000 n
-0000705985 00000 n
-0000709026 00000 n
-0000709292 00000 n
-0000709513 00000 n
-0000709571 00000 n
-0000709785 00000 n
-0000744057 00000 n
-0000748515 00000 n
-0000748781 00000 n
-0000749039 00000 n
-0000749268 00000 n
-0000789444 00000 n
-0000795216 00000 n
-0000795517 00000 n
-0000795795 00000 n
-0000796028 00000 n
-0000796085 00000 n
-0000796300 00000 n
-0000826013 00000 n
-0000832715 00000 n
-0000832987 00000 n
-0000833219 00000 n
-0000846452 00000 n
-0000846706 00000 n
-0000850492 00000 n
-0000850759 00000 n
-0000851000 00000 n
-0000851300 00000 n
-0000868635 00000 n
-0000868902 00000 n
-0000868948 00000 n
-0000869754 00000 n
-0000870404 00000 n
-0000870635 00000 n
-0000870881 00000 n
-0000875966 00000 n
-0000876207 00000 n
-0000887567 00000 n
-0000887887 00000 n
-0000887933 00000 n
-0000888139 00000 n
-0000888349 00000 n
-0000888564 00000 n
-0000888779 00000 n
-0000888994 00000 n
-0000889198 00000 n
-0000889255 00000 n
-0000899220 00000 n
-0000899476 00000 n
-0000899534 00000 n
-0000940589 00000 n
-0000940830 00000 n
-0000974701 00000 n
-0000974981 00000 n
-0000975227 00000 n
-0000975285 00000 n
-0000975513 00000 n
-0000975570 00000 n
-0000980328 00000 n
-0000980611 00000 n
-0000980824 00000 n
-0000980870 00000 n
-0000981068 00000 n
-0000981293 00000 n
-0000981564 00000 n
-0001002879 00000 n
-0001003167 00000 n
-0001003213 00000 n
-0001003270 00000 n
-0001003508 00000 n
-0001003565 00000 n
-0001003780 00000 n
-0001003994 00000 n
-0001011025 00000 n
-0001011253 00000 n
-0001026469 00000 n
-0001026794 00000 n
-0001026840 00000 n
-0001027020 00000 n
-0001027215 00000 n
-0001027416 00000 n
-0001027473 00000 n
-0001027676 00000 n
-0001027932 00000 n
-0001028164 00000 n
-0001051585 00000 n
-0001051915 00000 n
-0001051961 00000 n
-0001052157 00000 n
-0001052378 00000 n
-0001052617 00000 n
-0001052829 00000 n
-0001052886 00000 n
-0001053092 00000 n
-0001072464 00000 n
-0001072705 00000 n
-0001094248 00000 n
-0001094533 00000 n
-0001094590 00000 n
-0001094959 00000 n
-0001111353 00000 n
-0001111594 00000 n
-0001111724 00000 n
-0001111845 00000 n
-0001111970 00000 n
-0001112096 00000 n
-0001112239 00000 n
-0001112375 00000 n
-0001112534 00000 n
-0001112695 00000 n
-0001112859 00000 n
-0001113016 00000 n
-0001113181 00000 n
-0001113337 00000 n
-0001113501 00000 n
-0001113656 00000 n
-0001113817 00000 n
-0001113981 00000 n
-0001114144 00000 n
-0001114323 00000 n
-0001114493 00000 n
-0001114671 00000 n
-0001114851 00000 n
-0001115034 00000 n
-0001115220 00000 n
-0001115422 00000 n
-0001115634 00000 n
-0001115813 00000 n
-0001116003 00000 n
-0001116195 00000 n
-0001116387 00000 n
-0001116541 00000 n
-0001116707 00000 n
-0001116902 00000 n
-0001117099 00000 n
-0001117262 00000 n
-0001117436 00000 n
-0001117618 00000 n
-0001117800 00000 n
-0001117963 00000 n
-0001118136 00000 n
-0001118306 00000 n
-0001118488 00000 n
-0001118682 00000 n
-0001118863 00000 n
-0001119009 00000 n
-0001119165 00000 n
-0001119339 00000 n
-0001119513 00000 n
-0001119670 00000 n
-0001119829 00000 n
-0001119986 00000 n
-0001120155 00000 n
-0001120442 00000 n
-0001120520 00000 n
-0001120661 00000 n
-0001120853 00000 n
-0001121082 00000 n
-0001121271 00000 n
-0001121456 00000 n
-0001121749 00000 n
-0001122018 00000 n
-0001122298 00000 n
-0001122529 00000 n
-0001122739 00000 n
-0001123044 00000 n
-0001123245 00000 n
-0001123460 00000 n
-0001123701 00000 n
-0001123907 00000 n
-0001124188 00000 n
-0001124442 00000 n
-0001124656 00000 n
-0001124837 00000 n
-0001125108 00000 n
-0001125386 00000 n
-0001125628 00000 n
-0001125814 00000 n
-0001126114 00000 n
-0001126308 00000 n
-0001126538 00000 n
-0001126811 00000 n
-0001135129 00000 n
-0001135345 00000 n
-0001136708 00000 n
-0001137769 00000 n
-0001144948 00000 n
-0001145169 00000 n
-0001146532 00000 n
-0001147613 00000 n
-0001150983 00000 n
-0001151209 00000 n
-0001152572 00000 n
-0001153689 00000 n
-0001154851 00000 n
-0001155067 00000 n
-0001155370 00000 n
-0001156507 00000 n
-0001162240 00000 n
-0001162454 00000 n
-0001163817 00000 n
-0001164869 00000 n
-0001166233 00000 n
-0001166444 00000 n
-0001166759 00000 n
-0001167675 00000 n
-0001169830 00000 n
-0001170044 00000 n
-0001170380 00000 n
+0000022349 00000 n
+0000022974 00000 n
+0000034052 00000 n
+0000034393 00000 n
+0000034437 00000 n
+0000034486 00000 n
+0000034532 00000 n
+0000034705 00000 n
+0000034760 00000 n
+0000034964 00000 n
+0000035164 00000 n
+0000035368 00000 n
+0000035561 00000 n
+0000035765 00000 n
+0000035970 00000 n
+0000036175 00000 n
+0000036379 00000 n
+0000036584 00000 n
+0000036789 00000 n
+0000036993 00000 n
+0000037188 00000 n
+0000037392 00000 n
+0000037589 00000 n
+0000037783 00000 n
+0000037838 00000 n
+0000054499 00000 n
+0000054844 00000 n
+0000055019 00000 n
+0000055206 00000 n
+0000055374 00000 n
+0000055549 00000 n
+0000055785 00000 n
+0000056010 00000 n
+0000056224 00000 n
+0000056394 00000 n
+0000056649 00000 n
+0000056899 00000 n
+0000057092 00000 n
+0000057307 00000 n
+0000057522 00000 n
+0000057771 00000 n
+0000075664 00000 n
+0000075985 00000 n
+0000076029 00000 n
+0000076254 00000 n
+0000076479 00000 n
+0000076534 00000 n
+0000076813 00000 n
+0000077059 00000 n
+0000077234 00000 n
+0000087007 00000 n
+0000087260 00000 n
+0000087316 00000 n
+0000103760 00000 n
+0000104036 00000 n
+0000104228 00000 n
+0000104283 00000 n
+0000104339 00000 n
+0000104546 00000 n
+0000105450 00000 n
+0000105680 00000 n
+0000105886 00000 n
+0000115597 00000 n
+0000115885 00000 n
+0000115929 00000 n
+0000115984 00000 n
+0000116230 00000 n
+0000116478 00000 n
+0000143051 00000 n
+0000143296 00000 n
+0000143567 00000 n
+0000143622 00000 n
+0000155689 00000 n
+0000155928 00000 n
+0000155983 00000 n
+0000156038 00000 n
+0000170821 00000 n
+0000171117 00000 n
+0000171357 00000 n
+0000171413 00000 n
+0000171679 00000 n
+0000171734 00000 n
+0000171946 00000 n
+0000200757 00000 n
+0000203201 00000 n
+0000203468 00000 n
+0000203696 00000 n
+0000203751 00000 n
+0000219957 00000 n
+0000220221 00000 n
+0000220442 00000 n
+0000220653 00000 n
+0000232994 00000 n
+0000233279 00000 n
+0000233337 00000 n
+0000233383 00000 n
+0000233649 00000 n
+0000234875 00000 n
+0000235133 00000 n
+0000327925 00000 n
+0000329964 00000 n
+0000330193 00000 n
+0000416115 00000 n
+0000418154 00000 n
+0000419186 00000 n
+0000419431 00000 n
+0000419659 00000 n
+0000507751 00000 n
+0000509790 00000 n
+0000511152 00000 n
+0000511410 00000 n
+0000511624 00000 n
+0000603410 00000 n
+0000605456 00000 n
+0000606021 00000 n
+0000606266 00000 n
+0000606486 00000 n
+0000703966 00000 n
+0000706005 00000 n
+0000709046 00000 n
+0000709312 00000 n
+0000709533 00000 n
+0000709591 00000 n
+0000709805 00000 n
+0000744077 00000 n
+0000748535 00000 n
+0000748801 00000 n
+0000749059 00000 n
+0000749288 00000 n
+0000789464 00000 n
+0000795236 00000 n
+0000795537 00000 n
+0000795815 00000 n
+0000796048 00000 n
+0000796105 00000 n
+0000796320 00000 n
+0000826033 00000 n
+0000832735 00000 n
+0000833007 00000 n
+0000833239 00000 n
+0000846472 00000 n
+0000846726 00000 n
+0000850512 00000 n
+0000850779 00000 n
+0000851020 00000 n
+0000851320 00000 n
+0000868655 00000 n
+0000868922 00000 n
+0000868968 00000 n
+0000869774 00000 n
+0000870414 00000 n
+0000870645 00000 n
+0000870891 00000 n
+0000875976 00000 n
+0000876217 00000 n
+0000887577 00000 n
+0000887897 00000 n
+0000887943 00000 n
+0000888149 00000 n
+0000888359 00000 n
+0000888574 00000 n
+0000888789 00000 n
+0000889004 00000 n
+0000889208 00000 n
+0000889265 00000 n
+0000899230 00000 n
+0000899486 00000 n
+0000899544 00000 n
+0000940599 00000 n
+0000940840 00000 n
+0000974711 00000 n
+0000974991 00000 n
+0000975237 00000 n
+0000975295 00000 n
+0000975523 00000 n
+0000975580 00000 n
+0000980338 00000 n
+0000980621 00000 n
+0000980834 00000 n
+0000980880 00000 n
+0000981078 00000 n
+0000981303 00000 n
+0000981574 00000 n
+0001002859 00000 n
+0001003147 00000 n
+0001003193 00000 n
+0001003250 00000 n
+0001003478 00000 n
+0001003535 00000 n
+0001003750 00000 n
+0001003964 00000 n
+0001010995 00000 n
+0001011223 00000 n
+0001026439 00000 n
+0001026764 00000 n
+0001026810 00000 n
+0001026990 00000 n
+0001027185 00000 n
+0001027386 00000 n
+0001027443 00000 n
+0001027646 00000 n
+0001027902 00000 n
+0001028134 00000 n
+0001051555 00000 n
+0001051885 00000 n
+0001051931 00000 n
+0001052127 00000 n
+0001052348 00000 n
+0001052587 00000 n
+0001052799 00000 n
+0001052856 00000 n
+0001053062 00000 n
+0001072434 00000 n
+0001072675 00000 n
+0001094218 00000 n
+0001094503 00000 n
+0001094560 00000 n
+0001094929 00000 n
+0001111323 00000 n
+0001111564 00000 n
+0001111694 00000 n
+0001111815 00000 n
+0001111940 00000 n
+0001112066 00000 n
+0001112209 00000 n
+0001112345 00000 n
+0001112504 00000 n
+0001112665 00000 n
+0001112829 00000 n
+0001112986 00000 n
+0001113151 00000 n
+0001113307 00000 n
+0001113471 00000 n
+0001113626 00000 n
+0001113787 00000 n
+0001113951 00000 n
+0001114114 00000 n
+0001114293 00000 n
+0001114463 00000 n
+0001114641 00000 n
+0001114821 00000 n
+0001115004 00000 n
+0001115190 00000 n
+0001115392 00000 n
+0001115604 00000 n
+0001115783 00000 n
+0001115973 00000 n
+0001116165 00000 n
+0001116357 00000 n
+0001116511 00000 n
+0001116677 00000 n
+0001116872 00000 n
+0001117069 00000 n
+0001117232 00000 n
+0001117406 00000 n
+0001117588 00000 n
+0001117770 00000 n
+0001117933 00000 n
+0001118106 00000 n
+0001118266 00000 n
+0001118438 00000 n
+0001118622 00000 n
+0001118793 00000 n
+0001118939 00000 n
+0001119095 00000 n
+0001119269 00000 n
+0001119443 00000 n
+0001119600 00000 n
+0001119759 00000 n
+0001119916 00000 n
+0001120085 00000 n
+0001120372 00000 n
+0001120450 00000 n
+0001120591 00000 n
+0001120783 00000 n
+0001121012 00000 n
+0001121201 00000 n
+0001121386 00000 n
+0001121679 00000 n
+0001121948 00000 n
+0001122228 00000 n
+0001122459 00000 n
+0001122669 00000 n
+0001122974 00000 n
+0001123175 00000 n
+0001123390 00000 n
+0001123631 00000 n
+0001123837 00000 n
+0001124118 00000 n
+0001124372 00000 n
+0001124586 00000 n
+0001124767 00000 n
+0001125038 00000 n
+0001125316 00000 n
+0001125518 00000 n
+0001125704 00000 n
+0001126004 00000 n
+0001126198 00000 n
+0001126428 00000 n
+0001126701 00000 n
+0001135019 00000 n
+0001135235 00000 n
+0001136598 00000 n
+0001137659 00000 n
+0001144838 00000 n
+0001145059 00000 n
+0001146422 00000 n
+0001147503 00000 n
+0001150873 00000 n
+0001151099 00000 n
+0001152462 00000 n
+0001153579 00000 n
+0001154741 00000 n
+0001154957 00000 n
+0001155260 00000 n
+0001156397 00000 n
+0001162130 00000 n
+0001162344 00000 n
+0001163707 00000 n
+0001164759 00000 n
+0001166123 00000 n
+0001166334 00000 n
+0001166649 00000 n
+0001167565 00000 n
+0001169720 00000 n
+0001169934 00000 n
+0001170270 00000 n
trailer
<< /Size 337
/Root 2 0 R
/Info 1 0 R
>>
startxref
-1171518
+1171408
%%EOF
http://git-wip-us.apache.org/repos/asf/isis-site/blob/274edd1d/content/versions/2.0.0-M1/guides/ugtst/ugtst.html
----------------------------------------------------------------------
diff --git a/content/versions/2.0.0-M1/guides/ugtst/ugtst.html b/content/versions/2.0.0-M1/guides/ugtst/ugtst.html
index f7cdf20..2d2bc6b 100644
--- a/content/versions/2.0.0-M1/guides/ugtst/ugtst.html
+++ b/content/versions/2.0.0-M1/guides/ugtst/ugtst.html
@@ -1829,9 +1829,9 @@ Customer customer = (Customer)((WrappingObject)wrappedCustomer).__isis_wrapped()
<div class="ulist">
<ul>
<li> <p>for <strong><em>object properties</em></strong> the test can call the getter or setter method</p> </li>
- <li> <p>for <strong><em>object collections</em></strong> the test can call the getter. <br></p>
+ <li> <p>for <strong><em>object collections</em></strong> the test can call the getter.</p>
<div class="paragraph">
- <p>If there is a supporting <code>addTo…()</code> or <code>removeFrom…()</code> method, then these can be called. It can also call <code>add(…)</code> or <code>remove(…)</code> on the collection (returned by the gettter) itself.<br></p>
+ <p>If there is a supporting <code>addTo…()</code> or <code>removeFrom…()</code> method, then these can be called. It can also call <code>add(…)</code> or <code>remove(…)</code> on the collection (returned by the gettter) itself.</p>
</div>
<div class="admonitionblock note">
<table>
@@ -1856,7 +1856,7 @@ Customer customer = (Customer)((WrappingObject)wrappedCustomer).__isis_wrapped()
<p>What the test can’t call is any of the remaining supporting methods, such as <code>hide…()</code>, <code>disable…()</code> or <code>validate…()</code>. That’s because their value is implied by the exception being thrown.</p>
</div>
<div class="paragraph">
- <p>The wrapper <em>does</em> also allow the object’s <code>title()</code> method or its <code>toString()</code> , however this is little use for objects whose title is built up using the <code>@Title</code> annotation. Instead, we recommend that your test verifies an object’s title by calling <code>DomainObjectContainer#titleOf(…)</code> method.</p>
+ <p>The wrapper <em>does</em> also allow the object’s <code>title()</code> method or its <code>toString()</code> , however this is little use for objects whose title is built up using the <code>@Title</code> annotation. Instead, we recommend that your test verifies an object’s title by calling <code>TitleService#titleOf(…)</code> method.</p>
</div>
</div>
<div class="sect3">
@@ -2303,7 +2303,7 @@ Feature: <span class="predefined-type">List</span> and Create New Simple Objects
<td class="icon"> <i class="fa icon-tip" title="Tip"></i> </td>
<td class="content">
<div class="paragraph">
- <p>The <a href="../rgsvc/rgsvc.html#_rgsvc_api_Scratchpad"><code>Scratchpad</code></a> domain service is one way in which glue classes can pass state between each other. Or, for more type safety, you could develop your own custom domain services for each scenario, and inject these in as regular services. See <a href="http://www.thinkcode.se/blog/2017/04/01/sharing-state-between-steps-in-cucumberjvm-using-picocontainer">this blog</a> post for more details.</p>
+ <p>The <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_Scratchpad"><code>Scratchpad</code></a> domain service is one way in which glue classes can pass state between each other. Or, for more type safety, you could develop your own custom domain services for each scenario, and inject these in as regular services. See <a href="http://www.thinkcode.se/blog/2017/04/01/sharing-state-between-steps-in-cucumberjvm-using-picocontainer">this blog</a> post for more details.</p>
</div> </td>
</tr>
</tbody>
@@ -2992,7 +2992,7 @@ Feature: <span class="predefined-type">List</span> and Create New Simple Objects
</ul>
</div>
<div class="paragraph">
- <p>The <code>TickingClockFixture</code> is a pre-built fixture script that resets the date/time returned by the <a href="../rgsvc/rgsvc.html#_rgsvc_api_ClockService"><code>ClockService</code></a> to a known value.</p>
+ <p>The <code>TickingClockFixture</code> is a pre-built fixture script that resets the date/time returned by the <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_ClockService"><code>ClockService</code></a> to a known value.</p>
</div>
<div class="paragraph">
<p>Thereafter the time returned continues to tick forward (as would the real clock) until reset once more.</p>
@@ -3091,7 +3091,7 @@ toDoItem = sudoService.sudo(username,
</div>
</div>
<div class="paragraph">
- <p>Behind the scenes the <code>SudoService</code> simply talks to the <code>DomainObjectContainer</code> to override the user returned by the <code>getUser()</code> API. It is possible to override both users and roles.</p>
+ <p>Behind the scenes the <code>SudoService</code> simply talks to the <code>UserService</code> to override the user returned by the <code>getUser()</code> API. It is possible to override both users and roles.</p>
</div>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/isis-site/blob/274edd1d/content/versions/2.0.0-M1/guides/ugtst/ugtst.pdf
----------------------------------------------------------------------
diff --git a/content/versions/2.0.0-M1/guides/ugtst/ugtst.pdf b/content/versions/2.0.0-M1/guides/ugtst/ugtst.pdf
index 44f1e18..80bfb8a 100644
--- a/content/versions/2.0.0-M1/guides/ugtst/ugtst.pdf
+++ b/content/versions/2.0.0-M1/guides/ugtst/ugtst.pdf
@@ -4,8 +4,8 @@
<< /Title (Testing)
/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:20180812182717+01'00')
-/ModDate (D:20180812182717+01'00')
+/CreationDate (D:20180814004057+02'00')
+/ModDate (D:20180814004057+02'00')
>>
endobj
2 0 obj
@@ -32081,7 +32081,7 @@ endobj
>>
endobj
158 0 obj
-<< /Length 14416
+<< /Length 14408
>>
stream
q
@@ -32387,7 +32387,7 @@ ET
BT
48.24 665.226 Td
/F1.0 10.5 Tf
-[<73616d65207479706520617320746865206f626a656374206265696e672070726f786965642e2020416e642074686520726f6c65206f662074686973207772> 20.01953125 <617070657220697320746f2073696d756c617465207468652055492e>] TJ
+[<73616d65207479706520617320746865206f626a656374206265696e672070726f786965642e20416e642074686520726f6c65206f662074686973207772> 20.01953125 <617070657220697320746f2073696d756c617465207468652055492e>] TJ
ET
0.000 0.000 0.000 SCN
@@ -32648,7 +32648,7 @@ ET
BT
66.24000000000001 467.206 Td
/F1.0 10.5 Tf
-<746573742e20205468697320697320757375616c6c7920646f6e6520696e207468652074657374d57320> Tj
+<746573742e205468697320697320757375616c6c7920646f6e6520696e207468652074657374d57320> Tj
ET
0.000 0.000 0.000 SCN
@@ -32657,7 +32657,7 @@ ET
0.694 0.129 0.275 SCN
BT
-252.80400000000003 467.206 Td
+250.08450000000002 467.206 Td
/F6.0 10.5 Tf
<73657455702829> Tj
ET
@@ -32668,7 +32668,7 @@ ET
0.200 0.200 0.200 SCN
BT
-289.55400000000003 467.206 Td
+286.83450000000005 467.206 Td
/F1.0 10.5 Tf
<206d6574686f642e> Tj
ET
@@ -32812,12 +32812,12 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-3.322 Tw
+3.787 Tw
BT
66.24000000000001 348.526 Td
/F1.0 10.5 Tf
-[<69662074686520627573696e6573732072756c6520636865636b7320706173732c207468656e2074686520756e6465726c79696e67206d656d62657220697320696e766f6b> 20.01953125 <65642e20204f746865727769736520616e>] TJ
+[<69662074686520627573696e6573732072756c6520636865636b7320706173732c207468656e2074686520756e6465726c79696e67206d656d62657220697320696e766f6b> 20.01953125 <65642e204f746865727769736520616e>] TJ
ET
@@ -32838,12 +32838,12 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-0.976 Tw
+1.223 Tw
BT
48.24000000000001 304.966 Td
/F1.0 10.5 Tf
-[<5468652074797065206f6620657863657074696f6e20646570656e64732075706f6e207768617420736f7274206f6620636865636b206661696c65642e20204974d57320737472> 20.01953125 <6169676874666f727761726420656e6f7567683a20696620746865>] TJ
+[<5468652074797065206f6620657863657074696f6e20646570656e64732075706f6e207768617420736f7274206f6620636865636b206661696c65642e204974d57320737472> 20.01953125 <6169676874666f727761726420656e6f7567683a20696620746865>] TJ
ET
@@ -34398,7 +34398,7 @@ endobj
[166 0 R /XYZ 0 106.34356828193836 null]
endobj
171 0 obj
-<< /Length 25788
+<< /Length 25715
>>
stream
q
@@ -34410,7 +34410,7 @@ q
BT
48.24 794.6759999999999 Td
/F1.0 10.5 Tf
-<6d6574686f6473206f662074686520646f6d61696e206f626a656374d573206d656d626572732061726520616c6c6f77656420746f2062652063616c6c65642e202054686174206d65616e733a> Tj
+<6d6574686f6473206f662074686520646f6d61696e206f626a656374d573206d656d626572732061726520616c6c6f77656420746f2062652063616c6c65642e2054686174206d65616e733a> Tj
ET
0.000 0.000 0.000 SCN
@@ -34506,7 +34506,7 @@ ET
BT
176.2695 745.116 Td
/F1.0 10.5 Tf
-<2074686520746573742063616e2063616c6c20746865206765747465722e20> Tj
+<2074686520746573742063616e2063616c6c20746865206765747465722e> Tj
ET
0.000 0.000 0.000 SCN
@@ -34514,7 +34514,7 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-0.134 Tw
+0.312 Tw
BT
66.24000000000001 717.336 Td
@@ -34529,10 +34529,10 @@ ET
0.694 0.129 0.275 scn
0.694 0.129 0.275 SCN
-0.134 Tw
+0.312 Tw
BT
-183.49002941176468 717.336 Td
+184.38165625 717.336 Td
/F6.0 10.5 Tf
<616464546f> Tj
ET
@@ -34544,10 +34544,10 @@ ET
0.694 0.129 0.275 scn
0.694 0.129 0.275 SCN
-0.134 Tw
+0.312 Tw
BT
-209.74002941176468 717.336 Td
+210.63165625 717.336 Td
/F7.0 10.5 Tf
<c9> Tj
ET
@@ -34559,10 +34559,10 @@ ET
0.694 0.129 0.275 scn
0.694 0.129 0.275 SCN
-0.134 Tw
+0.312 Tw
BT
-220.24002941176468 717.336 Td
+221.13165625 717.336 Td
/F6.0 10.5 Tf
<2829> Tj
ET
@@ -34574,10 +34574,10 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-0.134 Tw
+0.312 Tw
BT
-230.74002941176468 717.336 Td
+231.63165625 717.336 Td
/F1.0 10.5 Tf
<206f7220> Tj
ET
@@ -34589,10 +34589,10 @@ ET
0.694 0.129 0.275 scn
0.694 0.129 0.275 SCN
-0.134 Tw
+0.312 Tw
BT
-247.45044117647055 717.336 Td
+248.69871874999998 717.336 Td
/F6.0 10.5 Tf
<72656d6f766546726f6d> Tj
ET
@@ -34604,10 +34604,10 @@ ET
0.694 0.129 0.275 scn
0.694 0.129 0.275 SCN
-0.134 Tw
+0.312 Tw
BT
-299.9504411764706 717.336 Td
+301.19871875 717.336 Td
/F7.0 10.5 Tf
<c9> Tj
ET
@@ -34619,10 +34619,10 @@ ET
0.694 0.129 0.275 scn
0.694 0.129 0.275 SCN
-0.134 Tw
+0.312 Tw
BT
-310.4504411764706 717.336 Td
+311.69871875 717.336 Td
/F6.0 10.5 Tf
<2829> Tj
ET
@@ -34634,12 +34634,12 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-0.134 Tw
+0.312 Tw
BT
-320.9504411764706 717.336 Td
+322.19871875 717.336 Td
/F1.0 10.5 Tf
-<206d6574686f642c207468656e2074686573652063616e2062652063616c6c65642e202049742063616e20616c736f> Tj
+<206d6574686f642c207468656e2074686573652063616e2062652063616c6c65642e2049742063616e20616c736f> Tj
ET
@@ -35070,7 +35070,7 @@ ET
BT
48.24000000000001 578.6560000000002 Td
/F1.0 10.5 Tf
-<6d6574686f642e2020546865736520617265206f6674656e2075736566756c20666f72206f627461696e696e6720612076616c69642076616c756520746f207573652e> Tj
+<6d6574686f642e20546865736520617265206f6674656e2075736566756c20666f72206f627461696e696e6720612076616c69642076616c756520746f207573652e> Tj
ET
0.000 0.000 0.000 SCN
@@ -35258,7 +35258,7 @@ ET
BT
111.24000000000001 535.0960000000002 Td
/F1.0 10.5 Tf
-[<2e202054686174d57320626563617573652074686569722076616c756520697320696d706c6965642062> 20.01953125 <792074686520657863657074696f6e206265696e67207468726f776e2e>] TJ
+[<2e2054686174d57320626563617573652074686569722076616c756520697320696d706c6965642062> 20.01953125 <792074686520657863657074696f6e206265696e67207468726f776e2e>] TJ
ET
0.000 0.000 0.000 SCN
@@ -35371,7 +35371,7 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-1.173 Tw
+0.063 Tw
BT
48.24000000000001 491.5360000000003 Td
@@ -35386,10 +35386,10 @@ ET
0.694 0.129 0.275 scn
0.694 0.129 0.275 SCN
-1.173 Tw
+0.063 Tw
BT
-272.4260625 491.5360000000003 Td
+262.4445 491.5360000000003 Td
/F6.0 10.5 Tf
<405469746c65> Tj
ET
@@ -35401,12 +35401,12 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-1.173 Tw
+0.063 Tw
BT
-303.9260625 491.5360000000003 Td
+293.9445 491.5360000000003 Td
/F1.0 10.5 Tf
-<20616e6e6f746174696f6e2e2020496e73746561642c207765207265636f6d6d656e64207468617420796f7572> Tj
+<20616e6e6f746174696f6e2e20496e73746561642c207765207265636f6d6d656e64207468617420796f75722074657374> Tj
ET
@@ -35419,7 +35419,7 @@ ET
BT
48.24000000000001 475.7560000000003 Td
/F1.0 10.5 Tf
-[<7465737420766572696669657320616e206f626a656374d573207469746c652062> 20.01953125 <792063616c6c696e6720>] TJ
+[<766572696669657320616e206f626a656374d573207469746c652062> 20.01953125 <792063616c6c696e6720>] TJ
ET
0.000 0.000 0.000 SCN
@@ -35428,9 +35428,9 @@ ET
0.694 0.129 0.275 SCN
BT
-237.84879492187503 475.7560000000003 Td
+217.384294921875 475.7560000000003 Td
/F6.0 10.5 Tf
-<446f6d61696e4f626a656374436f6e7461696e6572237469746c654f6628> Tj
+<5469746c6553657276696365237469746c654f6628> Tj
ET
0.000 0.000 0.000 SCN
@@ -35439,7 +35439,7 @@ ET
0.694 0.129 0.275 SCN
BT
-395.348794921875 475.7560000000003 Td
+327.63429492187504 475.7560000000003 Td
/F7.0 10.5 Tf
<c9> Tj
ET
@@ -35450,7 +35450,7 @@ ET
0.694 0.129 0.275 SCN
BT
-405.848794921875 475.7560000000003 Td
+338.13429492187504 475.7560000000003 Td
/F6.0 10.5 Tf
<29> Tj
ET
@@ -35461,7 +35461,7 @@ ET
0.200 0.200 0.200 SCN
BT
-411.098794921875 475.7560000000003 Td
+343.38429492187504 475.7560000000003 Td
/F1.0 10.5 Tf
<206d6574686f642e> Tj
ET
@@ -36111,7 +36111,7 @@ ET
BT
48.24000000000001 190.39600000000027 Td
/F1.0 10.5 Tf
-[<746f20616e> 20.01953125 <792073756273637269626572732e2020412074657374206d69676874207468657265666f7265206c6f6f6b206c696b> 20.01953125 <653a>] TJ
+[<746f20616e> 20.01953125 <792073756273637269626572732e20412074657374206d69676874207468657265666f7265206c6f6f6b206c696b> 20.01953125 <653a>] TJ
ET
0.000 0.000 0.000 SCN
@@ -47410,7 +47410,7 @@ endobj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
-/URI (../rgsvc/rgsvc.pdf#_rgsvc_api_Scratchpad)
+/URI (../rgsvc/rgsvc.pdf#_rgsvc_core-domain-api_Scratchpad)
>>
/Subtype /Link
/Rect [148.91443885216344 453.276 201.41443885216344 463.776]
@@ -68313,7 +68313,7 @@ endobj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
-/URI (../rgsvc/rgsvc.pdf#_rgsvc_api_ClockService)
+/URI (../rgsvc/rgsvc.pdf#_rgsvc_core-domain-api_ClockService)
>>
/Subtype /Link
/Rect [48.24 484.206 111.24000000000001 494.706]
@@ -68335,7 +68335,7 @@ endobj
>>
endobj
274 0 obj
-<< /Length 54703
+<< /Length 54682
>>
stream
q
@@ -72292,7 +72292,7 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-1.645 Tw
+0.774 Tw
BT
48.239999999999995 91.42599999999999 Td
@@ -72307,10 +72307,10 @@ ET
0.694 0.129 0.275 scn
0.694 0.129 0.275 SCN
-1.645 Tw
+0.774 Tw
BT
-165.97330769230769 91.42599999999999 Td
+162.4891880208333 91.42599999999999 Td
/F6.0 10.5 Tf
<5375646f53657276696365> Tj
ET
@@ -72322,10 +72322,10 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-1.645 Tw
+0.774 Tw
BT
-223.72330769230769 91.42599999999999 Td
+220.2391880208333 91.42599999999999 Td
/F1.0 10.5 Tf
<2073696d706c792074616c6b7320746f2074686520> Tj
ET
@@ -72337,12 +72337,12 @@ ET
0.694 0.129 0.275 scn
0.694 0.129 0.275 SCN
-1.645 Tw
+0.774 Tw
BT
-328.60119230769226 91.42599999999999 Td
+320.7619230468749 91.42599999999999 Td
/F6.0 10.5 Tf
-<446f6d61696e4f626a656374436f6e7461696e6572> Tj
+<5573657253657276696365> Tj
ET
@@ -72352,12 +72352,12 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-1.645 Tw
+0.774 Tw
BT
-438.85119230769226 91.42599999999999 Td
+378.5119230468749 91.42599999999999 Td
/F1.0 10.5 Tf
-<20746f206f76657272696465207468652075736572> Tj
+[<20746f206f766572726964652074686520757365722072657475726e65642062> 20.01953125 <79>] TJ
ET
@@ -72370,7 +72370,7 @@ ET
BT
48.239999999999995 75.64599999999999 Td
/F1.0 10.5 Tf
-[<72657475726e65642062> 20.01953125 <792074686520>] TJ
+<74686520> Tj
ET
0.000 0.000 0.000 SCN
@@ -72379,7 +72379,7 @@ ET
0.694 0.129 0.275 SCN
BT
-129.205294921875 75.64599999999999 Td
+66.92999999999999 75.64599999999999 Td
/F6.0 10.5 Tf
<676574557365722829> Tj
ET
@@ -72390,7 +72390,7 @@ ET
0.200 0.200 0.200 SCN
BT
-176.455294921875 75.64599999999999 Td
+114.17999999999999 75.64599999999999 Td
/F1.0 10.5 Tf
<204150492e20497420697320706f737369626c6520746f206f7665727269646520626f746820757365727320616e6420726f6c65732e> Tj
ET
@@ -73912,265 +73912,265 @@ xref
0000524070 00000 n
0000524342 00000 n
0000524617 00000 n
-0000539088 00000 n
-0000539376 00000 n
-0000539422 00000 n
-0000539651 00000 n
-0000539852 00000 n
-0000540043 00000 n
-0000554399 00000 n
-0000574319 00000 n
-0000574617 00000 n
-0000574803 00000 n
-0000574860 00000 n
-0000575029 00000 n
-0000575087 00000 n
-0000600930 00000 n
-0000601241 00000 n
-0000601432 00000 n
-0000601489 00000 n
-0000632496 00000 n
-0000632811 00000 n
-0000633035 00000 n
-0000633093 00000 n
-0000633332 00000 n
-0000633571 00000 n
-0000652273 00000 n
-0000652540 00000 n
-0000652765 00000 n
-0000653015 00000 n
-0000668784 00000 n
-0000669104 00000 n
-0000669150 00000 n
-0000669370 00000 n
-0000669599 00000 n
-0000669793 00000 n
-0000669850 00000 n
-0000670419 00000 n
-0000670634 00000 n
-0000670868 00000 n
-0000671096 00000 n
-0000671333 00000 n
-0000671391 00000 n
-0000704326 00000 n
-0000704585 00000 n
-0000704823 00000 n
-0000737227 00000 n
-0000737513 00000 n
-0000737751 00000 n
-0000768989 00000 n
-0000769328 00000 n
-0000769536 00000 n
-0000769805 00000 n
-0000770096 00000 n
-0000770327 00000 n
-0000770558 00000 n
-0000770616 00000 n
-0000770851 00000 n
-0000791058 00000 n
-0000791286 00000 n
-0000806264 00000 n
-0000806557 00000 n
-0000806603 00000 n
-0000806818 00000 n
-0000807093 00000 n
-0000833481 00000 n
-0000833770 00000 n
-0000833816 00000 n
-0000833873 00000 n
-0000834096 00000 n
-0000834341 00000 n
-0000834579 00000 n
-0000838807 00000 n
-0000839087 00000 n
-0000839309 00000 n
-0000887537 00000 n
-0000890754 00000 n
-0000890982 00000 n
-0000931560 00000 n
-0000934777 00000 n
-0000935652 00000 n
-0000935897 00000 n
-0000936091 00000 n
-0001001866 00000 n
-0001005083 00000 n
-0001014228 00000 n
-0001014507 00000 n
-0001014706 00000 n
-0001014945 00000 n
-0001031846 00000 n
-0001032105 00000 n
-0001032151 00000 n
-0001032388 00000 n
-0001094778 00000 n
-0001095051 00000 n
-0001095264 00000 n
-0001102451 00000 n
-0001102757 00000 n
-0001148924 00000 n
-0001149160 00000 n
-0001149218 00000 n
-0001149467 00000 n
-0001184272 00000 n
-0001184527 00000 n
-0001184573 00000 n
-0001195824 00000 n
-0001196070 00000 n
-0001196283 00000 n
-0001226047 00000 n
-0001226275 00000 n
-0001262963 00000 n
-0001263205 00000 n
-0001279691 00000 n
-0001279966 00000 n
-0001280168 00000 n
-0001280213 00000 n
+0000539080 00000 n
+0000539368 00000 n
+0000539414 00000 n
+0000539643 00000 n
+0000539844 00000 n
+0000540035 00000 n
+0000554391 00000 n
+0000574311 00000 n
+0000574609 00000 n
+0000574795 00000 n
+0000574852 00000 n
+0000575021 00000 n
+0000575079 00000 n
+0000600849 00000 n
+0000601160 00000 n
+0000601351 00000 n
+0000601408 00000 n
+0000632415 00000 n
+0000632730 00000 n
+0000632954 00000 n
+0000633012 00000 n
+0000633251 00000 n
+0000633490 00000 n
+0000652192 00000 n
+0000652459 00000 n
+0000652684 00000 n
+0000652934 00000 n
+0000668703 00000 n
+0000669023 00000 n
+0000669069 00000 n
+0000669289 00000 n
+0000669518 00000 n
+0000669712 00000 n
+0000669769 00000 n
+0000670338 00000 n
+0000670553 00000 n
+0000670787 00000 n
+0000671015 00000 n
+0000671252 00000 n
+0000671310 00000 n
+0000704245 00000 n
+0000704504 00000 n
+0000704742 00000 n
+0000737146 00000 n
+0000737432 00000 n
+0000737670 00000 n
+0000768908 00000 n
+0000769247 00000 n
+0000769467 00000 n
+0000769736 00000 n
+0000770027 00000 n
+0000770258 00000 n
+0000770489 00000 n
+0000770547 00000 n
+0000770782 00000 n
+0000790989 00000 n
+0000791217 00000 n
+0000806195 00000 n
+0000806488 00000 n
+0000806534 00000 n
+0000806749 00000 n
+0000807024 00000 n
+0000833412 00000 n
+0000833701 00000 n
+0000833747 00000 n
+0000833804 00000 n
+0000834027 00000 n
+0000834272 00000 n
+0000834510 00000 n
+0000838738 00000 n
+0000839018 00000 n
+0000839240 00000 n
+0000887468 00000 n
+0000890685 00000 n
+0000890913 00000 n
+0000931491 00000 n
+0000934708 00000 n
+0000935583 00000 n
+0000935828 00000 n
+0000936022 00000 n
+0001001797 00000 n
+0001005014 00000 n
+0001014159 00000 n
+0001014438 00000 n
+0001014637 00000 n
+0001014876 00000 n
+0001031777 00000 n
+0001032036 00000 n
+0001032082 00000 n
+0001032319 00000 n
+0001094709 00000 n
+0001094982 00000 n
+0001095195 00000 n
+0001102382 00000 n
+0001102688 00000 n
+0001148855 00000 n
+0001149091 00000 n
+0001149149 00000 n
+0001149398 00000 n
+0001184203 00000 n
+0001184458 00000 n
+0001184504 00000 n
+0001195755 00000 n
+0001196001 00000 n
+0001196214 00000 n
+0001225978 00000 n
+0001226206 00000 n
+0001262894 00000 n
+0001263136 00000 n
+0001279622 00000 n
+0001279897 00000 n
+0001280099 00000 n
+0001280144 00000 n
+0001280353 00000 n
0001280410 00000 n
-0001280467 00000 n
-0001280691 00000 n
-0001335449 00000 n
-0001335704 00000 n
-0001335831 00000 n
-0001335952 00000 n
-0001336077 00000 n
-0001336203 00000 n
-0001336342 00000 n
-0001336482 00000 n
-0001336641 00000 n
-0001336791 00000 n
-0001336938 00000 n
-0001337087 00000 n
-0001337247 00000 n
-0001337420 00000 n
-0001337593 00000 n
-0001337755 00000 n
-0001337920 00000 n
-0001338076 00000 n
-0001338225 00000 n
-0001338376 00000 n
-0001338539 00000 n
-0001338693 00000 n
-0001338845 00000 n
-0001338990 00000 n
-0001339148 00000 n
-0001339299 00000 n
-0001339466 00000 n
-0001339626 00000 n
-0001339807 00000 n
-0001339982 00000 n
-0001340158 00000 n
-0001340336 00000 n
-0001340529 00000 n
-0001340726 00000 n
-0001340913 00000 n
-0001341102 00000 n
-0001341273 00000 n
-0001341444 00000 n
-0001341630 00000 n
-0001341816 00000 n
-0001342001 00000 n
-0001342186 00000 n
-0001342370 00000 n
-0001342556 00000 n
-0001342749 00000 n
-0001342944 00000 n
-0001343131 00000 n
-0001343318 00000 n
-0001343507 00000 n
-0001343698 00000 n
-0001343868 00000 n
-0001344038 00000 n
-0001344220 00000 n
-0001344402 00000 n
-0001344589 00000 n
-0001344776 00000 n
-0001344962 00000 n
-0001345150 00000 n
-0001345308 00000 n
-0001345477 00000 n
-0001345650 00000 n
-0001345833 00000 n
-0001346013 00000 n
-0001346204 00000 n
-0001346373 00000 n
-0001346555 00000 n
-0001346735 00000 n
+0001280634 00000 n
+0001335371 00000 n
+0001335626 00000 n
+0001335753 00000 n
+0001335874 00000 n
+0001335999 00000 n
+0001336125 00000 n
+0001336264 00000 n
+0001336404 00000 n
+0001336563 00000 n
+0001336713 00000 n
+0001336860 00000 n
+0001337009 00000 n
+0001337169 00000 n
+0001337342 00000 n
+0001337515 00000 n
+0001337677 00000 n
+0001337842 00000 n
+0001337998 00000 n
+0001338147 00000 n
+0001338298 00000 n
+0001338461 00000 n
+0001338615 00000 n
+0001338767 00000 n
+0001338912 00000 n
+0001339070 00000 n
+0001339221 00000 n
+0001339388 00000 n
+0001339548 00000 n
+0001339729 00000 n
+0001339904 00000 n
+0001340080 00000 n
+0001340258 00000 n
+0001340451 00000 n
+0001340648 00000 n
+0001340835 00000 n
+0001341024 00000 n
+0001341195 00000 n
+0001341366 00000 n
+0001341552 00000 n
+0001341738 00000 n
+0001341923 00000 n
+0001342108 00000 n
+0001342292 00000 n
+0001342478 00000 n
+0001342671 00000 n
+0001342866 00000 n
+0001343053 00000 n
+0001343240 00000 n
+0001343429 00000 n
+0001343620 00000 n
+0001343790 00000 n
+0001343960 00000 n
+0001344142 00000 n
+0001344324 00000 n
+0001344511 00000 n
+0001344698 00000 n
+0001344884 00000 n
+0001345072 00000 n
+0001345230 00000 n
+0001345399 00000 n
+0001345572 00000 n
+0001345755 00000 n
+0001345935 00000 n
+0001346126 00000 n
+0001346295 00000 n
+0001346477 00000 n
+0001346657 00000 n
+0001346944 00000 n
0001347022 00000 n
-0001347100 00000 n
-0001347237 00000 n
-0001347429 00000 n
-0001347654 00000 n
-0001347829 00000 n
-0001348058 00000 n
-0001348299 00000 n
-0001348551 00000 n
-0001348823 00000 n
-0001349059 00000 n
-0001349263 00000 n
-0001349491 00000 n
-0001349671 00000 n
-0001349872 00000 n
-0001350137 00000 n
-0001350334 00000 n
-0001350553 00000 n
-0001350774 00000 n
-0001350981 00000 n
-0001351275 00000 n
-0001351469 00000 n
-0001351666 00000 n
-0001351867 00000 n
-0001352119 00000 n
-0001352324 00000 n
-0001352543 00000 n
-0001352805 00000 n
-0001352995 00000 n
-0001353224 00000 n
-0001353443 00000 n
-0001353687 00000 n
-0001353870 00000 n
-0001354098 00000 n
-0001354284 00000 n
-0001354673 00000 n
-0001363714 00000 n
-0001363930 00000 n
-0001365293 00000 n
-0001366348 00000 n
-0001373649 00000 n
-0001373870 00000 n
-0001375233 00000 n
-0001376316 00000 n
-0001377644 00000 n
-0001377855 00000 n
-0001378169 00000 n
-0001379084 00000 n
-0001383225 00000 n
-0001383455 00000 n
-0001384818 00000 n
-0001385935 00000 n
-0001390115 00000 n
-0001390341 00000 n
-0001391704 00000 n
-0001392807 00000 n
-0001398618 00000 n
-0001398832 00000 n
-0001400195 00000 n
-0001401246 00000 n
-0001402641 00000 n
-0001402859 00000 n
-0001404222 00000 n
-0001405361 00000 n
-0001407719 00000 n
-0001407933 00000 n
-0001408275 00000 n
-0001409413 00000 n
-0001410576 00000 n
-0001410792 00000 n
-0001411095 00000 n
+0001347159 00000 n
+0001347351 00000 n
+0001347576 00000 n
+0001347751 00000 n
+0001347980 00000 n
+0001348221 00000 n
+0001348473 00000 n
+0001348745 00000 n
+0001348981 00000 n
+0001349185 00000 n
+0001349413 00000 n
+0001349593 00000 n
+0001349794 00000 n
+0001350059 00000 n
+0001350256 00000 n
+0001350475 00000 n
+0001350696 00000 n
+0001350903 00000 n
+0001351197 00000 n
+0001351391 00000 n
+0001351588 00000 n
+0001351789 00000 n
+0001352041 00000 n
+0001352246 00000 n
+0001352465 00000 n
+0001352727 00000 n
+0001352917 00000 n
+0001353146 00000 n
+0001353365 00000 n
+0001353609 00000 n
+0001353792 00000 n
+0001354020 00000 n
+0001354206 00000 n
+0001354595 00000 n
+0001363636 00000 n
+0001363852 00000 n
+0001365215 00000 n
+0001366270 00000 n
+0001373571 00000 n
+0001373792 00000 n
+0001375155 00000 n
+0001376238 00000 n
+0001377566 00000 n
+0001377777 00000 n
+0001378091 00000 n
+0001379006 00000 n
+0001383147 00000 n
+0001383377 00000 n
+0001384740 00000 n
+0001385857 00000 n
+0001390037 00000 n
+0001390263 00000 n
+0001391626 00000 n
+0001392729 00000 n
+0001398540 00000 n
+0001398754 00000 n
+0001400117 00000 n
+0001401168 00000 n
+0001402563 00000 n
+0001402781 00000 n
+0001404144 00000 n
+0001405283 00000 n
+0001407641 00000 n
+0001407855 00000 n
+0001408197 00000 n
+0001409335 00000 n
+0001410498 00000 n
+0001410714 00000 n
+0001411017 00000 n
trailer
<< /Size 413
/Root 2 0 R
/Info 1 0 R
>>
startxref
-1412232
+1412154
%%EOF
http://git-wip-us.apache.org/repos/asf/isis-site/blob/274edd1d/content/versions/2.0.0-M1/guides/ugvro/ugvro.pdf
----------------------------------------------------------------------
diff --git a/content/versions/2.0.0-M1/guides/ugvro/ugvro.pdf b/content/versions/2.0.0-M1/guides/ugvro/ugvro.pdf
index a47fc02..e402eae 100644
--- a/content/versions/2.0.0-M1/guides/ugvro/ugvro.pdf
+++ b/content/versions/2.0.0-M1/guides/ugvro/ugvro.pdf
@@ -4,8 +4,8 @@
<< /Title (Restful Objects Viewer)
/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:20180812182730+01'00')
-/ModDate (D:20180812182730+01'00')
+/CreationDate (D:20180814004113+02'00')
+/ModDate (D:20180814004113+02'00')
>>
endobj
2 0 obj
http://git-wip-us.apache.org/repos/asf/isis-site/blob/274edd1d/content/versions/2.0.0-M1/guides/ugvw/ugvw.html
----------------------------------------------------------------------
diff --git a/content/versions/2.0.0-M1/guides/ugvw/ugvw.html b/content/versions/2.0.0-M1/guides/ugvw/ugvw.html
index ba9aaab..5af50cf 100644
--- a/content/versions/2.0.0-M1/guides/ugvw/ugvw.html
+++ b/content/versions/2.0.0-M1/guides/ugvw/ugvw.html
@@ -1439,7 +1439,16 @@ table.CodeRay td.code>pre{padding:0}
<div class="sect3">
<h4 id="_other_annotations">3.1.4. Other Annotations</h4>
<div class="paragraph">
- <p>All the layout annotations (eg <code>@Regex</code> and <code>@Named</code>) have been deprecated, instead replaced by the various <code>XxxLayout</code> annotations: <a href="../rgant/rgant.html#_rgant-ActionLayout, "><code>@ActionLayout</code></a> <a href="../rgant/rgant.html#_rgant-CollectionLayout"><code>@CollectionLayout</code></a>, <a href="../rgant/rgant.html#_rgant-DomainObjectLayout"><code>@DomainObjectLayout</code></a>, <a href="../rgant/rgant.html#_rgant-DomainServiceLayout"><code>@DomainServiceLayout</code></a>, <a href="../rgant/rgant.html#_rgant-ParameterLayout"><code>@ParameterLayout</code></a>, <a href="../rgant/rgant.html#_rgant-PropertyLayout"><code>@PropertyLayout</code></a>, and <a href="../rgant/rgant.html#_rgant-ViewModelLayout"><code>@ViewModelLayout</code></a></p>
+ <p>Layout semantics can also be specified using the various <code>XxxLayout</code> annotations:</p>
+ </div>
+ <div class="ulist">
+ <ul>
+ <li> <p>for domain services: <a href="../rgant/rgant.html#_rgant-DomainServiceLayout"><code>@DomainServiceLayout</code></a></p> </li>
+ <li> <p>for domain objects: <a href="../rgant/rgant.html#_rgant-DomainObjectLayout"><code>@DomainObjectLayout</code></a> and <a href="../rgant/rgant.html#_rgant-ViewModelLayout"><code>@ViewModelLayout</code></a></p> </li>
+ <li> <p>for actions: <a href="../rgant/rgant.html#_rgant-ActionLayout, "><code>@ActionLayout</code></a> and <a href="../rgant/rgant.html#_rgant-ParameterLayout"><code>@ParameterLayout</code></a></p> </li>
+ <li> <p>for properties: <a href="../rgant/rgant.html#_rgant-PropertyLayout"><code>@PropertyLayout</code></a></p> </li>
+ <li> <p>for collections: <a href="../rgant/rgant.html#_rgant-CollectionLayout"><code>@CollectionLayout</code></a></p> </li>
+ </ul>
</div>
</div>
</div>
[39/39] isis-site git commit: ISIS-1810: updates docs for 2.0.0-M1
Posted by da...@apache.org.
ISIS-1810: updates docs for 2.0.0-M1
Project: http://git-wip-us.apache.org/repos/asf/isis-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis-site/commit/274edd1d
Tree: http://git-wip-us.apache.org/repos/asf/isis-site/tree/274edd1d
Diff: http://git-wip-us.apache.org/repos/asf/isis-site/diff/274edd1d
Branch: refs/heads/asf-site
Commit: 274edd1d709e5c346d27e6d245eafdd39430e4ea
Parents: 2f475bb
Author: danhaywood <da...@haywood-associates.co.uk>
Authored: Tue Aug 14 00:58:46 2018 +0200
Committer: danhaywood <da...@haywood-associates.co.uk>
Committed: Tue Aug 14 00:58:46 2018 +0200
----------------------------------------------------------------------
content/migration-notes/migration-notes.html | 1854 +-
content/release-notes/release-notes.html | 118 +-
.../versions/2.0.0-M1/elasticlunr/index.json | 2 +-
.../versions/2.0.0-M1/guides/cgcom/cgcom.pdf | 4 +-
content/versions/2.0.0-M1/guides/dg/dg.html | 4 +-
content/versions/2.0.0-M1/guides/dg/dg.pdf | 849 +-
content/versions/2.0.0-M1/guides/htg.html | 13 +-
content/versions/2.0.0-M1/guides/htg.pdf | 3929 ++-
.../versions/2.0.0-M1/guides/rgant/rgant.html | 172 +-
.../versions/2.0.0-M1/guides/rgant/rgant.pdf | 20090 +++++------
.../versions/2.0.0-M1/guides/rgcfg/rgcfg.pdf | 4 +-
.../versions/2.0.0-M1/guides/rgcms/rgcms.html | 367 +-
.../versions/2.0.0-M1/guides/rgcms/rgcms.pdf | 29020 +++++++--------
.../versions/2.0.0-M1/guides/rgfis/rgfis.html | 23 +-
.../versions/2.0.0-M1/guides/rgfis/rgfis.pdf | 1851 +-
.../versions/2.0.0-M1/guides/rgmvn/rgmvn.pdf | 4 +-
.../versions/2.0.0-M1/guides/rgsvc/rgsvc.html | 381 +-
.../versions/2.0.0-M1/guides/rgsvc/rgsvc.pdf | 30958 +++++++----------
.../versions/2.0.0-M1/guides/ugbtb/ugbtb.html | 10 +-
.../versions/2.0.0-M1/guides/ugbtb/ugbtb.pdf | 410 +-
.../versions/2.0.0-M1/guides/ugfun/ugfun.html | 73 +-
.../versions/2.0.0-M1/guides/ugfun/ugfun.pdf | 14605 ++++----
.../versions/2.0.0-M1/guides/ugodn/ugodn.pdf | 4 +-
.../versions/2.0.0-M1/guides/ugsec/ugsec.html | 10 +-
.../versions/2.0.0-M1/guides/ugsec/ugsec.pdf | 738 +-
.../versions/2.0.0-M1/guides/ugtst/ugtst.html | 12 +-
.../versions/2.0.0-M1/guides/ugtst/ugtst.pdf | 634 +-
.../versions/2.0.0-M1/guides/ugvro/ugvro.pdf | 4 +-
content/versions/2.0.0-M1/guides/ugvw/ugvw.html | 11 +-
content/versions/2.0.0-M1/guides/ugvw/ugvw.pdf | 2067 +-
.../migration-notes/migration-notes.html | 1854 +-
content/versions/2.0.0-M1/pages/tg/tg.html | 7 +-
.../2.0.0-M1/release-notes/release-notes.html | 118 +-
.../versions/SNAPSHOT/elasticlunr/index.json | 2 +-
.../versions/SNAPSHOT/guides/cgcom/cgcom.pdf | 4 +-
content/versions/SNAPSHOT/guides/dg/dg.html | 4 +-
content/versions/SNAPSHOT/guides/dg/dg.pdf | 849 +-
content/versions/SNAPSHOT/guides/htg.html | 13 +-
content/versions/SNAPSHOT/guides/htg.pdf | 3929 ++-
.../versions/SNAPSHOT/guides/rgant/rgant.html | 172 +-
.../versions/SNAPSHOT/guides/rgant/rgant.pdf | 20090 +++++------
.../versions/SNAPSHOT/guides/rgcfg/rgcfg.pdf | 4 +-
.../versions/SNAPSHOT/guides/rgcms/rgcms.html | 367 +-
.../versions/SNAPSHOT/guides/rgcms/rgcms.pdf | 29020 +++++++--------
.../versions/SNAPSHOT/guides/rgfis/rgfis.html | 23 +-
.../versions/SNAPSHOT/guides/rgfis/rgfis.pdf | 1851 +-
.../versions/SNAPSHOT/guides/rgmvn/rgmvn.pdf | 4 +-
.../versions/SNAPSHOT/guides/rgsvc/rgsvc.html | 381 +-
.../versions/SNAPSHOT/guides/rgsvc/rgsvc.pdf | 30958 +++++++----------
.../versions/SNAPSHOT/guides/ugbtb/ugbtb.html | 10 +-
.../versions/SNAPSHOT/guides/ugbtb/ugbtb.pdf | 410 +-
.../versions/SNAPSHOT/guides/ugfun/ugfun.html | 73 +-
.../versions/SNAPSHOT/guides/ugfun/ugfun.pdf | 14605 ++++----
.../versions/SNAPSHOT/guides/ugodn/ugodn.pdf | 4 +-
.../versions/SNAPSHOT/guides/ugsec/ugsec.html | 10 +-
.../versions/SNAPSHOT/guides/ugsec/ugsec.pdf | 738 +-
.../versions/SNAPSHOT/guides/ugtst/ugtst.html | 12 +-
.../versions/SNAPSHOT/guides/ugtst/ugtst.pdf | 634 +-
.../versions/SNAPSHOT/guides/ugvro/ugvro.pdf | 4 +-
content/versions/SNAPSHOT/guides/ugvw/ugvw.html | 11 +-
content/versions/SNAPSHOT/guides/ugvw/ugvw.pdf | 2067 +-
.../migration-notes/migration-notes.html | 1854 +-
content/versions/SNAPSHOT/pages/tg/tg.html | 7 +-
.../SNAPSHOT/release-notes/release-notes.html | 118 +-
.../migration-notes/migration-notes.html | 1854 +-
.../current/release-notes/release-notes.html | 118 +-
66 files changed, 101262 insertions(+), 119138 deletions(-)
----------------------------------------------------------------------
[21/39] isis-site git commit: ISIS-1810: updates docs for 2.0.0-M1
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/274edd1d/content/versions/2.0.0-M1/migration-notes/migration-notes.html
----------------------------------------------------------------------
diff --git a/content/versions/2.0.0-M1/migration-notes/migration-notes.html b/content/versions/2.0.0-M1/migration-notes/migration-notes.html
index cf8980a..6935dd0 100644
--- a/content/versions/2.0.0-M1/migration-notes/migration-notes.html
+++ b/content/versions/2.0.0-M1/migration-notes/migration-notes.html
@@ -381,13 +381,13 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-DomainService">@DomainService</a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-DomainService">@DomainService</a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-DomainServiceLayout">@DomainServiceLayout</a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-DomainServiceLayout">@DomainServiceLayout</a></p>
</div>
</div></td>
</tr>
@@ -401,13 +401,13 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-DomainObject">@DomainObject</a><br> <a href="../guides/rgant/rgant.html#_rgant-ViewModel">@ViewModel</a><br> <a href="../guides/rgant/rgant.html#_rgant-MemberGroupLayout">@MemberGroupLayout</a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-DomainObject">@DomainObject</a><br> <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-ViewModel">@ViewModel</a><br> <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-MemberGroupLayout">@MemberGroupLayout</a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-DomainObjectLayout">@DomainObjectLayout</a><br> <a href="../guides/rgant/rgant.html#_rgant-ViewModelLayout">@ViewModelLayout</a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-DomainObjectLayout">@DomainObjectLayout</a><br> <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-ViewModelLayout">@ViewModelLayout</a></p>
</div>
</div></td>
</tr>
@@ -421,13 +421,13 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-Action">@Action</a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-Action">@Action</a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-ActionLayout">@ActionLayout</a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-ActionLayout">@ActionLayout</a></p>
</div>
</div></td>
</tr>
@@ -441,13 +441,13 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-Parameter">@Parameter</a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-Parameter">@Parameter</a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-ParameterLayout">@ParameterLayout</a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-ParameterLayout">@ParameterLayout</a></p>
</div>
</div></td>
</tr>
@@ -461,13 +461,13 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-Property">@Property</a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-Property">@Property</a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-PropertyLayout">@PropertyLayout</a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-PropertyLayout">@PropertyLayout</a></p>
</div>
</div></td>
</tr>
@@ -481,13 +481,13 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-Collection">@Collection</a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-Collection">@Collection</a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-CollectionLayout">@CollectionLayout</a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-CollectionLayout">@CollectionLayout</a></p>
</div>
</div></td>
</tr>
@@ -507,7 +507,7 @@ table.CodeRay td.code>pre{padding:0}
</ul>
</div>
<div class="paragraph">
- <p>Prior to v2.0.0, several annotation attributes were defined as booleans. In order to support <a href="#__migration-notes_1.15.0-to-1.16.0_meta-annotations">meta annotations</a>, these have been replaced by enums which also include a <code>NOT_SPECIFIED</code> value. Other enums have been extended (where necessary) to also have a <code>NOT_SPECIFIED</code> value. In all cases <code>NOT_SPECIFIED</code> is the new default.</p>
+ <p>Prior to v2.0.0, several annotation attributes were defined as booleans. In order to support <a href="https://isis.apache.org/versions/2.0.0-M1/migration-notes/migration-notes.html#__migration-notes_1.15.0-to-1.16.0_meta-annotations">meta annotations</a>, these have been replaced by enums which also include a <code>NOT_SPECIFIED</code> value. Other enums have been extended (where necessary) to also have a <code>NOT_SPECIFIED</code> value. In all cases <code>NOT_SPECIFIED</code> is the new default.</p>
</div>
<table class="tableblock frame-all grid-all spread">
<caption class="title">
@@ -530,13 +530,13 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top" rowspan="7">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-Action"><code>@Action</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-Action"><code>@Action</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-Action_command"><code>command</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-Action_command"><code>command</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -550,7 +550,7 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-Action_hidden"><code>hidden</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-Action_hidden"><code>hidden</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -564,7 +564,7 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-Action_invokeOn"><code>invokeOn</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-Action_invokeOn"><code>invokeOn</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -578,7 +578,7 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-Action_publishing"><code>publishing</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-Action_publishing"><code>publishing</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -592,7 +592,7 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-Action_publishing"><code>publishing</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-Action_publishing"><code>publishing</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -606,7 +606,7 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-Action_restrictTo"><code>restrictTo</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-Action_restrictTo"><code>restrictTo</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -620,7 +620,7 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-Action_semantics"><code>semantics</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-Action_semantics"><code>semantics</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -634,13 +634,13 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top" rowspan="3">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-ActionLayout"><code>@ActionLayout</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-ActionLayout"><code>@ActionLayout</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-ActionLayout_bookmarking"><code>bookmarking</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-ActionLayout_bookmarking"><code>bookmarking</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -654,7 +654,7 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-ActionLayout_contributed"><code>contributed</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-ActionLayout_contributed"><code>contributed</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -668,7 +668,7 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-ActionLayout_position"><code>position</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-ActionLayout_position"><code>position</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -682,13 +682,13 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top" rowspan="3">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-Collection"><code>@Collection</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-Collection"><code>@Collection</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-Collection_hidden"><code>hidden</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-Collection_hidden"><code>hidden</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -702,7 +702,7 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-Collection_editing"><code>editing</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-Collection_editing"><code>editing</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -716,7 +716,7 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-Collection_mementoSerialization"><code>mementoSerialization</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-Collection_mementoSerialization"><code>mementoSerialization</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -730,13 +730,13 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top" rowspan="4">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-DomainObject"><code>@DomainObject</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-DomainObject"><code>@DomainObject</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-DomainObject_auditing"><code>auditing</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-DomainObject_auditing"><code>auditing</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -750,7 +750,7 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-DomainObject_bounding"><code>bounding</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-DomainObject_bounding"><code>bounding</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -764,7 +764,7 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-DomainObject_editing"><code>editing</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-DomainObject_editing"><code>editing</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -778,7 +778,7 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-DomainObject_publishing"><code>publishing</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-DomainObject_publishing"><code>publishing</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -792,13 +792,13 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-DomainObjectLayout"><code>@DomainObjectLayout</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-DomainObjectLayout"><code>@DomainObjectLayout</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-DomainObjectLayout_bookmarking"><code>bookmarking</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-DomainObjectLayout_bookmarking"><code>bookmarking</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -812,13 +812,13 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-Parameter"><code>@Parameter</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-Parameter"><code>@Parameter</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-Parameter_optionality"><code>optionality</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-Parameter_optionality"><code>optionality</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -832,13 +832,13 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top" rowspan="2">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-ParameterLayout"><code>@ParameterLayout</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-ParameterLayout"><code>@ParameterLayout</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-ParameterLayout_labelPosition"><code>labelPosition</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-ParameterLayout_labelPosition"><code>labelPosition</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -852,7 +852,7 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-ParameterLayout_renderDay"><code>renderDay</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-ParameterLayout_renderDay"><code>renderDay</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -866,13 +866,13 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top" rowspan="6">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-Property"><code>@Property</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-Property"><code>@Property</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-Property_commandReification"><code>commandReification</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-Property_commandReification"><code>commandReification</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -886,7 +886,7 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-Property_editing"><code>editing</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-Property_editing"><code>editing</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -900,7 +900,7 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-Property_hidden"><code>hidden</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-Property_hidden"><code>hidden</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -914,7 +914,7 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-Property_mementoSerialization"><code>mementoSerialization</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-Property_mementoSerialization"><code>mementoSerialization</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -928,7 +928,7 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-Property_optionality"><code>optionality</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-Property_optionality"><code>optionality</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -942,7 +942,7 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-Property_publishing"><code>publishing</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-Property_publishing"><code>publishing</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -956,13 +956,13 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top" rowspan="5">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-PropertyLayout"><code>@PropertyLayout</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-PropertyLayout"><code>@PropertyLayout</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-PropertyLayout_labelPosition"><code>labelPosition</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-PropertyLayout_labelPosition"><code>labelPosition</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -976,7 +976,7 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-PropertyLayout_promptStyle"><code>promptStyle</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-PropertyLayout_promptStyle"><code>promptStyle</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -990,7 +990,7 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-PropertyLayout_renderDay"><code>renderDay</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-PropertyLayout_renderDay"><code>renderDay</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -1004,7 +1004,7 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-PropertyLayout_repainting"><code>repainting</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-PropertyLayout_repainting"><code>repainting</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -1018,13 +1018,13 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-ViewModelLayout"><code>@ViewModelLayout</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-ViewModelLayout"><code>@ViewModelLayout</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-ViewModelLayout_bookmarking"><code>bookmarking</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-ViewModelLayout_bookmarking"><code>bookmarking</code></a></p>
</div>
</div></td>
</tr>
@@ -1065,61 +1065,65 @@ table.CodeRay td.code>pre{padding:0}
<tbody>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@Action</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@Action</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>publishingPayloadFactory()</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>publishingPayloadFactory()</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p>Removed, use the simpler <a href="../guides/rgsvc/rgsvc.html#PublisherService">PublisherService</a> SPI instead.</p>
+ <p>Removed, use the simpler <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgsvc/rgsvc.html#PublisherService">PublisherService</a> SPI instead.</p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@ActionInteraction</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@ActionInteraction</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant_Action_domainEvent"><code>@Action#domainEvent()</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Action_domainEvent"><code>@Action#domainEvent()</code></a></p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@ActionOrder</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@ActionOrder</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant_MemberOrder"><code>@MemberOrder()</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_MemberOrder"><code>@MemberOrder()</code></a></p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@Aggregated</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@Aggregated</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
@@ -1129,414 +1133,429 @@ table.CodeRay td.code>pre{padding:0}
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@Auditable
-(JDO applib)</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@Auditable</code> (JDO applib)</p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant_DomainObject_audited"><code>@DomainObject#auditing()</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_DomainObject_audited"><code>@DomainObject#auditing()</code></a></p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@Audited</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@Audited</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant_DomainObject_audited"><code>@DomainObject#auditing()</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_DomainObject_audited"><code>@DomainObject#auditing()</code></a></p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@AutoComplete</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@AutoComplete</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant_DomainObject_autoComplete"><code>@DomainObject#autoComplete()</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_DomainObject_autoComplete"><code>@DomainObject#autoComplete()</code></a></p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@ActionSemantics</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@ActionSemantics</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant_Action_semantics"><code>@Action#semantics()</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Action_semantics"><code>@Action#semantics()</code></a></p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@Bookmarkable</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@Bookmarkable</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant_DomainObject_bookmarking"><code>@DomainObject#bookmarking()</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_DomainObject_bookmarking"><code>@DomainObject#bookmarking()</code></a></p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@Bounded</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@Bounded</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant_DomainObject_bounding"><code>@DomainObject#bounding()</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_DomainObject_bounding"><code>@DomainObject#bounding()</code></a></p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@Bulk</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@Bulk</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant_Action_invokeOn"><code>@Action#invokeOn()</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Action_invokeOn"><code>@Action#invokeOn()</code></a></p>
</div>
<div class="paragraph">
- <p>Similarly, the <code>Bulk.InteractionContext</code> domain service is replaced with the <a href="../guides/rgsvc/rgsvc.html#ActionInvocationContext">ActionInvocationContext</a> domain service.</p>
+ <p>Similarly, the <code>Bulk.InteractionContext</code> domain service is replaced with the <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgsvc/rgsvc.html#ActionInvocationContext">ActionInvocationContext</a> domain service.</p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@Collection</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@Collection</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>notPersisted</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>notPersisted</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p>Removed, replaced with <a href="../guides/rgant/rgant.html#_rgant_Collection_mementoSerialization"><code>@Collection#mementoSerialization()</code></a></p>
+ <p>Removed, replaced with <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Collection_mementoSerialization"><code>@Collection#mementoSerialization()</code></a></p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@CollectionInteraction</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@CollectionInteraction</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant_Collection_domainEvent"><code>@Collection #domainEvent()</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Collection_domainEvent"><code>@Collection #domainEvent()</code></a></p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@CollectionLayout</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@CollectionLayout</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>render()</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>render</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant_CollectionLayout_defaultView"><code>@CollectionLayout#defaultView()</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_CollectionLayout_defaultView"><code>@CollectionLayout#defaultView()</code></a></p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@Command</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@Command</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant_Action_command"><code>@Action#command()</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Action_command"><code>@Action#command()</code></a></p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@CssClass</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@CssClass</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p>Either <a href="../guides/rgant/rgant.html#_rgant_ActionLayout_cssClass"><code>@ActionLayout#cssClass()</code></a>, <a href="../guides/rgant/rgant.html#_rgant_PropertyLayout_cssClass"><code>@PropertyLayout#cssClass()</code></a>, <a href="../guides/rgant/rgant.html#_rgant_CollectionLayout_cssClass"><code>@CollectionLayout#cssClass()</code></a>, <a href="../guides/rgant/rgant.html#_rgant_ParameterLayout_cssClass"><code>@ParameterLayout#cssClass()</code></a>, <a href="../guides/rgant/rgant.html#_rgant_DomainObjectLayout_cssClass"><code>@DomainObjectLayout#cssClass()</code></a> or <a href="../guides/rgant/rgant.html#_rgant_ViewModelLayout_cssClass"><code>@ViewModelLayout#cssClass()</code></a>.</p>
+ <p>Either <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_ActionLayout_cssClass"><code>@ActionLayout#cssClass()</code></a>, <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_PropertyLayout_cssClass"><code>@PropertyLayout#cssClass()</code></a>, <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_CollectionLayout_cssClass"><code>@CollectionLayout#cssClass()</code></a>, <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_ParameterLayout_cssClass"><code>@ParameterLayout#cssClass()</code></a>, <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_DomainObjectLayout_cssClass"><code>@DomainObjectLayout#cssClass()</code></a> or <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_ViewModelLayout_cssClass"><code>@ViewModelLayout#cssClass()</code></a>.</p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@CssClassFa</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@CssClassFa</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p>Either <a href="../guides/rgant/rgant.html#_rgant_ActionLayout_cssClassFa"><code>@ActionLayout#cssClassFa()</code></a>, <a href="../guides/rgant/rgant.html#_rgant_DomainObjectLayout_cssClassFa"><code>@DomainObjectLayout#cssClassFa()</code></a> or <a href="../guides/rgant/rgant.html#_rgant_ViewModelLayout_cssClassFa"><code>@ViewModelLayout#cssClassFa()</code></a>.</p>
+ <p>Either <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_ActionLayout_cssClassFa"><code>@ActionLayout#cssClassFa()</code></a>, <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_DomainObjectLayout_cssClassFa"><code>@DomainObjectLayout#cssClassFa()</code></a> or <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_ViewModelLayout_cssClassFa"><code>@ViewModelLayout#cssClassFa()</code></a>.</p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@Debug</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@Debug</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant_Action_restrictTo"><code>@Action#restrictTo()</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Action_restrictTo"><code>@Action#restrictTo()</code></a></p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@DescribedAs</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@DescribedAs</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p>Either <a href="../guides/rgant/rgant.html#_rgant_ActionLayout_describedAs"><code>@ActionLayout#describedAs()</code></a>, <a href="../guides/rgant/rgant.html#_rgant_PropertyLayout_describedAs"><code>@PropertyLayout#describedAs()</code></a>, <a href="../guides/rgant/rgant.html#_rgant_CollectionLayout_describedAs"><code>@CollectionLayout#describedAs()</code></a>, <a href="../guides/rgant/rgant.html#_rgant_ParameterLayout_describedAs"><code>@ParameterLayout#describedAs()</code></a>, <a href="../guides/rgant/rgant.html#_rgant_DomainObjectLayout_describedAs"><code>@DomainObjectLayout#describedAs()</code></a> or <a href="../guides/rgant/rgant.html#_rgant_ViewModelLayout_describedAs"><code>@ViewModelLayout#describedAs()</code></a>.</p>
+ <p>Either <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_ActionLayout_describedAs"><code>@ActionLayout#describedAs()</code></a>, <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_PropertyLayout_describedAs"><code>@PropertyLayout#describedAs()</code></a>, <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_CollectionLayout_describedAs"><code>@CollectionLayout#describedAs()</code></a>, <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_ParameterLayout_describedAs"><code>@ParameterLayout#describedAs()</code></a>, <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_DomainObjectLayout_describedAs"><code>@DomainObjectLayout#describedAs()</code></a> or <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_ViewModelLayout_describedAs"><code>@ViewModelLayout#describedAs()</code></a>.</p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@Disabled</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@Disabled</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant_Property_editingDisabledReason"><code>@Property#editingDisabledReason()</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Property_editingDisabledReason"><code>@Property#editingDisabledReason()</code></a></p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top" rowspan="2">
- <div class="literal">
- <pre>@DomainObject</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@DomainObject</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>bounded</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>bounded</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p>Deleted (was a boolean attribute), replaced by <a href="../guides/rgant/rgant.html#_rgant_DomainObject_bounding"><code>@Property#bounding</code></a></p>
+ <p>Deleted (was a boolean attribute), replaced by <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_DomainObject_bounding"><code>@Property#bounding</code></a></p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>publishingPayloadFactory</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>publishingPayloadFactory</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>Removed, use the simpler <a href="../guides/rgsvc/rgsvc.html#PublisherService">PublisherService</a> SPI instead.</pre>
+ <div>
+ <div class="paragraph">
+ <p>Removed, use the simpler <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgsvc/rgsvc.html#PublisherService">PublisherService</a> SPI instead.</p>
+ </div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@Exploration</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@Exploration</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant_Action_restrictTo"><code>@Action#restrictTo()</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Action_restrictTo"><code>@Action#restrictTo()</code></a></p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@FieldOrder</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@FieldOrder</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant_MemberOrder"><code>@MemberOrder()</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_MemberOrder"><code>@MemberOrder()</code></a></p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@Hidden</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@Hidden</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p>For actions by either <a href="../guides/rgant/rgant.html#_rgant_Action_hidden"><code>@Action#hidden()</code></a> or <a href="../guides/rgant/rgant.html#_rgant_ActionLayout_hidden"><code>@ActionLayout#hidden()</code></a>, for properties by either <a href="../guides/rgant/rgant.html#_rgant_Property_hidden"><code>@Property#hidden()</code></a> or <a href="../guides/rgant/rgant.html#_rgant_PropertyLayout_hidden"><code>@PropertyLayout#hidden()</code></a>, for collections by either <a href="../guides/rgant/rgant.html#_rgant_Collection_hidden"><code>@Collection#hidden()</code></a> or <a href="../guides/rgant/rgant.html#_rgant_CollectionLayout_hidden"><code>@CollectionLayout#hidden()</code></a>.</p>
+ <p>For actions by either <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Action_hidden"><code>@Action#hidden()</code></a> or <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_ActionLayout_hidden"><code>@ActionLayout#hidden()</code></a>, for properties by either <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Property_hidden"><code>@Property#hidden()</code></a> or <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_PropertyLayout_hidden"><code>@PropertyLayout#hidden()</code></a>, for collections by either <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Collection_hidden"><code>@Collection#hidden()</code></a> or <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_CollectionLayout_hidden"><code>@CollectionLayout#hidden()</code></a>.</p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@Idempotent</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@Idempotent</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant_Action_semantics"><code>@Action#semantics()</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Action_semantics"><code>@Action#semantics()</code></a></p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@Ignore</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@Ignore</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant_Programmatic"><code>@Programmatic</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Programmatic"><code>@Programmatic</code></a></p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@Immutable</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@Immutable</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant_DomainObject_editing"><code>@DomainObject#editing()</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_DomainObject_editing"><code>@DomainObject#editing()</code></a></p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@Mandatory</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@Mandatory</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p>Either <a href="../guides/rgant/rgant.html#_rgant_Property_optionality"><code>@Property#optionality()</code></a> or <a href="../guides/rgant/rgant.html#_rgant_Parameter_optionality"><code>@Parameter#optionality()</code></a>.</p>
+ <p>Either <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Property_optionality"><code>@Property#optionality()</code></a> or <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Parameter_optionality"><code>@Parameter#optionality()</code></a>.</p>
</div>
<div class="paragraph">
- <p>For properties, can also use <a href="../guides/rgant/rgant.html#_rgant_Column_allowsNull"><code>@Column#allowsNull()</code></a> Can also use <a href="../guides/rgant/rgant.html#_rgant_Nullable"><code>@Nullable</code></a> for either properties or parameters.</p>
+ <p>For properties, can also use <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Column_allowsNull"><code>@Column#allowsNull()</code></a> Can also use <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Nullable"><code>@Nullable</code></a> for either properties or parameters.</p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@Mask</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@Mask</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
@@ -1546,154 +1565,154 @@ table.CodeRay td.code>pre{padding:0}
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@MaxLength</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@MaxLength</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p>Either <a href="../guides/rgant/rgant.html#_rgant_Property_maxLength"><code>@Property#maxLength()</code></a> or <a href="../guides/rgant/rgant.html#_rgant_Parameter_maxLength"><code>@Parameter#maxLength()</code></a>.</p>
+ <p>Either <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Property_maxLength"><code>@Property#maxLength()</code></a> or <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Parameter_maxLength"><code>@Parameter#maxLength()</code></a>.</p>
</div>
<div class="paragraph">
- <p>For properties, can also use <a href="../guides/rgant/rgant.html#_rgant_Column_length"><code>@Column#length()</code></a></p>
+ <p>For properties, can also use <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Column_length"><code>@Column#length()</code></a></p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@MemberGroups</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@MemberGroups</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/ugvw/ugvw.html#_ugvw_layout_file-based">.layout.xml</a> file instead.</p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/ugvw/ugvw.html#_ugvw_layout_file-based">.layout.xml</a> file instead.</p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@MultiLine</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@MultiLine</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p>Either <a href="../guides/rgant/rgant.html#_rgant_PropertyLayout_multiLine"><code>@PropertyLayout#multiLine()</code></a> or <a href="../guides/rgant/rgant.html#_rgant_ParameterLayout_multiLine"><code>@ParameterLayout#multiLine()</code></a>.</p>
+ <p>Either <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_PropertyLayout_multiLine"><code>@PropertyLayout#multiLine()</code></a> or <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_ParameterLayout_multiLine"><code>@ParameterLayout#multiLine()</code></a>.</p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@MustSatisfy</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@MustSatisfy</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p>Either <a href="../guides/rgant/rgant.html#_rgant_Property_mustSatisfy"><code>@Property#mustSatisfy()</code></a> or <a href="../guides/rgant/rgant.html#_rgant_Parameter_mustSatisfy"><code>@Parameter#mustSatisfy()</code></a>.</p>
+ <p>Either <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Property_mustSatisfy"><code>@Property#mustSatisfy()</code></a> or <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Parameter_mustSatisfy"><code>@Parameter#mustSatisfy()</code></a>.</p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@NotPersisted</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@NotPersisted</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant_Property_notPersisted"><code>@Property#notPersisted()</code></a>.</p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Property_notPersisted"><code>@Property#notPersisted()</code></a>.</p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@Optional</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@Optional</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p>Either <a href="../guides/rgant/rgant.html#_rgant_Property_optionality"><code>@Property#optionality()</code></a> or <a href="../guides/rgant/rgant.html#_rgant_Parameter_optionality"><code>@Parameter#optionality()</code></a>.</p>
+ <p>Either <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Property_optionality"><code>@Property#optionality()</code></a> or <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Parameter_optionality"><code>@Parameter#optionality()</code></a>.</p>
</div>
<div class="paragraph">
- <p>For properties, can also use <a href="../guides/rgant/rgant.html#_rgant_Column_allowsNull"><code>@Column#allowsNull()</code></a> Can also use <a href="../guides/rgant/rgant.html#_rgant_Nullable"><code>@Nullable</code></a> for either properties or parameters.</p>
+ <p>For properties, can also use <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Column_allowsNull"><code>@Column#allowsNull()</code></a> Can also use <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Nullable"><code>@Nullable</code></a> for either properties or parameters.</p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@Named</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@Named</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p>Either <a href="../guides/rgant/rgant.html#_rgant_ActionLayout_named"><code>@ActionLayout#named()</code></a>, <a href="../guides/rgant/rgant.html#_rgant_PropertyLayout_named"><code>@PropertyLayout#named()</code></a>, <a href="../guides/rgant/rgant.html#_rgant_CollectionLayout_named"><code>@CollectionLayout#named()</code></a>, <a href="../guides/rgant/rgant.html#_rgant_ParameterLayout_named"><code>@ParameterLayout#named()</code></a>, <a href="../guides/rgant/rgant.html#_rgant_DomainObjectLayout_named"><code>@DomainObjectLayout#named()</code></a> or <a href="../guides/rgant/rgant.html#_rgant_ViewModelLayout_named"><code>@ViewModelLayout#named()</code></a>.</p>
+ <p>Either <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_ActionLayout_named"><code>@ActionLayout#named()</code></a>, <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_PropertyLayout_named"><code>@PropertyLayout#named()</code></a>, <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_CollectionLayout_named"><code>@CollectionLayout#named()</code></a>, <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_ParameterLayout_named"><code>@ParameterLayout#named()</code></a>, <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_DomainObjectLayout_named"><code>@DomainObjectLayout#named()</code></a> or <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_ViewModelLayout_named"><code>@ViewModelLayout#named()</code></a>.</p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@NotInServiceMenu</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@NotInServiceMenu</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant_DomainService_nature"><code>@DomainService#nature()</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_DomainService_nature"><code>@DomainService#nature()</code></a></p>
</div>
<div class="paragraph">
- <p>Specify nature of <code>VIEW_CONTRIBUTIONS_ONLY</code>. Alternatively, use a <a href="../guides/rgant/rgant.html#_rgant_Mixin">mixin</a>.</p>
+ <p>Specify nature of <code>VIEW_CONTRIBUTIONS_ONLY</code>. Alternatively, use a <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Mixin">mixin</a>.</p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@NotContributed</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@NotContributed</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant_DomainService_nature"><code>@DomainService#nature()</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_DomainService_nature"><code>@DomainService#nature()</code></a></p>
</div>
<div class="paragraph">
<p>Specify nature of <code>VIEW_MENU_ONLY</code>.</p>
@@ -1702,13 +1721,13 @@ table.CodeRay td.code>pre{padding:0}
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@NotPersistable</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@NotPersistable</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
@@ -1718,37 +1737,41 @@ table.CodeRay td.code>pre{padding:0}
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@ObjectType</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@ObjectType</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p>Removed, <a href="../guides/rgant/rgant.html#_rgant_DomainObject_objectType"><code>@DomainObject#objectType()</code></a> or <a href="../guides/rgant/rgant.html#_rgant_DomainService_objectType"><code>@DomainService#objectType()</code></a></p>
+ <p>Removed, <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_DomainObject_objectType"><code>@DomainObject#objectType()</code></a> or <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_DomainService_objectType"><code>@DomainService#objectType()</code></a></p>
</div>
<div class="paragraph">
<p>Alternatively, for domain entities either:</p>
</div>
<div class="ulist">
<ul>
- <li> <p>the <a href="../guides/rgant/rgant.html#_rgant_Discriminator"><code>@Discriminator</code></a> annotation can be specified; the value is used as the object type, or</p> </li>
- <li> <p>the <a href="../guides/rgant/rgant.html#_rgant_PersistenceCapable_schema"><code>@PersistenceCapable#schema()</code></a> can be specified; the value is used as the concatenated with the class name to create a two part object type.</p> </li>
+ <li> <p>the <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Discriminator"><code>@Discriminator</code></a> annotation can be specified; the value is used as the object type, or</p> </li>
+ <li> <p>the <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_PersistenceCapable_schema"><code>@PersistenceCapable#schema()</code></a> can be specified; the value is used as the concatenated with the class name to create a two part object type.</p> </li>
</ul>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@Parameter</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@Parameter</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>minLength()</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>minLength</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
<div>
@@ -1756,311 +1779,321 @@ table.CodeRay td.code>pre{padding:0}
<p>Never implemented internally in Isis 1.x so no replacement.</p>
</div>
<div class="paragraph">
- <p>Note that the <a href="../guides/rgant/rgant.html#_rgant_MinLength"><code>@MinLength</code></a> annotation is for use with autocomplete supporting methods (specifying the minimum number of characters to enter before an auto-complete search is performed).</p>
+ <p>Note that the <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_MinLength"><code>@MinLength</code></a> annotation is for use with autocomplete supporting methods (specifying the minimum number of characters to enter before an auto-complete search is performed).</p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@Paged</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@Paged</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p>Either <a href="../guides/rgant/rgant.html#_rgant_CollectionLayout_paged"><code>@CollectionLayout#paged()</code></a> (for parented collections), or <a href="../guides/rgant/rgant.html#_rgant_DomainObject_paged"><code>@DomainObject#paged()</code></a> (for standalone collections)</p>
+ <p>Either <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_CollectionLayout_paged"><code>@CollectionLayout#paged()</code></a> (for parented collections), or <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_DomainObject_paged"><code>@DomainObject#paged()</code></a> (for standalone collections)</p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@ParameterLayout</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@ParameterLayout</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>renderedAsDayBefore</pre>
+ <div>
+ <div class="paragraph">
+ <p>renderedAsDayBefore</p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p>Deleted (was a boolean attribute), replaced by <a href="../guides/rgant/rgant.html#_rgant_ParameterLayout_renderDay"><code>@ParameterLayout#renderDay</code></a>.</p>
+ <p>Deleted (was a boolean attribute), replaced by <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_ParameterLayout_renderDay"><code>@ParameterLayout#renderDay</code></a>.</p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@Plural</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@Plural</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant_DomainObjectLayout_plural"><code>@DomainObjectLayout#plural()</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_DomainObjectLayout_plural"><code>@DomainObjectLayout#plural()</code></a></p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@PostsAction
-InvokedEvent</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@PostsAction<br> InvokedEvent</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant_Action_domainEvent"><code>@Action#domainEvent()</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Action_domainEvent"><code>@Action#domainEvent()</code></a></p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@PostsCollection
-AddedToEvent</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@PostsCollection<br> AddedToEvent</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant_Collection_domainEvent"><code>@Collection#domainEvent()</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Collection_domainEvent"><code>@Collection#domainEvent()</code></a></p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@PostsCollection
-RemovedFromEvent</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@PostsCollection<br> RemovedFromEvent</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="liter
<TRUNCATED>
[20/39] isis-site git commit: ISIS-1810: updates docs for 2.0.0-M1
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/274edd1d/content/versions/2.0.0-M1/pages/tg/tg.html
----------------------------------------------------------------------
diff --git a/content/versions/2.0.0-M1/pages/tg/tg.html b/content/versions/2.0.0-M1/pages/tg/tg.html
index eead162..317c3b2 100644
--- a/content/versions/2.0.0-M1/pages/tg/tg.html
+++ b/content/versions/2.0.0-M1/pages/tg/tg.html
@@ -342,10 +342,7 @@ mvn clean install -D mavenmixin-jettyconsole</code></pre>
</div>
</div>
<div class="paragraph">
- <p>A splash screen should appear offering to start up the app. Go ahead and start; the web browser should be opened at <a href="http://localhost:8080">http://localhost:8080</a></p>
- </div>
- <div class="paragraph">
- <p>Alternatively, you can run using the mvn-jetty-plugin:</p>
+ <p>A splash screen should appear offering to start up the app. Go ahead and start; the web browser should be opened at <a href="http://localhost:8080">http://localhost:8080</a>. Alternatively, you can run using the mvn-jetty-plugin:</p>
</div>
<div class="listingblock">
<div class="content">
@@ -792,7 +789,7 @@ mvn clean install -D mavenmixin-jettyconsole</code></pre>
<li> <p>generally we recommend using the <a href="../../guides/rgant/rgant.html#_rgant-Inject"><code>@Inject</code></a> annotation with either private or default visibility</p> </li>
</ul>
</div> </li>
- <li> <p>the service itself should use <a href="../../guides/rgsvc/rgsvc.html#_rgsvc_core-domain-api_DomainObjectContainer"><code>DomainObjectContainer</code></a></p> </li>
+ <li> <p>the service itself should use <a href="../../guides/rgsvc/rgsvc.html#_rgsvc_core-domain-api_RepositoryService"><code>RepositoryService</code></a></p> </li>
<li> <p>use the <a href="../../guides/rgant/rgant.html#_rgant-MemberOrder"><code>@MemberOrder(name=…)</code></a> annotation to associate an action with a property or with a collection</p> </li>
</ul>
</div>
http://git-wip-us.apache.org/repos/asf/isis-site/blob/274edd1d/content/versions/2.0.0-M1/release-notes/release-notes.html
----------------------------------------------------------------------
diff --git a/content/versions/2.0.0-M1/release-notes/release-notes.html b/content/versions/2.0.0-M1/release-notes/release-notes.html
index 3de5762..f9a042f 100644
--- a/content/versions/2.0.0-M1/release-notes/release-notes.html
+++ b/content/versions/2.0.0-M1/release-notes/release-notes.html
@@ -309,7 +309,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_release-notes_2.0.0-M1">2.0.0-M1</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/2.0.0-M1/release-notes/release-notes.html#_release-notes_2.0.0-M1">2.0.0-M1</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">31-07-2018</p></td>
<td class="tableblock halign-left valign-top">
<div>
@@ -328,7 +328,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_release-notes_1.16.2">1.16.2</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/1.16.2/release-notes/release-notes.html#_release-notes_1.16.2">1.16.2</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">05-03-2018</p></td>
<td class="tableblock halign-left valign-top">
<div>
@@ -347,7 +347,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_release-notes_1.16.1">1.16.1</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/1.16.1/release-notes/release-notes.html#_release-notes_1.16.1">1.16.1</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">22-02-2018</p></td>
<td class="tableblock halign-left valign-top">
<div>
@@ -366,7 +366,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_release-notes_1.16.0">1.16.0</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/1.16.0/release-notes/release-notes.html#_release-notes_1.16.0">1.16.0</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">08-01-2018</p></td>
<td class="tableblock halign-left valign-top">
<div>
@@ -385,7 +385,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_release-notes_1.15.1">1.15.1</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/1.15.1/release-notes/release-notes.html#_release-notes_1.15.1">1.15.1</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">25-09-2017</p></td>
<td class="tableblock halign-left valign-top">
<div>
@@ -404,7 +404,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_release-notes_1.15.0">1.15.0</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/1.15.0/release-notes/release-notes.html#_release-notes_1.15.0">1.15.0</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">14-08-2017</p></td>
<td class="tableblock halign-left valign-top">
<div>
@@ -423,7 +423,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_release-notes_1.14.0">1.14.0</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/1.14.0/release-notes/release-notes.html#_release-notes_1.14.0">1.14.0</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">19-02-2017</p></td>
<td class="tableblock halign-left valign-top">
<div>
@@ -442,7 +442,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_release-notes_1.13.2.1">1.13.2.1</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/1.13.2.1/release-notes/release-notes.html#_release-notes_1.13.2.1">1.13.2.1</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">03-jan-2017</p></td>
<td class="tableblock halign-left valign-top">
<div>
@@ -461,7 +461,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_release-notes_1.13.2">1.13.2</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/1.13.2/release-notes/release-notes.html#_release-notes_1.13.2">1.13.2</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">14-dec-2016</p></td>
<td class="tableblock halign-left valign-top">
<div>
@@ -480,7 +480,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_release-notes_1.13.1">1.13.1</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/1.13.1/release-notes/release-notes.html#_release-notes_1.13.1">1.13.1</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">30-oct-2016</p></td>
<td class="tableblock halign-left valign-top">
<div>
@@ -499,7 +499,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_release-notes_1.13.0">1.13.0</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/1.13.0/release-notes/release-notes.html#_release-notes_1.13.0">1.13.0</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">11-jul-2016</p></td>
<td class="tableblock halign-left valign-top">
<div>
@@ -518,7 +518,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_release-notes_1.12.2">1.12.2</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/1.12.2/release-notes/release-notes.html#_release-notes_1.12.2">1.12.2</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">06-jun-2016</p></td>
<td class="tableblock halign-left valign-top">
<div>
@@ -537,7 +537,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_release-notes_1.12.1">1.12.1</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/1.12.1/release-notes/release-notes.html#_release-notes_1.12.1">1.12.1</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">12-apr-2016</p></td>
<td class="tableblock halign-left valign-top">
<div>
@@ -556,7 +556,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_release-notes_1.12.0">1.12.0</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/1.12.0/release-notes/release-notes.html#_release-notes_1.12.0">1.12.0</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">29-mar-2016</p></td>
<td class="tableblock halign-left valign-top">
<div>
@@ -575,7 +575,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_release-notes_1.11.1">1.11.1</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/1.11.1/release-notes/release-notes.html#_release-notes_1.11.1">1.11.1</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">17-jan-2016</p></td>
<td class="tableblock halign-left valign-top">
<div>
@@ -594,7 +594,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_release-notes_1.11.0">1.11.0</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/1.11.0/release-notes/release-notes.html#_release-notes_1.11.0">1.11.0</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">02-jan-2016</p></td>
<td class="tableblock halign-left valign-top">
<div>
@@ -613,7 +613,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_release-notes_1.10.0">1.10.0</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/1.10.0/release-notes/release-notes.html#_release-notes_1.10.0">1.10.0</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">10-nov-2015</p></td>
<td class="tableblock halign-left valign-top">
<div>
@@ -632,7 +632,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_release-notes_1.9.0">1.9.0</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/1.9.0/release-notes/release-notes.html#_release-notes_1.9.0">1.9.0</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">1-sep-2015</p></td>
<td class="tableblock halign-left valign-top">
<div>
@@ -651,7 +651,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_release-notes_1.8.0">1.8.0</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/1.8.0/release-notes/release-notes.html#_release-notes_1.8.0">1.8.0</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">24-feb-2015</p></td>
<td class="tableblock halign-left valign-top">
<div>
@@ -673,7 +673,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_release-notes_1.7.0">1.7.0</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/1.7.0/release-notes/release-notes.html#_release-notes_1.7.0">1.7.0</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">18-oct-2014</p></td>
<td class="tableblock halign-left valign-top">
<div>
@@ -697,7 +697,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_release-notes_1.6.0">1.6.0</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/1.6.0/release-notes/release-notes.html#_release-notes_1.6.0">1.6.0</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">28-jul-2014</p></td>
<td class="tableblock halign-left valign-top">
<div>
@@ -721,7 +721,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_release-notes_1.5.0">1.5.0</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/1.5.0/release-notes/release-notes.html#_release-notes_1.5.0">1.5.0</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">08-jun-2014</p></td>
<td class="tableblock halign-left valign-top">
<div>
@@ -748,7 +748,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_release-notes_1.4.1">1.4.1</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/1.4.1/release-notes/release-notes.html#_release-notes_1.4.1">1.4.1</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">14-mar-2014</p></td>
<td class="tableblock halign-left valign-top">
<div>
@@ -772,7 +772,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#r1.4.0">1.4.0</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/1.4.0/release-notes/release-notes.html#_release-notes_1.4.0">1.4.0</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">11-mar-2014</p></td>
<td class="tableblock halign-left valign-top">
<div></div></td>
@@ -796,7 +796,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_release-notes_1.3.1">1.3.1</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/1.3.1/release-notes/release-notes.html#_release-notes_1.3.1">1.3.1</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">7-nov-2013</p></td>
<td class="tableblock halign-left valign-top">
<div>
@@ -819,7 +819,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_release-notes_1.3.0">1.3.0</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/1.3.0/release-notes/release-notes.html#_release-notes_1.3.0">1.3.0</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">25-oct-2013</p></td>
<td class="tableblock halign-left valign-top">
<div>
@@ -847,7 +847,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_release-notes_1.2.0">1.2.0</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/1.2.0/release-notes/release-notes.html#_release-notes_1.2.0">1.2.0</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">30-may-2013</p></td>
<td class="tableblock halign-left valign-top">
<div></div></td>
@@ -870,7 +870,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_release-notes_1.1.0">1.1.0</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/1.1.0/release-notes/release-notes.html#_release-notes_1.1.0">1.1.0</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">31-jan-2013</p></td>
<td class="tableblock halign-left valign-top">
<div></div></td>
@@ -890,7 +890,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#r1.0.1">1.0.1</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/1.0.1/release-notes/release-notes.html#_release-notes_1.0.1">1.0.1</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">10-jan-2013</p></td>
<td class="tableblock halign-left valign-top">
<div>
@@ -912,7 +912,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_release-notes_1.0.0">1.0.0</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/1.0.0/release-notes/release-notes.html#_release-notes_1.0.0">1.0.0</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">24-dec-2012</p></td>
<td class="tableblock halign-left valign-top">
<div>
@@ -1579,7 +1579,7 @@ table.CodeRay td.code>pre{padding:0}
<p>The version of Apache Wicket has also been upgraded from <code>6.x</code> to <code>7.x</code>.</p>
</div>
<div class="paragraph">
- <p>Most applications written against v1.14.x should run against v1.15.0 with few if any changes. That said, we do recommend that you read and keep in mind the <a href="../migration-notes/migration-notes.html#_migration-notes_1.14.0-to-1.15.0">migration notes</a> when you upgrade your app.</p>
+ <p>Most applications written against v1.14.x should run against v1.15.0 with few if any changes. That said, we do recommend that you read and keep in mind the <a href="https://isis.apache.org/versions/1.15.0/migration-notes/migration-notes.html#_migration-notes_1.14.0-to-1.15.0">migration notes</a> when you upgrade your app.</p>
</div>
<div class="admonitionblock note">
<table>
@@ -1770,7 +1770,7 @@ table.CodeRay td.code>pre{padding:0}
<p>The release also has a number of bug fixes.</p>
</div>
<div class="paragraph">
- <p>Most applications written against v1.13.x should run against v1.14.0 with few if any changes. That said, we do recommend that you read and keep in mind the <a href="../migration-notes/migration-notes.html#_migration-notes_1.13.0-to-1.14.0">migration notes</a> when you upgrade your app.</p>
+ <p>Most applications written against v1.13.x should run against v1.14.0 with few if any changes. That said, we do recommend that you read and keep in mind the <a href="https://isis.apache.org/versions/1.14.0/migration-notes/migration-notes.html#_migration-notes_1.13.0-to-1.14.0">migration notes</a> when you upgrade your app.</p>
</div>
<div class="sect2">
<h3 id="_new_feature_7">New Feature</h3>
@@ -2091,19 +2091,19 @@ table.CodeRay td.code>pre{padding:0}
</div>
<div class="sectionbody">
<div class="paragraph">
- <p>Apache Isis 1.13.0 improves and formalizes the support for commands and auditing, and introduces the new concept of an interaction. A command now represents the <em>intention</em> to interact with the application, either to invoke an action or to edit a property. This is captured as a JAXB DTO. An interaction on the other hand captures the fact that a command has been performed. Interactions are also captured as DTOs. Interactions can include sub-interactions, representing the fact that an action can invoke another action by way of the <a href="../guides/rgsvc/rgsvc.html#_rgsvc_application-layer-api_WrapperFactory"><code>WrapperFactory</code></a>.</p>
+ <p>Apache Isis 1.13.0 improves and formalizes the support for commands and auditing, and introduces the new concept of an interaction. A command now represents the <em>intention</em> to interact with the application, either to invoke an action or to edit a property. This is captured as a JAXB DTO. An interaction on the other hand captures the fact that a command has been performed. Interactions are also captured as DTOs. Interactions can include sub-interactions, representing the fact that an action can invoke another action by way of the <a href="https://isis.apache.org/versions/1.13.0/guides/rgsvc/rgsvc.html#_rgsvc_application-layer-api_WrapperFactory"><code>WrapperFactory</code></a>.</p>
</div>
<div class="paragraph">
- <p>The existing <a href="../guides/rgsvc/rgsvc.html#_rgsvc_persistence-layer-spi_AuditingService"><code>AuditingService</code></a> and <a href="../guides/rgsvc/rgsvc.html#_rgsvc_persistence-layer-spi_PublishingService"><code>PublishingService</code></a> SPI services have both been deprecated, instead replaced by <a href="../guides/rgsvc/rgsvc.html#_rgsvc_persistence-layer-spi_AuditerService"><code>AuditerService</code></a> and <a href="../guides/rgsvc/rgsvc.html#_rgsvc_persistence-layer-spi_PublisherService"><code>PublisherService</code></a>. It is now possible to have multiple implementations of each.</p>
+ <p>The existing <a href="https://isis.apache.org/versions/1.13.0/guides/rgsvc/rgsvc.html#_rgsvc_persistence-layer-spi_AuditingService"><code>AuditingService</code></a> and <a href="https://isis.apache.org/versions/1.13.0/guides/rgsvc/rgsvc.html#_rgsvc_persistence-layer-spi_PublishingService"><code>PublishingService</code></a> SPI services have both been deprecated, instead replaced by <a href="https://isis.apache.org/versions/1.13.0/guides/rgsvc/rgsvc.html#_rgsvc_persistence-layer-spi_AuditerService"><code>AuditerService</code></a> and <a href="https://isis.apache.org/versions/1.13.0/guides/rgsvc/rgsvc.html#_rgsvc_persistence-layer-spi_PublisherService"><code>PublisherService</code></a>. It is now possible to have multiple implementations of each.</p>
</div>
<div class="paragraph">
- <p>The (non-ASF) <a href="http://platform.incode.org" target="_blank">Incode Platform</a>'s auditing module has been reworked to implement <a href="../guides/rgsvc/rgsvc.html#_rgsvc_spi_AuditService"><code>AuditService</code></a>, while the new (non-ASF) <a href="http://platform.incode.org" target="_blank">Incode Platform</a>'s publishmq module implements <a href="../guides/rgsvc/rgsvc.html#_rgsvc_persistence-layer-spi_PublisherService"><code>PublisherService</code></a> to publish interaction events to an ActiveMQ bus (and to allow such events to be replayed if necessary).</p>
+ <p>The (non-ASF) <a href="http://platform.incode.org" target="_blank">Incode Platform</a>'s auditing module has been reworked to implement <a href="https://isis.apache.org/versions/1.13.0/guides/rgsvc/rgsvc.html#_rgsvc_spi_AuditService"><code>AuditService</code></a>, while the new (non-ASF) <a href="http://platform.incode.org" target="_blank">Incode Platform</a>'s publishmq module implements <a href="https://isis.apache.org/versions/1.13.0/guides/rgsvc/rgsvc.html#_rgsvc_persistence-layer-spi_PublisherService"><code>PublisherService</code></a> to publish interaction events to an ActiveMQ bus (and to allow such events to be replayed if necessary).</p>
</div>
<div class="paragraph">
<p>The release also includes a great deal of internal refactorings and simplifications.</p>
</div>
<div class="paragraph">
- <p>Most applications written against v1.12.x should run against v1.13.0 with few if any changes. That said, this release has removed a small number of features that were dependent on internal APIs, and some configuration properties are now removed/unsupported. We therefore do recommend that you read and keep in mind the <a href="../migration-notes/migration-notes.html#_migration-notes_1.12.0-to-1.13.0">migration notes</a> when you upgrade your app.</p>
+ <p>Most applications written against v1.12.x should run against v1.13.0 with few if any changes. That said, this release has removed a small number of features that were dependent on internal APIs, and some configuration properties are now removed/unsupported. We therefore do recommend that you read and keep in mind the <a href="https://isis.apache.org/versions/1.13.0/migration-notes/migration-notes.html#_migration-notes_1.12.0-to-1.13.0">migration notes</a> when you upgrade your app.</p>
</div>
<div class="sect2">
<h3 id="_new_feature_11">New Feature</h3>
@@ -2328,21 +2328,21 @@ table.CodeRay td.code>pre{padding:0}
<p>As a result of this change, the support for editing objects has been modified; rather than an 'edit' button which toggles the entire page into edit mode, instead each property is edited individually. The current implementation of this is using a prompt dialog (very similar to the action prompt dialogs; in a future release we hope to support "in-place" edits instead.</p>
</div>
<div class="paragraph">
- <p>Another notable change in this release include various new domain services. Some of these are in support of the file-based layouts functionality, others including new access into Apache Isis' metamodel. (Some of these new services were originally part of the (non-ASF) <a href="http://www.isisaddons.org">Isis Addons</a>). In addition, the <a href="../guides/rgsvc/rgsvc.html#_rgsvc_core-domain-api_DomainObjectContainer"><code>DomainObjectContainer</code></a> service has been deprecated, replaced by a number of fine-grained services (such as <a href="../guides/rgsvc/rgsvc.html#_rgsvc_persistence-layer-api_RepositoryService"><code>RepositoryService</code></a> and <a href="../guides/rgsvc/rgsvc.html#_rgsvc_application-layer-api_MessageService"><code>MessageService</code></a>).</p>
+ <p>Another notable change in this release include various new domain services. Some of these are in support of the file-based layouts functionality, others including new access into Apache Isis' metamodel. (Some of these new services were originally part of the (non-ASF) <a href="http://www.isisaddons.org">Isis Addons</a>). In addition, the <a href="https://isis.apache.org/versions/1.12.0/guides/rgsvc/rgsvc.html#_rgsvc_core-domain-api_DomainObjectContainer"><code>DomainObjectContainer</code></a> service has been deprecated, replaced by a number of fine-grained services (such as <a href="https://isis.apache.org/versions/1.12.0/guides/rgsvc/rgsvc.html#_rgsvc_persistence-layer-api_RepositoryService"><code>RepositoryService</code></a> and <a href="https://isis.apache.org/versions/1.12.0/guides/rgsvc/rgsvc.html#_rgsvc_application-layer-api_MessageService"><code>MessageService</code></a>).</p>
</div>
<div class="paragraph">
- <p>The release also includes a number of new mixins, to automatically surface in the UI an entity’s id, version (if any), and to download the layout XML and rebuild the metamodel for a given domain entity. There is also a mixin to clear any UI hints (part of the file-based layouts functionality). In all cases these mixins can be hidden using either security or by writing a <a href="../guides/rgcms/rgcms.html#_rgcms_classes_super_AbstractSubscriber">subscriber</a> to veto the visibility of the corresponding domain event.</p>
+ <p>The release also includes a number of new mixins, to automatically surface in the UI an entity’s id, version (if any), and to download the layout XML and rebuild the metamodel for a given domain entity. There is also a mixin to clear any UI hints (part of the file-based layouts functionality). In all cases these mixins can be hidden using either security or by writing a <a href="https://isis.apache.org/versions/1.12.0/guides/rgcms/rgcms.html#_rgcms_classes_super_AbstractSubscriber">subscriber</a> to veto the visibility of the corresponding domain event.</p>
</div>
<div class="sect2">
<h3 id="_new_feature_12">New Feature</h3>
<div class="ulist">
<ul>
- <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1351">ISIS-1351</a> - Extend <a href="../guides/rgsvc/rgsvc.html#_rgsvc_core-domain-api_ConfigurationService"><code>ConfigurationService</code></a> to list all configuration properties in the UI</p> </li>
- <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1325">ISIS-1325</a> - New <a href="../guides/rgsvc/rgsvc.html#_rgsvc_application-layer-api_SessionManagementService"><code>SessionManagementService</code></a></p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1351">ISIS-1351</a> - Extend <a href="https://isis.apache.org/versions/1.12.0/guides/rgsvc/rgsvc.html#_rgsvc_core-domain-api_ConfigurationService"><code>ConfigurationService</code></a> to list all configuration properties in the UI</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1325">ISIS-1325</a> - New <a href="https://isis.apache.org/versions/1.12.0/guides/rgsvc/rgsvc.html#_rgsvc_application-layer-api_SessionManagementService"><code>SessionManagementService</code></a></p> </li>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1317">ISIS-1317</a> - Allow single domain object class to be invalidated through a mixin.</p> </li>
- <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1313">ISIS-1313</a> - Enhancement to <a href="../guides/rgmvn/rgmvn.html#_rgmvn_xsd">xsd</a> goal of the isis-maven-plugin to ignore/include the Isis common schemas.</p> </li>
- <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1292">ISIS-1292</a> - Extend <a href="../guides/rgsvc/rgsvc.html#_rgsvc_metadata-api_MetamodelService"><code>MetaModelService</code></a> to surface packages, classes etc (as used by the security module).</p> </li>
- <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-993">ISIS-993</a> - Show different object members on multiple tabs (<a href="../guides/ugvw/ugvw.html#_ugvw_layout_file-based">dynamic XML layouts</a>)</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1313">ISIS-1313</a> - Enhancement to <a href="https://isis.apache.org/versions/1.12.0/guides/rgmvn/rgmvn.html#_rgmvn_xsd">xsd</a> goal of the isis-maven-plugin to ignore/include the Isis common schemas.</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1292">ISIS-1292</a> - Extend <a href="https://isis.apache.org/versions/1.12.0/guides/rgsvc/rgsvc.html#_rgsvc_metadata-api_MetamodelService"><code>MetaModelService</code></a> to surface packages, classes etc (as used by the security module).</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-993">ISIS-993</a> - Show different object members on multiple tabs (<a href="https://isis.apache.org/versions/1.12.0/guides/ugvw/ugvw.html#_ugvw_layout_file-based">dynamic XML layouts</a>)</p> </li>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-784">ISIS-784</a> - Change Wicket viewer to get rid of edit mode, instead allow individual fields to be edited by clicking on them (similar to the way that JIRA works).</p> </li>
</ul>
</div>
@@ -2352,25 +2352,25 @@ table.CodeRay td.code>pre{padding:0}
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1333">ISIS-1333</a> - Remove self-host profile from the archetype</p> </li>
- <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1332">ISIS-1332</a> - Factor out a <a href="../guides/rgsvc/rgsvc.html#_rgsvc_presentation-layer-spi_HintStore"><code>HintStore</code></a> service, so that this is pluggable.</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1332">ISIS-1332</a> - Factor out a <a href="https://isis.apache.org/versions/1.12.0/guides/rgsvc/rgsvc.html#_rgsvc_presentation-layer-spi_HintStore"><code>HintStore</code></a> service, so that this is pluggable.</p> </li>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1330">ISIS-1330</a> - Add CSS classes for table cells and for collections to make it easier to fine tune pages using CSS.</p> </li>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1329">ISIS-1329</a> - Extend hint support for "show all"</p> </li>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1327">ISIS-1327</a> - Change the view mode of the select2 (value drop down) to be a simple text field.</p> </li>
- <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1324">ISIS-1324</a> - Allow multiple different views of same collection in a layout (<a href="../guides/ugvw/ugvw.html#_ugvw_layout_file-based">dynamic XML layouts</a>)</p> </li>
- <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1323">ISIS-1323</a> - Deprecate @CollectionLayout#renderType, since is duplicated by <a href="../guides/rgant/rgant.html#_rgant-CollectionLayout_defaultView"><code>@CollectionLayout#defaultView()</code></a></p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1324">ISIS-1324</a> - Allow multiple different views of same collection in a layout (<a href="https://isis.apache.org/versions/1.12.0/guides/ugvw/ugvw.html#_ugvw_layout_file-based">dynamic XML layouts</a>)</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1323">ISIS-1323</a> - Deprecate @CollectionLayout#renderType, since is duplicated by <a href="https://isis.apache.org/versions/1.12.0/guides/rgant/rgant.html#_rgant-CollectionLayout_defaultView"><code>@CollectionLayout#defaultView()</code></a></p> </li>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1322">ISIS-1322</a> - Mixins not exposing the mixedin object in events (for subscribers to veto).</p> </li>
- <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1321">ISIS-1321</a> - Extend <a href="../guides/rgsvc/rgsvc.html#_rgsvc_metadata-api_MetamodelService"><code>MetaModelService</code></a> to allow CSV of metamodel to be downloaded.</p> </li>
- <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1320">ISIS-1320</a> - Move <a href="../guides/rgsvc/rgsvc.html#_rgsvc_presentation-layer-spi_ContentMappingService"><code>ContentMappingService</code></a> to applib (and simplify)</p> </li>
- <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1312">ISIS-1312</a> - Improve <a href="../guides/rgsvc/rgsvc.html#_rgsvc_integration-api_JaxbService"><code>JaxbServiceDefault#xsd(…)</code></a> to correctly reference the Isis common schema imports.</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1321">ISIS-1321</a> - Extend <a href="https://isis.apache.org/versions/1.12.0/guides/rgsvc/rgsvc.html#_rgsvc_metadata-api_MetamodelService"><code>MetaModelService</code></a> to allow CSV of metamodel to be downloaded.</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1320">ISIS-1320</a> - Move <a href="https://isis.apache.org/versions/1.12.0/guides/rgsvc/rgsvc.html#_rgsvc_presentation-layer-spi_ContentMappingService"><code>ContentMappingService</code></a> to applib (and simplify)</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1312">ISIS-1312</a> - Improve <a href="https://isis.apache.org/versions/1.12.0/guides/rgsvc/rgsvc.html#_rgsvc_integration-api_JaxbService"><code>JaxbServiceDefault#xsd(…)</code></a> to correctly reference the Isis common schema imports.</p> </li>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1300">ISIS-1300</a> - Allow the enablement of the WicketSource plugin to be configurable, and disabled by default</p> </li>
- <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1299">ISIS-1299</a> - <a href="../guides/rgant/rgant.html#_rgant-ViewModel"><code>@ViewModel</code></a> and <a href="../guides/rgant/rgant.html#_rgant-XmlRootElement"><code>@XmlRootElement</code></a> view models should automatically support isCloneable.</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1299">ISIS-1299</a> - <a href="https://isis.apache.org/versions/1.12.0/guides/rgant/rgant.html#_rgant-ViewModel"><code>@ViewModel</code></a> and <a href="https://isis.apache.org/versions/1.12.0/guides/rgant/rgant.html#_rgant-XmlRootElement"><code>@XmlRootElement</code></a> view models should automatically support isCloneable.</p> </li>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1298">ISIS-1298</a> - Fix deprecated annotation use for ViewModel.Cloneable#clone</p> </li>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1295">ISIS-1295</a> - Run integration tests using thread-local, to allow "complete" tests that also exercise, eg Quartz jobs.</p> </li>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1240">ISIS-1240</a> - Derive icon from service when not provided</p> </li>
- <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1239">ISIS-1239</a> - For wicket ui, use a cookie or similar to remember the hint from last time (<a href="../guides/ugvw/ugvw.html#_ugvw_layout_file-based">dynamic XML layouts</a>)</p> </li>
- <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1228">ISIS-1228</a> - Reorganizing/splitting out <a href="../guides/rgant/rgant.html#_rgant-DomainObjectContainer"><code>@DomainObjectContainer</code></a> service.</p> </li>
- <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1048">ISIS-1048</a> - Make view model URLs more secure, eg through a private key (<a href="../guides/rgsvc/rgsvc.html#_rgsvc_presentation-layer-spi_UrlEncodingService"><code>UrlEncodingService</code></a>).</p> </li>
- <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1037">ISIS-1037</a> - Support layout.xml as well as layout.json (<a href="../guides/ugvw/ugvw.html#_ugvw_layout_file-based">dynamic XML layouts</a>)</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1239">ISIS-1239</a> - For wicket ui, use a cookie or similar to remember the hint from last time (<a href="https://isis.apache.org/versions/1.12.0/guides/ugvw/ugvw.html#_ugvw_layout_file-based">dynamic XML layouts</a>)</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1228">ISIS-1228</a> - Reorganizing/splitting out <a href="https://isis.apache.org/versions/1.12.0/guides/rgant/rgant.html#_rgant-DomainObjectContainer"><code>@DomainObjectContainer</code></a> service.</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1048">ISIS-1048</a> - Make view model URLs more secure, eg through a private key (<a href="https://isis.apache.org/versions/1.12.0/guides/rgsvc/rgsvc.html#_rgsvc_presentation-layer-spi_UrlEncodingService"><code>UrlEncodingService</code></a>).</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1037">ISIS-1037</a> - Support layout.xml as well as layout.json (<a href="https://isis.apache.org/versions/1.12.0/guides/ugvw/ugvw.html#_ugvw_layout_file-based">dynamic XML layouts</a>)</p> </li>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-806">ISIS-806</a> - In Wicket viewer, shouldn’t be possible to invoke an action if editing a form.</p> </li>
</ul>
</div>
@@ -2379,7 +2379,7 @@ table.CodeRay td.code>pre{padding:0}
<h3 id="_bug_14">Bug</h3>
<div class="ulist">
<ul>
- <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1348">ISIS-1348</a> - Bug with <a href="../guides/ugtst/ugtst.html#_ugtst_unit-test-support_soap-fake-server-junit-rule">SoapEndpointPublishingRule</a> when multiple endpoints.</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1348">ISIS-1348</a> - Bug with <a href="https://isis.apache.org/versions/1.12.0/guides/ugtst/ugtst.html#_ugtst_unit-test-support_soap-fake-server-junit-rule">SoapEndpointPublishingRule</a> when multiple endpoints.</p> </li>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1347">ISIS-1347</a> - Missing annotation in SimpleObject</p> </li>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1346">ISIS-1346</a> - ActionInvocationContext isn’t populated properly</p> </li>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1342">ISIS-1342</a> - The metamodel validation error page doesn’t reliably render itself if there are errors.</p> </li>
@@ -2387,8 +2387,8 @@ table.CodeRay td.code>pre{padding:0}
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1340">ISIS-1340</a> - Rebuild metamodel mixin action isn’t working reliably</p> </li>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1328">ISIS-1328</a> - Bookmark hints are not being honoured</p> </li>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1319">ISIS-1319</a> - Input dialog for action label for mandatory parameter not shown when the parameter is an view model</p> </li>
- <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1318">ISIS-1318</a> - contributed actions/mixins breaks publishing; also flush any pending actions to be published as the result of doing a wrapped action via the <a href="../guides/rgsvc/rgsvc.html#_rgsvc_application-layer-api_WrapperFactory"><code>WrapperFactory</code></a></p> </li>
- <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1315">ISIS-1315</a> - Can’t generate <a href="../guides/rgmvn/rgmvn.html#_rgmvn_swagger">swagger</a> specs, where actions are contributed.</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1318">ISIS-1318</a> - contributed actions/mixins breaks publishing; also flush any pending actions to be published as the result of doing a wrapped action via the <a href="https://isis.apache.org/versions/1.12.0/guides/rgsvc/rgsvc.html#_rgsvc_application-layer-api_WrapperFactory"><code>WrapperFactory</code></a></p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1315">ISIS-1315</a> - Can’t generate <a href="https://isis.apache.org/versions/1.12.0/guides/rgmvn/rgmvn.html#_rgmvn_swagger">swagger</a> specs, where actions are contributed.</p> </li>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1314">ISIS-1314</a> - Filename parameter label missing for DTO mixins</p> </li>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1311">ISIS-1311</a> - Mixins for Persistable metadata causes exception when rendering.</p> </li>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1310">ISIS-1310</a> - DomainObjectContainer#titleOf(..) does not resolve @Title annotated on private field</p> </li>
@@ -2468,7 +2468,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
<div class="ulist">
<ul>
- <li> <p>the <a href="../guides/ugvro/ugvro.html">Restful Objects viewer</a> now supports simplified representations intended to make it easier to write custom Javascript (and other) clients that consume the REST API; these are obtained using the HTTP Accept header. There is also support for <a href="http://swagger.io">Swagger</a> spec files so that the REST API can be more easily explored and tested.<br></p>
+ <li> <p>the <a href="https://isis.apache.org/versions/1.11.0/guides/ugvro/ugvro.html#">Restful Objects viewer</a> now supports simplified representations intended to make it easier to write custom Javascript (and other) clients that consume the REST API; these are obtained using the HTTP Accept header. There is also support for <a href="http://swagger.io">Swagger</a> spec files so that the REST API can be more easily explored and tested.<br></p>
<div class="paragraph">
<p>In addition, the <code>x-ro-follow-links</code> capability for RO spec representations is now supported.</p>
</div> </li>
@@ -2686,7 +2686,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
<div class="sectionbody">
<div class="paragraph">
- <p>Apache Isis 1.9.0 provides various new "under-the-cover" features, such as <code>AppManifest</code> for simplified bootstrapping, and content negotiation support within <a href="../guides/ugvro/ugvro.html">RestfulObjects viewer</a>. It also updates the DataNucleus version to DN 4.1.x.</p>
+ <p>Apache Isis 1.9.0 provides various new "under-the-cover" features, such as <code>AppManifest</code> for simplified bootstrapping, and content negotiation support within <a href="https://isis.apache.org/versions/1.9.0/guides/ugvro/ugvro.html#">RestfulObjects viewer</a>. It also updates the DataNucleus version to DN 4.1.x.</p>
</div>
<div class="paragraph">
<p>This release was also the first to include the updated Asciidoc website.</p>
[10/39] isis-site git commit: ISIS-1810: updates docs for 2.0.0-M1
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/274edd1d/content/versions/SNAPSHOT/guides/rgmvn/rgmvn.pdf
----------------------------------------------------------------------
diff --git a/content/versions/SNAPSHOT/guides/rgmvn/rgmvn.pdf b/content/versions/SNAPSHOT/guides/rgmvn/rgmvn.pdf
index b943c7b..9e81b20 100644
--- a/content/versions/SNAPSHOT/guides/rgmvn/rgmvn.pdf
+++ b/content/versions/SNAPSHOT/guides/rgmvn/rgmvn.pdf
@@ -4,8 +4,8 @@
<< /Title (Apache Isis Maven plugin)
/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:20180812182509+01'00')
-/ModDate (D:20180812182509+01'00')
+/CreationDate (D:20180814003845+02'00')
+/ModDate (D:20180814003845+02'00')
>>
endobj
2 0 obj
http://git-wip-us.apache.org/repos/asf/isis-site/blob/274edd1d/content/versions/SNAPSHOT/guides/rgsvc/rgsvc.html
----------------------------------------------------------------------
diff --git a/content/versions/SNAPSHOT/guides/rgsvc/rgsvc.html b/content/versions/SNAPSHOT/guides/rgsvc/rgsvc.html
index 46e4eca..0a918f7 100644
--- a/content/versions/SNAPSHOT/guides/rgsvc/rgsvc.html
+++ b/content/versions/SNAPSHOT/guides/rgsvc/rgsvc.html
@@ -405,10 +405,10 @@ table.CodeRay td.code>pre{padding:0}
<p>For objects that are already persisted, the service is automatically injected just after the object is rehydrated by JDO/DataNucleus.</p>
</div>
<div class="paragraph">
- <p>For transient objects (instantiated programmatically), the <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_FactoryService"><code>FactoryService</code></a>'s <code>instantiate()</code> method (or the deprecated <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_DomainObjectContainer"><code>DomainObjectContainer</code></a>'s <code>newTransientInstance()</code> method) will automatically inject the services.</p>
+ <p>For transient objects (instantiated programmatically), the <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_FactoryService"><code>FactoryService#instantiate(…)</code></a> or the <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_RepositoryService"><code>RepositoryService#instantiate(…)</code></a>'s will automatically inject the services.</p>
</div>
<div class="paragraph">
- <p>Alternatively the object can be instantiated simply using <code>new</code>, then services injected using <a href="../rgsvc/rgsvc.html#_rgsvc_metadata-api_ServiceRegistry"><code>ServiceRegistry</code></a>'s <code>injectServicesInto(…)</code> method (or the deprecated <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_DomainObjectContainer"><code>DomainObjectContainer</code></a>'s <code>injectServicesInto(…)</code> method).</p>
+ <p>Alternatively the object can be instantiated simply using <code>new</code>, then services injected using <a href="../rgsvc/rgsvc.html#_rgsvc_metadata-api_ServiceRegistry"><code>ServiceRegistry</code></a>'s <code>injectServicesInto(…)</code> method.</p>
</div>
</div>
<div class="sect2">
@@ -433,7 +433,7 @@ table.CodeRay td.code>pre{padding:0}
</table>
</div>
<div class="paragraph">
- <p>For example, suppose you wanted to provide your own implementation of <a href="../rgsvc/rgsvc.html#_rgsvc_api_LocaleProvider"><code>LocaleProvider</code></a>. Here’s how:</p>
+ <p>For example, suppose you wanted to provide your own implementation of <a href="../rgsvc/rgsvc.html#_rgsvc_presentation-layer-spi_LocaleProvider"><code>LocaleProvider</code></a>. Here’s how:</p>
</div>
<div class="listingblock">
<div class="content">
@@ -1657,11 +1657,17 @@ table.CodeRay td.code>pre{padding:0}
</div>
<div class="ulist">
<ul>
- <li> <p><code>o.a.i.core.metamodel.services.exceprecog.ExceptionRecognizerDocDefault</code> provided by Apache Isis core is itself an <code>ExceptionRecognizer</code>, and will handle <code>ConcurrencyException</code>s. It will also handle any application exceptions raised by the system (subclasses of <code>o.a.i.applib.RecoverableException</code>).</p> </li>
- <li> <p><code>o.a.i.applib.services.exceprecog.jdo.ExceptionRecognizerCompositeForJdoObjectStore</code> bundles up a number of more fine-grained implementations:</p>
+ <li> <p><code>o.a.i.core.metamodel.services.exceprecog.ExceptionRecognizerDocDefault</code> provided by Apache Isis core is itself an <code>ExceptionRecognizer</code>, and will handle <code>ConcurrencyException</code>s.</p>
+ <div class="paragraph">
+ <p>It will also handle any application exceptions raised by the system (subclasses of <code>o.a.i.applib.RecoverableException</code>).</p>
+ </div> </li>
+ <li> <p><code>o.a.i.applib.services.exceprecog.jdo.ExceptionRecognizerCompositeForJdoObjectStore</code></p>
+ <div class="paragraph">
+ <p>which bundles up a number of more fine-grained implementations:</p>
+ </div>
<div class="ulist">
<ul>
- <li> <p><code>ExceptionRecognizerForSQLIntegrityConstraintViolationUniqueOrIndexException</code></p> </li>
+ <li> <p><code>ExceptionRecognizerForSQLIntegrityConstraintViolationUnique OrIndexException</code></p> </li>
<li> <p><code>ExceptionRecognizerForJDOObjectNotFoundException</code></p> </li>
<li> <p><code>ExceptionRecognizerForJDODataStoreException</code></p> </li>
</ul>
@@ -2751,7 +2757,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
<div class="ulist">
<ul>
- <li> <p>first, (though some browsers support longer strings), there is a limit of 2083 characters for URLs. For view model mementos that correspond to large strings (as might occur when serializing a JAXB <a href="../rgant/rgant.html#_rgant-XmlRootElement"><code>@XmlRootElement</code></a>-annotated view model), the service provides a hook. <br></p>
+ <li> <p>first, (though some browsers support longer strings), there is a limit of 2083 characters for URLs. For view model mementos that correspond to large strings (as might occur when serializing a JAXB <a href="../rgant/rgant.html#_rgant-XmlRootElement"><code>@XmlRootElement</code></a>-annotated view model), the service provides a hook.</p>
<div class="paragraph">
<p>For example, each memento string could be mapped to a GUID held in some cluster-aware cache.</p>
</div> </li>
@@ -2759,7 +2765,7 @@ table.CodeRay td.code>pre{padding:0}
</ul>
</div>
<div class="paragraph">
- <p>The framework provides a default implementation of this service, <code>UrlEncodingServiceUsingBaseEncoding</code> (also in the applib) that uses <code>base-64</code> encoding to <code>UTF-8</code> charset.</p>
+ <p>The framework provides a default implementation of this service, <code>UrlEncodingServiceWithCompression</code>, discussed further in the section below.</p>
</div>
<div class="sect3">
<h4 id="_spi_15">4.17.1. SPI</h4>
@@ -2794,7 +2800,7 @@ table.CodeRay td.code>pre{padding:0}
<div class="sect3">
<h4 id="_implementation_13">4.17.2. Implementation</h4>
<div class="paragraph">
- <p>The framework provides a default implementation (<code>UrlEncodingServiceUsingBaseEncoding</code>) that simply converts the string using base-64 encoding and UTF-8 character set. As already noted, be aware that the maximum length of a URL should not exceed 2083 characters. For large view models, there’s the possibility that this limit could be exceeded; in such cases register an alternative implementation of this service.</p>
+ <p>The framework provides a default implementation (<code>UrlEncodingServiceWithCompression</code>) that (also in the applib) that first (gzip) compresses the state and then uses <code>base-64</code> encoding of the resulting bytes. As already noted, be aware that the maximum length of a URL should not exceed 2083 characters. For large view models, there’s the possibility that this limit could be exceeded; in such cases register an alternative implementation of this service.</p>
</div>
<div class="paragraph">
<p>To use an alternative implementation, implement the <code>UrlEncodingService</code> interface and use <a href="../rgant/rgant.html#_rgant-DomainServiceLayout_menuOrder"><code>@DomainServiceLayout#menuOrder()</code></a> (as explained in the <a href="../rgsvc/rgsvc.html#__rgsvc_intro_overriding-the-services">introduction</a> to this guide).</p>
@@ -2992,7 +2998,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>FactoryService-</code><br> <code>Default</code><br> <code>o.a.i.core</code><br> <code>isis-core-metamodel</code></p></td>
- <td class="tableblock halign-left valign-top"><p class="tableblock">Supercedes methods in <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_DomainObjectContainer"><code>DomainObjectContainer</code></a>.</p></td>
+ <td class="tableblock halign-left valign-top"></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="../rgsvc/rgsvc.html#_rgsvc_application-layer-api_SessionManagementService"><code>o.a.i.applib.</code><br> <code>services.sessmgmt</code><br> <code>SessionManagementService</code></a></p></td>
@@ -3014,7 +3020,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>TitleService-</code><br> <code>Default</code><br> <code>o.a.i.core</code><br> <code>isis-core-metamodel</code></p></td>
- <td class="tableblock halign-left valign-top"><p class="tableblock">Supercedes methods in <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_DomainObjectContainer"><code>DomainObjectContainer</code></a>.</p></td>
+ <td class="tableblock halign-left valign-top"></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="../rgsvc/rgsvc.html#_rgsvc_application-layer-api_TransactionService"><code>o.a.i.applib.</code><br> <code>services.xactn</code><br> <code>TransactionService</code></a></p></td>
@@ -3025,7 +3031,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>TransactionService-</code><br> <code>Default</code><br> <code>o.a.i.core</code><br> <code>isis-core-metamodel</code></p></td>
- <td class="tableblock halign-left valign-top"><p class="tableblock">Supercedes methods in <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_DomainObjectContainer"><code>DomainObjectContainer</code></a>.</p></td>
+ <td class="tableblock halign-left valign-top"></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="../rgsvc/rgsvc.html#_rgsvc_application-layer-api_WrapperFactory"><code>o.a.i.applib.</code><br> <code>services.wrapper</code><br> <code>WrapperFactory</code></a></p></td>
@@ -3583,8 +3589,8 @@ org.quartz.plugin.jobInitializer.failOnFileNotFound = true</code></pre>
<div class="ulist">
<ul>
<li> <p>to enable profiling of the running application (which actions are invoked then most often, what is their response time)</p> </li>
- <li> <p>if a <a href="../rgsvc/rgsvc.html#_rgsvc_persistence-layer-spi_PublisherService"><code>PublisherService</code></a> or <a href="../rgsvc/rgsvc.html#_rgsvc_persistence-layer-spi_PublishingService"><code>PublishingService</code></a> (the latter now deprecated) is configured, they provide better traceability as the <code>Command</code> is also correlated with any published events, again through the unique <code>transactionId</code> GUID</p> </li>
- <li> <p>if a <a href="../rgsvc/rgsvc.html#_rgsvc_spi_AuderService"><code>AuditerService</code></a> or <a href="../rgsvc/rgsvc.html#_rgsvc_spi_AuditService"><code>AuditingService</code></a> (the latter now deprecated) is configured, they provide better audit information, since the <code>Command</code> (the 'cause' of an action) can be correlated to the audit records (the "effect" of the action) through the <code>transactionId</code> GUID</p> </li>
+ <li> <p>if a <a href="../rgsvc/rgsvc.html#_rgsvc_persistence-layer-spi_PublisherService"><code>PublisherService</code></a> is configured, they provide better traceability as the <code>Command</code> is also correlated with any published events, again through the unique <code>transactionId</code> GUID</p> </li>
+ <li> <p>if a <a href="../rgsvc/rgsvc.html#_rgsvc_spi_AuderService"><code>AuditerService</code></a> is configured, they provide better audit information, since the <code>Command</code> (the 'cause' of an action) can be correlated to the audit records (the "effect" of the action) through the <code>transactionId</code> GUID</p> </li>
</ul>
</div>
<div class="paragraph">
@@ -3594,7 +3600,7 @@ org.quartz.plugin.jobInitializer.failOnFileNotFound = true</code></pre>
<div class="sect3">
<h4 id="__rgsvc_application-layer-api_CommandContext_screencast">5.2.7. Screencast</h4>
<div class="paragraph">
- <p>The <a href="https://www.youtube.com/watch?v=tqXUZkPB3EI">screencast</a> provides a run-through of the command (profiling) service, auditing service, publishing service. It also shows how commands can be run in the background either explicitly by scheduling through the background service or implicitly by way of a framework annotation.</p>
+ <p>The <a href="https://www.youtube.com/watch?v=tqXUZkPB3EI">screencast</a> provides a run-through of the command (profiling) service, auditing service, publishing service (note: auditing service has since been replaced by <code>AuditerService</code>, and publishing service by <code>PublisherService</code>). It also shows how commands can be run in the background either explicitly by scheduling through the background service or implicitly by way of a framework annotation.</p>
</div>
<div class="admonitionblock note">
<table>
@@ -3850,7 +3856,7 @@ org.quartz.plugin.jobInitializer.failOnFileNotFound = true</code></pre>
<div class="sect3">
<h4 id="_related_services_12">5.2.11. Related Services</h4>
<div class="paragraph">
- <p>The <a href="../rgsvc/rgsvc.html#_rgsvc_application-layer-api_CommandContext"><code>CommandContext</code></a> service is very similar in nature to the <a href="../rgsvc/rgsvc.html#_rgsvc_api_InteactionContext"><code>InteactionContext</code></a>, in that the <code>Command</code> object accessed through it is very similar to the <code>Interaction</code> object obtained from the <code>InteractionContext</code>. The principle distinction is that while <code>Command</code> represents the <em>intention</em> to invoke an action or edit a property, the <code>Interaction</code> (and contained <code>Execution</code>s) represents the actual execution.</p>
+ <p>The <a href="../rgsvc/rgsvc.html#_rgsvc_application-layer-api_CommandContext"><code>CommandContext</code></a> service is very similar in nature to the <a href="../rgsvc/rgsvc.html#_rgsvc_application-layer-api_InteractionContext"><code>InteractionContext</code></a>, in that the <code>Command</code> object accessed through it is very similar to the <code>Interaction</code> object obtained from the <code>InteractionContext</code>. The principle distinction is that while <code>Command</code> represents the <em>intention</em> to invoke an action or edit a property, the <code>Interaction</code> (and contained <code>Execution</code>s) represents the actual execution.</p>
</div>
<div class="paragraph">
<p>Most of the time a <code>Command</code> will be followed directly by its corresponding <code>Interaction</code>. However, if the <code>Command</code> is annotated to run in the background (using <a href="../rgant/rgant.html#_rgant-Action_command"><code>@Action#commandExecuteIn()</code></a>, or is explicitly created through the <a href="../rgsvc/rgsvc.html#_rgsvc_application-layer-api_BackgroundService"><code>BackgroundService</code></a>, then the actual interaction/execution is deferred until some other mechanism invokes the command (eg as described <a href="../ugbtb/ugbtb.html#_ugbtb_headless-access_BackgroundCommandExecution">here</a>). The persistence of background commands requires a configured <a href="../rgsvc/rgsvc.html#_rgsvc_application-layer-spi_BackgroundCommandService"><code>BackgroundCommandService</code></a>) to actually persist such commands for execution.</p>
@@ -3893,7 +3899,7 @@ org.quartz.plugin.jobInitializer.failOnFileNotFound = true</code></pre>
<tbody>
<tr>
<td><i class="conum" data-value="1"></i><b>1</b></td>
- <td>Uses the <a href="../rgsvc/rgsvc.html#_rgsvc_api_BookmarkService"><code>BookmarkService</code></a> to convert the domain object’s internal identifier into a serializable <code>OidDto</code>.</td>
+ <td>Uses the <a href="../rgsvc/rgsvc.html#_rgsvc_integration-api_BookmarkService"><code>BookmarkService</code></a> to convert the domain object’s internal identifier into a serializable <code>OidDto</code>.</td>
</tr>
</tbody>
</table>
@@ -4744,7 +4750,7 @@ org.quartz.plugin.jobInitializer.failOnFileNotFound = true</code></pre>
<span class="keyword">try</span> {
wrappedOrder.refund();
} <span class="keyword">catch</span>(InteractionException ex) { <i class="conum" data-value="1"></i><b>(1)</b>
- container.raiseError(ex.getMessage()); <i class="conum" data-value="2"></i><b>(2)</b>
+ messageService.raiseError(ex.getMessage()); <i class="conum" data-value="2"></i><b>(2)</b>
<span class="keyword">return</span>;
}
}
@@ -4752,7 +4758,7 @@ org.quartz.plugin.jobInitializer.failOnFileNotFound = true</code></pre>
<span class="annotation">@Inject</span>
WrapperFactory wrapperFactory;
<span class="annotation">@Inject</span>
- DomainObjectContainer container;
+ MessageService messageService;
}</code></pre>
</div>
</div>
@@ -5285,18 +5291,7 @@ org.quartz.plugin.jobInitializer.failOnFileNotFound = true</code></pre>
</div>
</div></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>ConfigurationService-</code><br> <code>Default</code><br> <code>o.a.i.core</code><br> <code>isis-core-runtime</code></p></td>
- <td class="tableblock halign-left valign-top"><p class="tableblock">The <code>ConfigurationServiceMenu</code> exposes the <code>allConfigurationProperties</code> action in the user interface.<br> + Supercedes methods in <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_DomainObjectContainer"><code>DomainObjectContainer</code></a>.</p></td>
- </tr>
- <tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_DomainObjectContainer"><code>o.a.i.applib</code><br> <code>DomainObjectContainer</code></a></p></td>
- <td class="tableblock halign-left valign-top">
- <div>
- <div class="paragraph">
- <p>Miscellaneous functions, eg obtain title of object.</p>
- </div>
- </div></td>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><code>DomainObjectContainer-</code><br> <code>Default</code><br> <code>o.a.i.core</code><br> <code>isis-core-metamodel</code></p></td>
- <td class="tableblock halign-left valign-top"></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock">The <code>ConfigurationServiceMenu</code> exposes the <code>allConfigurationProperties</code> action in the user interface.<br></p></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_EventBusService"><code>o.a.i.applib.</code><br> <code>services.eventbus</code><br> <code>EventBusService</code></a></p></td>
@@ -5325,7 +5320,7 @@ org.quartz.plugin.jobInitializer.failOnFileNotFound = true</code></pre>
</div>
</div></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>FactoryService-</code><br> <code>Default</code><br> <code>o.a.i.core</code><br> <code>isis-core-metamodel</code></p></td>
- <td class="tableblock halign-left valign-top"><p class="tableblock">Supercedes methods in <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_DomainObjectContainer"><code>DomainObjectContainer</code></a>.</p></td>
+ <td class="tableblock halign-left valign-top"></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_Scratchpad"><code>o.a.i.applib.</code><br> <code>services.scratchpad</code><br> <code>Scratchpad</code></a></p></td>
@@ -5347,7 +5342,7 @@ org.quartz.plugin.jobInitializer.failOnFileNotFound = true</code></pre>
</div>
</div></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>UserService-</code><br> <code>Default</code><br> <code>o.a.i.core</code><br> <code>isis-core-metamodel</code></p></td>
- <td class="tableblock halign-left valign-top"><p class="tableblock">Supercedes methods in <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_DomainObjectContainer"><code>DomainObjectContainer</code></a>.</p></td>
+ <td class="tableblock halign-left valign-top"></td>
</tr>
</tbody>
</table>
@@ -5415,18 +5410,19 @@ org.quartz.plugin.jobInitializer.failOnFileNotFound = true</code></pre>
<div class="sect3">
<h4 id="_testing_support">7.1.2. Testing Support</h4>
<div class="paragraph">
- <p>The default <code>ClockService</code> implementation in fact simply delegates to another class defined in the API, namely the <code>o.a.i.applib.clock.Clock</code>, an abstract singleton class. It is not recommended that your code use the <code>Clock</code> directly, but you should understand how this all works:</p>
+ <p>The default <code>ClockService</code> implementation in fact simply delegates to another class defined in the API, namely the <code>o.a.i.applib.clock.Clock</code>, an abstract singleton class. It is not recommended that your code use the <code>Clock</code> directly, but it’s worth understanding how this all works.</p>
</div>
- <div class="ulist">
- <ul>
- <li> <p>there are two subclasses implementations <code>Clock</code>, namely <code>SystemClock</code> and <code>FixtureClock</code>.</p> </li>
- <li> <p>the first implementation that is instantiated registers itself as the singleton.</p> </li>
- <li> <p>if running in <a href="../rgcfg/rgcfg.html#_rgcfg_deployment-types">production</a> (server) mode, then (unless another implementation has beaten it to the punch) the framework will instantiate the <code>`SystemClock</code>. Once instantiated this cannot be replaced.</p> </li>
- <li> <p>if running in <a href="../rgcfg/rgcfg.html#<em>rgcfg_deployment-types">prototype</a> mode, then the framework will instead instantiate <code>FixtureClock</code>. This _can be replaced if required.</p> </li>
- </ul>
+ <div class="paragraph">
+ <p>If running in <a href="../rgcfg/rgcfg.html#_rgcfg_deployment-types">production</a> (server) mode, then the framework will (lazily) instantiate the <code>`SystemClock</code> when first required. This is a read-only clock that reads from the system time. The instance registers itself as the singleton and cannot be replaced.</p>
+ </div>
+ <div class="paragraph">
+ <p>If running in <a href="../rgcfg/rgcfg.html#_rgcfg_deployment-types">prototype</a> mode, though, then the framework will instead instantiate <code>FixtureClock</code>. This is a read-write clock that will behave as the system clock, unless it is explicitly set using eg, <code>FixtureClock#setDate(…)</code> or <code>FixtureClock#setTime(…)</code> etc.</p>
</div>
<div class="paragraph">
- <p>The <code>FixtureClock</code> will behave as the system clock, unless its is explicitly set using <code>FixtureClock#setDate(…)</code> or <code>FixtureClock#setTime(…)</code> and so forth.</p>
+ <p>Moreover, <code>FixtureClock</code> singleton can be replaced with another implementation. And, it is sometimes useful to replace it using <code>TickingFixtureClock</code>, a subclass that is very similar to <code>FixtureClock</code> (in that the time can be changed) but which will continue to tick once set.</p>
+ </div>
+ <div class="paragraph">
+ <p>To use <code>TickingFixtureClock</code> instead of <code>FixtureClock</code>, use the <code>TickingClockFixture</code> fixture script.</p>
</div>
<div class="sect4">
<h5 id="_alternative_implementations_4">Alternative Implementations</h5>
@@ -5597,183 +5593,7 @@ org.quartz.plugin.jobInitializer.failOnFileNotFound = true</code></pre>
</div>
</div>
<div class="sect2">
- <h3 id="_rgsvc_core-domain-api_DomainObjectContainer">7.3. <code>DomainObjectContainer</code></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="https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_core-domain-api_DomainObjectContainer.adoc""><i class="fa fa-pencil-square-o"></i> 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/rgsvc/_rgsvc_core-domain-api_DomainObjectContainer.adoc" target="_blank"><i class="fa fa-pencil-square-o fa-fw" aria-hidden="true"></i> Edit</a></li>
- <li><a href="https://github.com/apache/isis/commits/master/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_core-domain-api_DomainObjectContainer.adoc" target="_blank"><i class="fa fa-clock-o fa-fw" aria-hidden="true"></i> History</a></li>
- <li><a href="https://github.com/apache/isis/raw/master/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_core-domain-api_DomainObjectContainer.adoc" target="_blank"><i class="fa fa-file-text-o fa-fw" aria-hidden="true"></i> Raw</a></li>
- <li><a href="https://github.com/apache/isis/blame/master/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_core-domain-api_DomainObjectContainer.adoc" target="_blank"><i class="fa fa-hand-o-right fa-fw" aria-hidden="true"></i> Blame</a></li>
- </ul>
- </div>
- <div class="paragraph">
- <p>The <code>DomainObjectContainer</code> service provides a set of general purpose functionality for domain objects to call. Principal amongst these are a generic APIs for querying objects and creating and persisting objects. In addition, the service provides access to security context (the "current user"), allows information and warning messages to be raised, and various other miscellaneous functions.</p>
- </div>
- <div class="admonitionblock note">
- <table>
- <tbody>
- <tr>
- <td class="icon"> <i class="fa icon-note" title="Note"></i> </td>
- <td class="content">
- <div class="paragraph">
- <p>(Almost all of) the methods in this service have been moved out into a number of more fine-grained services: <a href="../rgsvc/rgsvc.html#_rgsvc_persistence-layer-api_RepositoryService"><code>RepositoryService</code></a>, <a href="../rgsvc/rgsvc.html#_rgsvc_application-layer-api_MessageService"><code>MessageService</code></a>, <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_FactoryService"><code>FactoryService</code></a>, <a href="../rgsvc/rgsvc.html#_rgsvc_application-layer-api_TitleService"><code>TitleService</code></a>, <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_ConfigurationService"><code>ConfigurationService</code></a>, <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_UserService"><code>UserService</code></a> and <a href="../rgsvc/rgsvc.html#_rgsvc_metadata-api_ServiceRegistry"><code>ServiceRegistry</code></a>.</p>
- </div> </td>
- </tr>
- </tbody>
- </table>
- </div>
- <div class="sect3">
- <h4 id="_apis">7.3.1. APIs</h4>
- <div class="paragraph">
- <p>The sections below discuss the functions provided by the service, broken out into categories.</p>
- </div>
- <div class="sect4">
- <h5 id="_rgsvc_core-domain-api_DomainObjectContainer_object-creation-api">Object Creation API</h5>
- <div class="paragraph">
- <p>The (deprecated) object creation APIs is used to instantiate a view model, specifying its memento.</p>
- </div>
- <div class="listingblock">
- <div class="content">
- <pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">interface</span> <span class="class">DomainObjectContainer</span> {
-
- <T> T newViewModelInstance(<span class="directive">final</span> <span class="predefined-type">Class</span><T> ofType, <span class="directive">final</span> <span class="predefined-type">String</span> memento); <i class="conum" data-value="1"></i><b>(1)</b>
- ...
-}</code></pre>
- </div>
- </div>
- <div class="colist arabic">
- <table>
- <tbody>
- <tr>
- <td><i class="conum" data-value="1"></i><b>1</b></td>
- <td>create a new view model, with the specified memento (as per <a href="../rgcms/rgcms.html#_rgcms_classes_super_AbstractViewModel">ViewModel#viewModelMemento()</a>.</td>
- </tr>
- </tbody>
- </table>
- </div>
- <div class="admonitionblock tip">
- <table>
- <tbody>
- <tr>
- <td class="icon"> <i class="fa icon-tip" title="Tip"></i> </td>
- <td class="content">
- <div class="paragraph">
- <p>In general it is easier to just annotate with <a href="../rgant/rgant.html#_rgant-ViewModel"><code>@ViewModel</code></a>, or as a JAXB view model, and let Apache Isis manage the memento automatically.</p>
- </div> </td>
- </tr>
- </tbody>
- </table>
- </div>
- </div>
- <div class="sect4">
- <h5 id="_rgsvc_core-domain-api_DomainObjectContainer_object-persistence-api">Object Persistence API</h5>
- <div class="paragraph">
- <p>The (deprecated) persistence API is used to persist newly created objects (as per <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_DomainObjectContainer_object-creation-api"><code>#newTransientInstance(…)</code></a>, above and to delete (remove) objects that are persistent.</p>
- </div>
- <div class="admonitionblock tip">
- <table>
- <tbody>
- <tr>
- <td class="icon"> <i class="fa icon-tip" title="Tip"></i> </td>
- <td class="content">
- <div class="paragraph">
- <p>Instead, use <a href="#_rgsvc_persistence-layer-api_RepositoryService"><code>RepositoryService</code></a> API.</p>
- </div> </td>
- </tr>
- </tbody>
- </table>
- </div>
- <div class="paragraph">
- <p>Note that there is no API for updating existing objects; the framework (or rather, JDO/DataNucleus) performs object dirty tracking and so any objects that are modified in the course of a request will be automatically updated).</p>
- </div>
- <div class="listingblock">
- <div class="content">
- <pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">interface</span> <span class="class">DomainObjectContainer</span> {
-
- <span class="type">boolean</span> isViewModel(<span class="predefined-type">Object</span> domainObject); <i class="conum" data-value="1"></i><b>(1)</b>
- <span class="type">void</span> persist(<span class="predefined-type">Object</span> domainObject); <i class="conum" data-value="2"></i><b>(2)</b>
- <span class="type">void</span> remove(<span class="predefined-type">Object</span> persistentDomainObject); <i class="conum" data-value="3"></i><b>(3)</b>
-
- ...
-}</code></pre>
- </div>
- </div>
- <div class="colist arabic">
- <table>
- <tbody>
- <tr>
- <td><i class="conum" data-value="1"></i><b>1</b></td>
- <td>test whether a particular domain object is a view model or not. Note that this includes any domain objects annotated with <a href="../rgant/rgant.html#_rgant-DomainObject_nature"><code>@DomainObject#nature=Nature.EXTERNAL_ENTITY)</code></a> or <a href="../rgant/rgant.html#_rgant-DomainObject_nature"><code>@DomainObject#nature=Nature.INMEMORY_ENTITY</code></a></td>
- </tr>
- <tr>
- <td><i class="conum" data-value="2"></i><b>2</b></td>
- <td>persist a transient object. Note though that this will throw an exception if the object is already persistent; this can happen if JDO/DataNucleus’s <a href="http://www.datanucleus.org/products/accessplatform_4_0/jdo/orm/cascading.html">persistence-by-reachability</a> is in effect. For this reason it is generally better to use <a href="#_rgsvc_persistence-layer-api_RepositoryService"><code>RepositoryService#persist()</code></a>, which is a no-op if the object is persistent.</td>
- </tr>
- <tr>
- <td><i class="conum" data-value="3"></i><b>3</b></td>
- <td>remove (ie DELETE) a persistent object. However, the object must be persistent already, otherwise an exception will be thrown. It is generally therefore better to use use <a href="#_rgsvc_persistence-layer-api_RepositoryService"><code>RepositoryService#remove()</code></a>, which is a no-op if the object is not persistent.</td>
- </tr>
- </tbody>
- </table>
- </div>
- <div class="paragraph">
- <p>For example:</p>
- </div>
- <div class="listingblock">
- <div class="content">
- <pre class="CodeRay highlight"><code data-lang="java">Customer cust = container.newTransientInstance(Customer.class);
-cust.setFirstName(<span class="string"><span class="delimiter">"</span><span class="content">Freddie</span><span class="delimiter">"</span></span>);
-cust.setLastName(<span class="string"><span class="delimiter">"</span><span class="content">Mercury</span><span class="delimiter">"</span></span>);
-container.persistIfNotAlready(cust);</code></pre>
- </div>
- </div>
- <div class="paragraph">
- <p>You should be aware that by default Apache Isis queues up calls to <code>#persist()</code> and <code>#remove()</code>. These are then executed either when the request completes (and the transaction commits), or if the queue is flushed. This can be done either implicitly by the framework, or as the result of a direct call to <code>TransactionService#flushTransaction()</code>.</p>
- </div>
- </div>
- <div class="sect4">
- <h5 id="_rgsvc_core-domain-api_DomainObjectContainer_validation-api">Validation API</h5>
- <div class="paragraph">
- <p>The intent of this API is to provide a mechanism where an object can programmatically check the state any class invariants. Specifically, this means the validating the current state of all properties, as well as any object-level validation defined by <a href="../rgcms/rgcms.html#_rgcms_methods_reserved_validate"><code>validate()</code></a>.</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>These methods have been deprecated; this feature should be considered experimental and your mileage may vary.</p>
- </div> </td>
- </tr>
- </tbody>
- </table>
- </div>
- <div class="paragraph">
- <p>The API provided is:</p>
- </div>
- <div class="listingblock">
- <div class="content">
- <pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">interface</span> <span class="class">DomainObjectContainer</span> {
- <span class="type">boolean</span> isValid(<span class="predefined-type">Object</span> domainObject);
- <span class="predefined-type">String</span> validate(<span class="predefined-type">Object</span> domainObject);
- ...
-}</code></pre>
- </div>
- </div>
- </div>
- </div>
- <div class="sect3">
- <h4 id="_implementation_22">7.3.2. Implementation</h4>
- <div class="paragraph">
- <p>The core framework provides a default implementation of this service (<code>o.a.i.core.metamodel.services.container.DomainObjectContainerDefault</code>).</p>
- </div>
- </div>
- </div>
- <div class="sect2">
- <h3 id="_rgsvc_core-domain-api_EventBusService">7.4. <code>EventBusService</code></h3>
+ <h3 id="_rgsvc_core-domain-api_EventBusService">7.3. <code>EventBusService</code></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="https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_core-domain-api_EventBusService.adoc""><i class="fa fa-pencil-square-o"></i> 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>
@@ -5809,7 +5629,7 @@ container.persistIfNotAlready(cust);</code></pre>
<p>Two implementations are available, using either <a href="https://code.google.com/p/guava-libraries/">Guava</a>'s <a href="https://code.google.com/p/guava-libraries/wiki/EventBusExplained"><code>EventBus</code></a>, or alternatively using the <a href="http://www.axonframework.org/">AxonFramework</a>'s <a href="http://www.axonframework.org/docs/2.4/single.html#d5e1489">SimpleEventBus</a>. It is also possible to plug in a custom implementation.</p>
</div>
<div class="sect3">
- <h4 id="__rgsvc_core-domain-api_EventBusService_api-and-implementation">7.4.1. API</h4>
+ <h4 id="__rgsvc_core-domain-api_EventBusService_api-and-implementation">7.3.1. API</h4>
<div class="paragraph">
<p>The API defined by <code>EventBusService</code> is:</p>
</div>
@@ -5848,7 +5668,7 @@ container.persistIfNotAlready(cust);</code></pre>
</div>
</div>
<div class="sect3">
- <h4 id="_registering_subscribers">7.4.2. Registering Subscribers</h4>
+ <h4 id="_registering_subscribers">7.3.2. Registering Subscribers</h4>
<div class="paragraph">
<p>The <code>register()</code> method should be called in the <a href="../rgant/rgant.html#_rgant-PostConstruct"><code>@PostConstruct</code></a> lifecycle method. It is valid and probably the least confusing to readers to also "unregister" in the <a href="../rgant/rgant.html#_rgant-PreDestroy"><code>@PreDestroy</code></a> lifecycle method (though as noted <a href="../rgsvc/rgsvc.html#__rgsvc_core-domain-api_EventBusService_api-and-implementation">above</a>, unregistering is actually a no-op).</p>
</div>
@@ -5914,7 +5734,7 @@ container.persistIfNotAlready(cust);</code></pre>
</div>
</div>
<div class="sect3">
- <h4 id="_annotating_members">7.4.3. Annotating Members</h4>
+ <h4 id="_annotating_members">7.3.3. Annotating Members</h4>
<div class="paragraph">
<p>As discussed in the introduction, the framework will automatically emit domain events for all of the object members (actions, properties or collections) of an object whenever that object is rendered or (more generally) interacted with.</p>
</div>
@@ -6007,7 +5827,7 @@ container.persistIfNotAlready(cust);</code></pre>
</div>
</div>
<div class="sect3">
- <h4 id="__rgsvc_core-domain-api_EventBusService_event-hierarchy">7.4.4. Event hierarchy</h4>
+ <h4 id="__rgsvc_core-domain-api_EventBusService_event-hierarchy">7.3.4. Event hierarchy</h4>
<div class="paragraph">
<p>By creating domain event subtypes we can be more semantically precise and in turn providesmore flexibility for subscribers: they can choose whether to be broadly applicable (by subscribing to a superclass) or to be tightly focussed (by subscribing to a subclass).</p>
</div>
@@ -6124,7 +5944,7 @@ public <span class="directive">static</span> <span class="type">class</span> <sp
</div>
</div>
<div class="sect3">
- <h4 id="_programmatic_posting">7.4.5. Programmatic posting</h4>
+ <h4 id="_programmatic_posting">7.3.5. Programmatic posting</h4>
<div class="paragraph">
<p>To programmatically post an event, simply call <code>#post()</code>.</p>
</div>
@@ -6158,7 +5978,7 @@ public <span class="directive">static</span> <span class="type">class</span> <sp
</div>
</div>
<div class="sect3">
- <h4 id="_using_code_wrapperfactory_code">7.4.6. Using <code>WrapperFactory</code></h4>
+ <h4 id="_using_code_wrapperfactory_code">7.3.6. Using <code>WrapperFactory</code></h4>
<div class="paragraph">
<p>An alternative way to cause events to be posted is through the <a href="../rgsvc/rgsvc.html#_rgsvc_application-layer-api_WrapperFactory"><code>WrapperFactory</code></a>. This is useful when you wish to enforce a (lack-of-) trust boundary between the caller and the callee.</p>
</div>
@@ -6188,7 +6008,7 @@ public <span class="directive">static</span> <span class="type">class</span> <sp
</div>
</div>
<div class="sect3">
- <h4 id="__rgsvc_core-domain-api_EventBusService_Configuration">7.4.7. Implementation</h4>
+ <h4 id="__rgsvc_core-domain-api_EventBusService_Configuration">7.3.7. Implementation</h4>
<div class="paragraph">
<p>The framework provides a default implementation of the service, <code>o.a.i.objectstore.jdo.datanucleus.service.eventbus.EventBusServiceJdo</code>.</p>
</div>
@@ -6303,7 +6123,7 @@ public <span class="directive">static</span> <span class="type">class</span> <sp
</div>
</div>
<div class="sect3">
- <h4 id="_related_services_16">7.4.8. Related Services</h4>
+ <h4 id="_related_services_16">7.3.8. Related Services</h4>
<div class="paragraph">
<p>The <code>EventBusService</code> is intended for fine-grained publish/subscribe for object-to-object interactions within an Apache Isis domain object model. The event propagation is strictly in-memory, and there are no restrictions on the object acting as the event (it need not be serializable, for example).</p>
</div>
@@ -6313,7 +6133,7 @@ public <span class="directive">static</span> <span class="type">class</span> <sp
</div>
</div>
<div class="sect2">
- <h3 id="_rgsvc_core-domain-api_FactoryService">7.5. <code>FactoryService</code></h3>
+ <h3 id="_rgsvc_core-domain-api_FactoryService">7.4. <code>FactoryService</code></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="https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_core-domain-api_FactoryService.adoc""><i class="fa fa-pencil-square-o"></i> 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>
@@ -6328,7 +6148,7 @@ public <span class="directive">static</span> <span class="type">class</span> <sp
<p>The <code>FactoryService</code> collects together methods for instantiating domain objects.</p>
</div>
<div class="sect3">
- <h4 id="_api_5">7.5.1. API</h4>
+ <h4 id="_api_5">7.4.1. API</h4>
<div class="paragraph">
<p>The API of <code>FactoryService</code> is:</p>
</div>
@@ -6368,7 +6188,7 @@ public <span class="directive">static</span> <span class="type">class</span> <sp
</div>
</div>
<div class="sect3">
- <h4 id="_usage_9">7.5.2. Usage</h4>
+ <h4 id="_usage_9">7.4.2. Usage</h4>
<div class="paragraph">
<p>For example:</p>
</div>
@@ -6382,13 +6202,13 @@ repositoryService.persist(cust);</code></pre>
</div>
</div>
<div class="sect3">
- <h4 id="_implementation_23">7.5.3. Implementation</h4>
+ <h4 id="_implementation_22">7.4.3. Implementation</h4>
<div class="paragraph">
<p>The core framework provides a default implementation of this service (<code>o.a.i.core.metamodel.services.factory.FactoryServiceDefault</code>).</p>
</div>
</div>
<div class="sect3">
- <h4 id="_related_services_17">7.5.4. Related Services</h4>
+ <h4 id="_related_services_17">7.4.4. Related Services</h4>
<div class="paragraph">
<p>The <a href="../rgsvc/rgsvc.html#_rgsvc_persistence-layer-api_RepositoryService"><code>RepositoryService</code></a> is often used in conjunction with the <code>FactoryService</code>, to persist domain objects after they have been instantiated and populated.</p>
</div>
@@ -6398,7 +6218,7 @@ repositoryService.persist(cust);</code></pre>
</div>
</div>
<div class="sect2">
- <h3 id="_rgsvc_core-domain-api_Scratchpad">7.6. <code>Scratchpad</code></h3>
+ <h3 id="_rgsvc_core-domain-api_Scratchpad">7.5. <code>Scratchpad</code></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="https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_core-domain-api_Scratchpad.adoc""><i class="fa fa-pencil-square-o"></i> 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>
@@ -6413,7 +6233,7 @@ repositoryService.persist(cust);</code></pre>
<p>The <code>Scratchpad</code> (request-scoped) domain service allows objects to exchange information even if they do not directly call each other.</p>
</div>
<div class="sect3">
- <h4 id="_api_implementation_10">7.6.1. API & Implementation</h4>
+ <h4 id="_api_implementation_10">7.5.1. API & Implementation</h4>
<div class="paragraph">
<p>The API of <code>Scratchpad</code> service is:</p>
</div>
@@ -6438,7 +6258,7 @@ repositoryService.persist(cust);</code></pre>
</div>
</div>
<div class="sect3">
- <h4 id="_usage_10">7.6.2. Usage</h4>
+ <h4 id="_usage_10">7.5.2. Usage</h4>
<div class="paragraph">
<p>The most common use-case is for <a href="../rgant/rgant.html#_rgant-Action_invokeOn">bulk</a> actions that act upon multiple objects in a list. The (same) <code>Scratchpad</code> service is injected into each of these objects, and so they can use pass information.</p>
</div>
@@ -6532,17 +6352,14 @@ Scratchpad scratchpad;</code></pre>
</div>
</div>
<div class="sect3">
- <h4 id="_related_services_18">7.6.3. Related Services</h4>
- <div class="paragraph">
- <p>The <a href="../rgsvc/rgsvc.html#_rgsvc_api_ActionInteractionContext"><code>ActionInteractionContext</code></a> service allows <a href="../rgant/rgant.html#_rgant-Action_invokeOn">bulk actions</a> to co-ordinate with each other.</p>
- </div>
+ <h4 id="_related_services_18">7.5.3. Related Services</h4>
<div class="paragraph">
<p>The <a href="../rgsvc/rgsvc.html#_rgsvc_persistence-layer-api_QueryResultsCache"><code>QueryResultsCache</code></a> is useful for caching the results of expensive method calls.</p>
</div>
</div>
</div>
<div class="sect2">
- <h3 id="_rgsvc_core-domain-api_UserService">7.7. <code>UserService</code></h3>
+ <h3 id="_rgsvc_core-domain-api_UserService">7.6. <code>UserService</code></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="https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_core-domain-api_UserService.adoc""><i class="fa fa-pencil-square-o"></i> 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>
@@ -6560,7 +6377,7 @@ Scratchpad scratchpad;</code></pre>
<p>If <a href="../rgsvc/rgsvc.html#_rgsvc_testing_SudoService"><code>SudoService</code></a> has been used to temporarily override the user and/or roles, then this service will report the overridden values instead.</p>
</div>
<div class="sect3">
- <h4 id="_api_and_usage_4">7.7.1. API and Usage</h4>
+ <h4 id="_api_and_usage_4">7.6.1. API and Usage</h4>
<div class="paragraph">
<p>The API of <code>UserService</code> is:</p>
</div>
@@ -6607,7 +6424,7 @@ Scratchpad scratchpad;</code></pre>
</div>
</div>
<div class="sect3">
- <h4 id="_implementation_24">7.7.2. Implementation</h4>
+ <h4 id="_implementation_23">7.6.2. Implementation</h4>
<div class="paragraph">
<p>The core framework provides a default implementation of this service (<code>o.a.i.core.runtime.services.user.UserServiceDefault</code>).</p>
</div>
@@ -6864,7 +6681,7 @@ Scratchpad scratchpad;</code></pre>
<div class="sect3">
<h4 id="_usage_by_other_services">8.1.3. Usage by other services</h4>
<div class="paragraph">
- <p>Bookmarks are used by the (non-ASF) <a href="http://platform.incode.org" target="_blank">Incode Platform</a>'s command module’s implementation of <a href="../rgsvc/rgsvc.html#_rgsvc_api_BackgroundCommandService"><code>BackgroundCommandService</code></a>, which uses a bookmark to capture the target object on which an action will be invoked subsequently.</p>
+ <p>Bookmarks are used by the (non-ASF) <a href="http://platform.incode.org" target="_blank">Incode Platform</a>'s command module’s implementation of <a href="../rgsvc/rgsvc.html#_rgsvc_application-layer-spi_BackgroundCommandService"><code>BackgroundCommandService</code></a>, which uses a bookmark to capture the target object on which an action will be invoked subsequently.</p>
</div>
<div class="paragraph">
<p>Bookmarks are also used by the (non-ASF) <a href="http://platform.incode.org" target="_blank">Incode Platform</a>'s auditing module’s implementation of <a href="../rgsvc/rgsvc.html#_rgsvc_persistence-layer-spi_AuditerService"><code>AuditerService</code></a>.</p>
@@ -6930,7 +6747,7 @@ Scratchpad scratchpad;</code></pre>
</div>
</div>
<div class="sect3">
- <h4 id="_implementation_25">8.2.2. Implementation</h4>
+ <h4 id="_implementation_24">8.2.2. Implementation</h4>
<div class="paragraph">
<p>As noted in the introduction, the core framework provides a default implementation, <code>EmailServiceDefault</code>. This sends email as an HTML message, using an external SMTP provider.</p>
</div>
@@ -7312,7 +7129,7 @@ Scratchpad scratchpad;</code></pre>
<p>With respect to the <code>IsisSchemas</code> enum: a JAXB-annotated domain object will live in its own XSD namespace and may reference multiple other XSD schemas. In particular, many JAXB domain objects will reference the <a href="../rgcms/rgcms.html#_rgcms_schema">common Isis schemas</a> (for example the <code>OidDto</code> class that represents a reference to a persistent entity). The enum indicates whether these schemas should be included or excluded from the map.</p>
</div>
<div class="paragraph">
- <p>Isis provides a default implementation of the service, <code>o.a.i.applib.services.jaxb.JaxbServiceDefault</code>.</p>
+ <p>Apache Isis provides a default implementation of the service, <code>o.a.i.applib.services.jaxb.JaxbServiceDefault</code>.</p>
</div>
<div class="paragraph">
<p>To use an alternative implementation, implement <code>JaxbService</code> interface and use <a href="../rgant/rgant.html#_rgant-DomainServiceLayout_menuOrder"><code>@DomainServiceLayout#menuOrder()</code></a> (as explained in the <a href="../rgsvc/rgsvc.html#__rgsvc_intro_overriding-the-services">introduction</a> to this guide).</p>
@@ -7717,7 +7534,7 @@ Element customerXsd = snapshot.getXsdElement();</code></pre>
</div>
</div>
<div class="sect3">
- <h4 id="_implementation_26">8.5.5. Implementation</h4>
+ <h4 id="_implementation_25">8.5.5. Implementation</h4>
<div class="paragraph">
<p>The core framework provides an implementation of this service (<code>o.a.i.core.runtime.services.xmlsnapshot.XmlSnapshotServiceDefault</code>).</p>
</div>
@@ -7817,7 +7634,7 @@ Element customerXsd = snapshot.getXsdElement();</code></pre>
</div>
</div></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>ServiceRegistry-</code><br> <code>Default</code><br> <code>o.a.i.core</code><br> <code>isis-core-metamodel</code></p></td>
- <td class="tableblock halign-left valign-top"><p class="tableblock">Supercedes methods in <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_DomainObjectContainer"><code>DomainObjectContainer</code></a>.</p></td>
+ <td class="tableblock halign-left valign-top"></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="../rgsvc/rgsvc.html#_rgsvc_metadata-api_SwaggerService"><code>o.a.i.applib.</code><br> <code>services.swagger</code><br> <code>SwaggerService</code></a></p></td>
@@ -7904,7 +7721,7 @@ Element customerXsd = snapshot.getXsdElement();</code></pre>
</div>
</div>
<div class="sect3">
- <h4 id="_implementation_27">9.1.2. Implementation</h4>
+ <h4 id="_implementation_26">9.1.2. Implementation</h4>
<div class="paragraph">
<p>The default implementation of this service is <code>ApplicationFeatureRepositoryDefault</code>.</p>
</div>
@@ -8296,7 +8113,7 @@ repositoryService.persist(cust);</code></pre>
</div>
</div>
<div class="sect3">
- <h4 id="_implementation_28">9.4.3. Implementation</h4>
+ <h4 id="_implementation_27">9.4.3. Implementation</h4>
<div class="paragraph">
<p>The core framework provides a default implementation of this service (<code>o.a.i.core.runtime.services.registry.ServiceRegistryDefault</code>).</p>
</div>
@@ -8378,7 +8195,7 @@ repositoryService.persist(cust);</code></pre>
</div>
</div>
<div class="sect3">
- <h4 id="_implementation_29">9.5.2. Implementation</h4>
+ <h4 id="_implementation_28">9.5.2. Implementation</h4>
<div class="paragraph">
<p>Isis provides a default implementation of the service, <code>o.a.i.core.metamodel.services.swagger.SwaggerServiceDefault</code>.</p>
</div>
@@ -8565,7 +8382,7 @@ repositoryService.persist(cust);</code></pre>
</ul>
</div>
<div class="paragraph">
- <p>The <code>FixtureScripts</code> service provides the ability to execute <a href="../ugtst/ugtst.html#_ugtst_fixture-scripts_api-and-usage">fixture scripts</a> .</p>
+ <p>The <code>FixtureScripts</code> service provides the ability to execute <a href="../ugtst/ugtst.html#_ugtst_fixture-scripts_api-and-usage">fixture scripts</a>.</p>
</div>
<div class="paragraph">
<p>The default implementation of this service, <code>FixtureScriptsDefault</code>, uses the associated <a href="../rgsvc/rgsvc.html#_rgsvc_testing_FixtureScriptsSpecificationProvider"><code>FixtureScriptsSpecificationProvider</code></a> to obtain a <code>FixtureScriptsSpecification</code>. This configures this service, for example telling it which package to search for <code>FixtureScript</code> classes, how to execute those classes, and hints that influence the UI.</p>
@@ -8587,7 +8404,7 @@ repositoryService.persist(cust);</code></pre>
</div>
</div>
<div class="sect3">
- <h4 id="_implementation_30">10.2.2. Implementation</h4>
+ <h4 id="_implementation_29">10.2.2. Implementation</h4>
<div class="paragraph">
<p>The default implementation is <code>o.a.i.applib.services.fixturespec.FixtureScriptsDefault</code></p>
</div>
@@ -8707,7 +8524,7 @@ repositoryService.persist(cust);</code></pre>
</div>
</div>
<div class="sect3">
- <h4 id="_implementation_31">10.3.2. Implementation</h4>
+ <h4 id="_implementation_30">10.3.2. Implementation</h4>
<div class="paragraph">
<p>The <a href="../ugfun/ugfun.html#_ugfun_getting-started_simpleapp-archetype">SimpleApp archetype</a> has a simple implementation of this service:</p>
</div>
@@ -8785,7 +8602,7 @@ repositoryService.persist(cust);</code></pre>
</div>
</div>
<div class="sect3">
- <h4 id="_implementation_32">10.4.2. Implementation</h4>
+ <h4 id="_implementation_31">10.4.2. Implementation</h4>
<div class="paragraph">
<p>The core framework provides a default implementation of this service (<code>o.a.i.core.runtime.services.sudo.SudoServiceDefault</code>).</p>
</div>
@@ -8939,7 +8756,7 @@ repositoryService.persist(cust);</code></pre>
</div>
</div>
<div class="sect3">
- <h4 id="_implementation_33">10.5.2. Implementation</h4>
+ <h4 id="_implementation_32">10.5.2. Implementation</h4>
<div class="paragraph">
<p>The framework provides a default implementation of this service: <code>SwitchUserServiceImpl</code> in <code>isis-core-runtime</code></p>
</div>
@@ -9027,7 +8844,7 @@ repositoryService.persist(cust);</code></pre>
</div>
</div></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>RepositoryService-</code><br> <code>Default</code><br> <code>o.a.i.core</code><br> <code>isis-core-metamodel</code></p></td>
- <td class="tableblock halign-left valign-top"><p class="tableblock">Supercedes methods in <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_DomainObjectContainer"><code>DomainObjectContainer</code></a>.</p></td>
+ <td class="tableblock halign-left valign-top"></td>
</tr>
</tbody>
</table>
@@ -9105,7 +8922,7 @@ repositoryService.persist(cust);</code></pre>
</ul>
</div>
<div class="paragraph">
- <p>The <code>IsisJdoSupport</code> service provides a number of general purpose methods for working with the JDO/DataNucleus objectstore. In general these act at a lower-level of abstraction than the APIs normally used (specifically, those of <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_DomainObjectContainer"><code>DomainObjectContainer</code></a>), but nevertheless deal with some of the most common use cases. For service also provides access to the underlying JDO <code>PersistenceManager</code> for full control.</p>
+ <p>The <code>IsisJdoSupport</code> service provides a number of general purpose methods for working with the JDO/DataNucleus objectstore. In general these act at a lower-level of abstraction than the APIs normally used (specifically, those of <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_RepositoryService"><code>RepositoryService</code></a>), but nevertheless deal with some of the most common use cases. For service also provides access to the underlying JDO <code>PersistenceManager</code> for full control.</p>
</div>
<div class="paragraph">
<p>The following sections discuss the functionality provided by the service, broken out into categories.</p>
@@ -9334,15 +9151,13 @@ repositoryService.persist(cust);</code></pre>
<pre class="CodeRay highlight"><code data-lang="java"><span class="annotation">@DomainService</span>(nature=NatureOfService.VIEW_CONTRIBUTIONS_ONLY)
<span class="directive">public</span> <span class="type">class</span> <span class="class">OrderContributions</span> {
<span class="directive">public</span> Order newOrder(<span class="directive">final</span> Customer customer) {
- Order order = newTransientInstance(Order.class);
- order.setCustomer(customer);
- container.persist(customer);
- container.flush(); <i class="conum" data-value="1"></i><b>(1)</b>
- isisJdoSupport.refresh(customer); <i class="conum" data-value="2"></i><b>(2)</b>
+ Order order = <span class="keyword">new</span> Order(customer);
+ repositoryService.persistAndFlush(customer); <i class="conum" data-value="1"></i><b>(1)</b>
+ isisJdoSupport.refresh(customer); <i class="conum" data-value="2"></i><b>(2)</b>
<span class="keyword">return</span> order;
}
<span class="annotation">@Inject</span>
- DomainObjectContainer container;
+ RepositoryService repositoryService;
<span class="annotation">@Inject</span>
IsisJdoSupport isisJdoSupport;
}</code></pre>
@@ -9906,7 +9721,7 @@ repositoryService.persist(cust);</code></pre>
<span class="directive">public</span> <span class="type">class</span> <span class="class">ToDoItemRepositoryImplUsingJdoql</span> <span class="directive">implements</span> ToDoItemRepositoryImpl {
<span class="annotation">@Programmatic</span>
<span class="directive">public</span> <span class="predefined-type">List</span><ToDoItem> findByAtPathAndCategory(<span class="directive">final</span> <span class="predefined-type">String</span> atPath, <span class="directive">final</span> Category category) {
- <span class="keyword">return</span> container.allMatches(
+ <span class="keyword">return</span> repositoryService.allMatches(
<span class="keyword">new</span> QueryDefault<>(ToDoItem.class,
<span class="string"><span class="delimiter">"</span><span class="content">findByAtPathAndCategory</span><span class="delimiter">"</span></span>, <i class="conum" data-value="1"></i><b>(1)</b>
<span class="string"><span class="delimiter">"</span><span class="content">atPath</span><span class="delimiter">"</span></span>, atPath, <i class="conum" data-value="2"></i><b>(2)</b>
@@ -9914,7 +9729,7 @@ repositoryService.persist(cust);</code></pre>
}
...
<span class="annotation">@javax</span>.inject.Inject
- DomainObjectContainer container;
+ RepositoryService repositoryService;
}</code></pre>
</div>
</div>
@@ -9958,7 +9773,7 @@ repositoryService.persist(cust);</code></pre>
</div>
</div>
<div class="sect3">
- <h4 id="_implementation_34">11.5.3. Implementation</h4>
+ <h4 id="_implementation_33">11.5.3. Implementation</h4>
<div class="paragraph">
<p>The default implementation of this domain service is <code>o.a.i.core.metamodel.services.repository.RepositoryServiceDefault</code>.</p>
</div>
@@ -9992,7 +9807,7 @@ repositoryService.persist(cust);</code></pre>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p>Whether the <code>RepositoryService</code> (or <code>DomainObjectContainer</code> that delegates to it) should automatically flush pending changes prior to querying (via <code>allMatches()</code>, <code>firstMatch()</code> and so on).</p>
+ <p>Whether the <code>RepositoryService</code> should automatically flush pending changes prior to querying (via <code>allMatches()</code>, <code>firstMatch()</code> and so on).</p>
</div>
</div></td>
</tr>
@@ -10111,19 +9926,6 @@ repositoryService.persist(cust);</code></pre>
<div class="paragraph">
<p>The <code>AuditerService</code> auditing service provides a simple mechanism to capture changes to data. It is called for each property that has changed on any domain object, as a set of pre- and post-values.</p>
</div>
- <div class="admonitionblock note">
- <table>
- <tbody>
- <tr>
- <td class="icon"> <i class="fa icon-note" title="Note"></i> </td>
- <td class="content">
- <div class="paragraph">
- <p>This service is intended to replace the now-deprecated <a href="../rgsvc/rgsvc.html#_rgsvc_persistence-layer-spi_AuditingService"><code>AuditingService3</code></a>. The difference between the two is that this service recognises that the <code>transactionId</code> is actually a request/interaction Id, and that an additional `sequence</p>
- </div> </td>
- </tr>
- </tbody>
- </table>
- </div>
<div class="sect3">
<h4 id="_spi_22">12.1.1. SPI</h4>
<div class="paragraph">
@@ -10377,13 +10179,14 @@ log4j.additivity.org.apache.isis.applib.services.publish.PublisherServiceLogging
<div class="sect3">
<h4 id="_usage_17">12.2.3. Usage</h4>
<div class="paragraph">
- <p>To indicate that an action invocation should be published, annotate it with the <a href="../rgant/rgant.html#_rgant-Action_publishing"><code>@Action#publishing()</code></a> annotation.</p>
+ <p>To indicate that:</p>
</div>
- <div class="paragraph">
- <p>To indicate that an property edit should be published, annotate it with the <a href="../rgant/rgant.html#_rgant-Property_publishing"><code>@Property#publishing()</code></a> annotation.</p>
- </div>
- <div class="paragraph">
- <p>To indicate that a changed object should be published is to annotate it with the <a href="../rgant/rgant.html#_rgant-DomainObject_publishing"><code>@DomainObject#publishing()</code></a> annotation.</p>
+ <div class="ulist">
+ <ul>
+ <li> <p>an action invocation should be published, annotate it with the <a href="../rgant/rgant.html#_rgant-Action_publishing"><code>@Action#publishing()</code></a> annotation.</p> </li>
+ <li> <p>an property edit should be published, annotate it with the <a href="../rgant/rgant.html#_rgant-Property_publishing"><code>@Property#publishing()</code></a> annotation.</p> </li>
+ <li> <p>a changed object should be published is to annotate it with the <a href="../rgant/rgant.html#_rgant-DomainObject_publishing"><code>@DomainObject#publishing()</code></a> annotation.</p> </li>
+ </ul>
</div>
</div>
<div class="sect3">
@@ -10499,7 +10302,7 @@ log4j.additivity.org.apache.isis.applib.services.publish.PublisherServiceLogging
</div>
</div>
<div class="sect3">
- <h4 id="_implementation_35">12.3.2. Implementation</h4>
+ <h4 id="_implementation_34">12.3.2. Implementation</h4>
<div class="paragraph">
<p>The core Apache Isis framework itself defines only an API; there is no default implementation. Rather, the implementation will depend on the security mechanism being used.</p>
</div>
@@ -10628,7 +10431,7 @@ log4j.additivity.org.apache.isis.applib.services.publish.PublisherServiceLogging
</ul>
</div>
<div class="paragraph">
- <p>The <code>ClassDiscoveryService2</code> service (and its various supertypes) is used to automatically discover subclasses of any given type on the classpath. The primary use case is to support "convention-over-configuration" designs that work with a minimum of configuration.</p>
+ <p>The <code>ClassDiscoveryService</code> service (and its various supertypes) is used to automatically discover subclasses of any given type on the classpath. The primary use case is to support "convention-over-configuration" designs that work with a minimum of configuration.</p>
</div>
<div class="paragraph">
<p>This service is used by the <a href="../rgcms/rgcms.html#_rgcms_classes_super_FixtureScripts"><code>FixtureScripts</code></a> service to automatically locate any <a href="../rgcms/rgcms.html#_rgcms_classes_super_FixtureScript"><code>FixtureScript</code></a> implementations.</p>
@@ -10661,7 +10464,7 @@ log4j.additivity.org.apache.isis.applib.services.publish.PublisherServiceLogging
</div>
</div>
<div class="sect3">
- <h4 id="_implementation_36">13.1.2. Implementation</h4>
+ <h4 id="_implementation_35">13.1.2. Implementation</h4>
<div class="paragraph">
<p>Isis provides an implementation of this service, namely <code>o.a.i.applib.services.classdiscovery.ClassDiscoveryServiceUsingReflections</code>.</p>
</div>
[13/39] isis-site git commit: ISIS-1810: updates docs for 2.0.0-M1
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/274edd1d/content/versions/SNAPSHOT/guides/rgcms/rgcms.pdf
----------------------------------------------------------------------
diff --git a/content/versions/SNAPSHOT/guides/rgcms/rgcms.pdf b/content/versions/SNAPSHOT/guides/rgcms/rgcms.pdf
index 39a4023..84df587 100644
--- a/content/versions/SNAPSHOT/guides/rgcms/rgcms.pdf
+++ b/content/versions/SNAPSHOT/guides/rgcms/rgcms.pdf
@@ -4,16 +4,16 @@
<< /Title (Classes, Methods and Schema)
/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:20180812182434+01'00')
-/ModDate (D:20180812182434+01'00')
+/CreationDate (D:20180814003812+02'00')
+/ModDate (D:20180814003812+02'00')
>>
endobj
2 0 obj
<< /Type /Catalog
/Pages 3 0 R
/Names 14 0 R
-/Outlines 1050 0 R
-/PageLabels 1079 0 R
+/Outlines 1032 0 R
+/PageLabels 1061 0 R
/PageMode /UseOutlines
/OpenAction [7 0 R /FitH 842.89]
/ViewerPreferences << /DisplayDocTitle true
@@ -22,8 +22,8 @@ endobj
endobj
3 0 obj
<< /Type /Pages
-/Count 98
-/Kids [7 0 R 10 0 R 12 0 R 39 0 R 62 0 R 127 0 R 150 0 R 155 0 R 163 0 R 168 0 R 172 0 R 177 0 R 187 0 R 191 0 R 194 0 R 204 0 R 209 0 R 216 0 R 223 0 R 240 0 R 243 0 R 247 0 R 260 0 R 291 0 R 299 0 R 308 0 R 311 0 R 327 0 R 339 0 R 347 0 R 356 0 R 374 0 R 402 0 R 420 0 R 423 0 R 433 0 R 441 0 R 450 0 R 456 0 R 462 0 R 465 0 R 474 0 R 507 0 R 526 0 R 547 0 R 558 0 R 568 0 R 570 0 R 576 0 R 583 0 R 589 0 R 598 0 R 605 0 R 615 0 R 625 0 R 641 0 R 658 0 R 672 0 R 688 0 R 705 0 R 715 0 R 718 0 R 722 0 R 728 0 R 733 0 R 736 0 R 743 0 R 751 0 R 757 0 R 765 0 R 773 0 R 781 0 R 795 0 R 808 0 R 828 0 R 837 0 R 850 0 R 870 0 R 875 0 R 885 0 R 894 0 R 897 0 R 908 0 R 911 0 R 916 0 R 920 0 R 927 0 R 933 0 R 942 0 R 947 0 R 953 0 R 958 0 R 964 0 R 972 0 R 978 0 R 985 0 R 987 0 R 992 0 R]
+/Count 95
+/Kids [7 0 R 10 0 R 12 0 R 39 0 R 62 0 R 127 0 R 150 0 R 155 0 R 163 0 R 168 0 R 172 0 R 177 0 R 190 0 R 194 0 R 197 0 R 210 0 R 215 0 R 222 0 R 229 0 R 246 0 R 249 0 R 253 0 R 266 0 R 297 0 R 305 0 R 314 0 R 322 0 R 333 0 R 345 0 R 353 0 R 362 0 R 393 0 R 421 0 R 430 0 R 440 0 R 448 0 R 457 0 R 463 0 R 469 0 R 472 0 R 483 0 R 513 0 R 530 0 R 541 0 R 551 0 R 553 0 R 559 0 R 567 0 R 573 0 R 582 0 R 589 0 R 599 0 R 609 0 R 624 0 R 644 0 R 651 0 R 666 0 R 690 0 R 698 0 R 701 0 R 707 0 R 714 0 R 717 0 R 724 0 R 727 0 R 737 0 R 744 0 R 753 0 R 763 0 R 773 0 R 785 0 R 804 0 R 814 0 R 828 0 R 847 0 R 853 0 R 862 0 R 874 0 R 879 0 R 890 0 R 893 0 R 898 0 R 902 0 R 909 0 R 915 0 R 924 0 R 929 0 R 935 0 R 940 0 R 946 0 R 954 0 R 960 0 R 967 0 R 969 0 R 974 0 R]
>>
endobj
4 0 obj
@@ -80,11 +80,11 @@ endobj
<< /Type /Font
/BaseFont /AAAABM+NotoSerif
/Subtype /TrueType
-/FontDescriptor 1081 0 R
+/FontDescriptor 1063 0 R
/FirstChar 32
/LastChar 255
-/Widths 1083 0 R
-/ToUnicode 1082 0 R
+/Widths 1065 0 R
+/ToUnicode 1064 0 R
>>
endobj
9 0 obj
@@ -380,7 +380,7 @@ ET
BT
535.3009999999999 640.9759999999999 Td
/F1.0 10.5 Tf
-<3333> Tj
+<3332> Tj
ET
0.000 0.000 0.000 SCN
@@ -442,7 +442,7 @@ ET
BT
535.3009999999999 622.4959999999999 Td
/F1.0 10.5 Tf
-<3333> Tj
+<3332> Tj
ET
0.000 0.000 0.000 SCN
@@ -482,7 +482,7 @@ ET
BT
535.3009999999999 604.0159999999998 Td
/F1.0 10.5 Tf
-<3339> Tj
+<3338> Tj
ET
0.000 0.000 0.000 SCN
@@ -522,7 +522,7 @@ ET
BT
535.3009999999999 585.5359999999998 Td
/F1.0 10.5 Tf
-<3432> Tj
+<3430> Tj
ET
0.000 0.000 0.000 SCN
@@ -562,7 +562,7 @@ ET
BT
535.3009999999999 567.0559999999998 Td
/F1.0 10.5 Tf
-<3439> Tj
+<3437> Tj
ET
0.000 0.000 0.000 SCN
@@ -602,7 +602,7 @@ ET
BT
535.3009999999999 548.5759999999998 Td
/F1.0 10.5 Tf
-<3533> Tj
+<3531> Tj
ET
0.000 0.000 0.000 SCN
@@ -642,7 +642,7 @@ ET
BT
535.3009999999999 530.0959999999998 Td
/F1.0 10.5 Tf
-<3538> Tj
+<3536> Tj
ET
0.000 0.000 0.000 SCN
@@ -682,7 +682,7 @@ ET
BT
535.3009999999999 511.6159999999998 Td
/F1.0 10.5 Tf
-<3632> Tj
+<3539> Tj
ET
0.000 0.000 0.000 SCN
@@ -722,7 +722,7 @@ ET
BT
535.3009999999999 493.1359999999998 Td
/F1.0 10.5 Tf
-<3635> Tj
+<3633> Tj
ET
0.000 0.000 0.000 SCN
@@ -762,7 +762,7 @@ ET
BT
535.3009999999999 474.6559999999998 Td
/F1.0 10.5 Tf
-<3637> Tj
+<3635> Tj
ET
0.000 0.000 0.000 SCN
@@ -802,7 +802,7 @@ ET
BT
535.3009999999999 456.17599999999976 Td
/F1.0 10.5 Tf
-<3638> Tj
+<3635> Tj
ET
0.000 0.000 0.000 SCN
@@ -842,7 +842,7 @@ ET
BT
535.3009999999999 437.69599999999974 Td
/F1.0 10.5 Tf
-<3639> Tj
+<3636> Tj
ET
0.000 0.000 0.000 SCN
@@ -882,7 +882,7 @@ ET
BT
535.3009999999999 419.2159999999997 Td
/F1.0 10.5 Tf
-<3730> Tj
+<3638> Tj
ET
0.000 0.000 0.000 SCN
@@ -922,7 +922,7 @@ ET
BT
535.3009999999999 400.7359999999997 Td
/F1.0 10.5 Tf
-<3734> Tj
+<3732> Tj
ET
0.000 0.000 0.000 SCN
@@ -962,7 +962,7 @@ ET
BT
535.3009999999999 382.2559999999997 Td
/F1.0 10.5 Tf
-<3737> Tj
+<3734> Tj
ET
0.000 0.000 0.000 SCN
@@ -1002,7 +1002,7 @@ ET
BT
535.3009999999999 363.77599999999967 Td
/F1.0 10.5 Tf
-<3830> Tj
+<3737> Tj
ET
0.000 0.000 0.000 SCN
@@ -1042,7 +1042,7 @@ ET
BT
535.3009999999999 345.29599999999965 Td
/F1.0 10.5 Tf
-<3830> Tj
+<3737> Tj
ET
0.000 0.000 0.000 SCN
@@ -1082,7 +1082,7 @@ ET
BT
535.3009999999999 326.81599999999963 Td
/F1.0 10.5 Tf
-<3834> Tj
+<3831> Tj
ET
0.000 0.000 0.000 SCN
@@ -1122,7 +1122,7 @@ ET
BT
535.3009999999999 308.3359999999996 Td
/F1.0 10.5 Tf
-<3838> Tj
+<3835> Tj
ET
0.000 0.000 0.000 SCN
@@ -1162,7 +1162,7 @@ ET
BT
535.3009999999999 289.8559999999996 Td
/F1.0 10.5 Tf
-<3931> Tj
+<3838> Tj
ET
0.000 0.000 0.000 SCN
@@ -1182,7 +1182,7 @@ endobj
/F3.0 18 0 R
>>
>>
-/Annots [995 0 R 996 0 R 997 0 R 998 0 R 999 0 R 1000 0 R 1001 0 R 1002 0 R 1003 0 R 1004 0 R 1005 0 R 1006 0 R 1007 0 R 1008 0 R 1009 0 R 1010 0 R 1011 0 R 1012 0 R 1013 0 R 1014 0 R 1015 0 R 1016 0 R 1017 0 R 1018 0 R 1019 0 R 1020 0 R 1021 0 R 1022 0 R 1023 0 R 1024 0 R 1025 0 R 1026 0 R 1027 0 R 1028 0 R 1029 0 R 1030 0 R 1031 0 R 1032 0 R 1033 0 R 1034 0 R 1035 0 R 1036 0 R 1037 0 R 1038 0 R 1039 0 R 1040 0 R 1041 0 R 1042 0 R 1043 0 R 1044 0 R 1045 0 R 1046 0 R 1047 0 R 1048 0 R]
+/Annots [977 0 R 978 0 R 979 0 R 980 0 R 981 0 R 982 0 R 983 0 R 984 0 R 985 0 R 986 0 R 987 0 R 988 0 R 989 0 R 990 0 R 991 0 R 992 0 R 993 0 R 994 0 R 995 0 R 996 0 R 997 0 R 998 0 R 999 0 R 1000 0 R 1001 0 R 1002 0 R 1003 0 R 1004 0 R 1005 0 R 1006 0 R 1007 0 R 1008 0 R 1009 0 R 1010 0 R 1011 0 R 1012 0 R 1013 0 R 1014 0 R 1015 0 R 1016 0 R 1017 0 R 1018 0 R 1019 0 R 1020 0 R 1021 0 R 1022 0 R 1023 0 R 1024 0 R 1025 0 R 1026 0 R 1027 0 R 1028 0 R 1029 0 R 1030 0 R]
>>
endobj
11 0 obj
@@ -1989,7 +1989,7 @@ endobj
/F3.0 18 0 R
/F4.0 19 0 R
>>
-/XObject << /Stamp1 1049 0 R
+/XObject << /Stamp1 1031 0 R
>>
>>
/Annots [17 0 R 20 0 R 21 0 R 23 0 R 24 0 R 25 0 R 26 0 R 27 0 R 28 0 R 29 0 R 30 0 R 31 0 R 32 0 R 33 0 R 34 0 R 35 0 R 36 0 R 37 0 R]
@@ -2004,18 +2004,18 @@ endobj
>>
endobj
15 0 obj
-<< /Kids [220 0 R 467 0 R 949 0 R 840 0 R 701 0 R 824 0 R 541 0 R 731 0 R 425 0 R 221 0 R 967 0 R 287 0 R 753 0 R]
+<< /Kids [226 0 R 474 0 R 931 0 R 821 0 R 731 0 R 868 0 R 564 0 R 712 0 R 432 0 R 227 0 R 949 0 R 293 0 R 735 0 R]
>>
endobj
16 0 obj
<< /Type /Font
/BaseFont /AAAABN+NotoSerif-Bold
/Subtype /TrueType
-/FontDescriptor 1085 0 R
+/FontDescriptor 1067 0 R
/FirstChar 32
/LastChar 255
-/Widths 1087 0 R
-/ToUnicode 1086 0 R
+/Widths 1069 0 R
+/ToUnicode 1068 0 R
>>
endobj
17 0 obj
@@ -2033,22 +2033,22 @@ endobj
<< /Type /Font
/BaseFont /AAAABO+mplus1mn-regular
/Subtype /TrueType
-/FontDescriptor 1089 0 R
+/FontDescriptor 1071 0 R
/FirstChar 32
/LastChar 255
-/Widths 1091 0 R
-/ToUnicode 1090 0 R
+/Widths 1073 0 R
+/ToUnicode 1072 0 R
>>
endobj
19 0 obj
<< /Type /Font
/BaseFont /AAAABP+mplus-1p-regular
/Subtype /TrueType
-/FontDescriptor 1093 0 R
+/FontDescriptor 1075 0 R
/FirstChar 32
/LastChar 255
-/Widths 1095 0 R
-/ToUnicode 1094 0 R
+/Widths 1077 0 R
+/ToUnicode 1076 0 R
>>
endobj
20 0 obj
@@ -3790,7 +3790,7 @@ endobj
/F6.0 44 0 R
/F4.0 19 0 R
>>
-/XObject << /Stamp1 1049 0 R
+/XObject << /Stamp1 1031 0 R
>>
>>
/Annots [41 0 R 45 0 R 46 0 R 47 0 R 48 0 R 49 0 R 50 0 R 51 0 R 52 0 R 53 0 R 54 0 R 55 0 R 56 0 R 57 0 R 58 0 R 59 0 R 60 0 R]
@@ -3817,22 +3817,22 @@ endobj
<< /Type /Font
/BaseFont /AAAABQ+FontAwesome
/Subtype /TrueType
-/FontDescriptor 1097 0 R
+/FontDescriptor 1079 0 R
/FirstChar 32
/LastChar 255
-/Widths 1099 0 R
-/ToUnicode 1098 0 R
+/Widths 1081 0 R
+/ToUnicode 1080 0 R
>>
endobj
44 0 obj
<< /Type /Font
/BaseFont /AAAABR+NotoSerif-Italic
/Subtype /TrueType
-/FontDescriptor 1101 0 R
+/FontDescriptor 1083 0 R
/FirstChar 32
/LastChar 255
-/Widths 1103 0 R
-/ToUnicode 1102 0 R
+/Widths 1085 0 R
+/ToUnicode 1084 0 R
>>
endobj
45 0 obj
@@ -8015,7 +8015,7 @@ endobj
/F4.0 19 0 R
/F1.0 8 0 R
>>
-/XObject << /Stamp1 1049 0 R
+/XObject << /Stamp1 1031 0 R
>>
>>
/Annots [63 0 R 64 0 R 65 0 R 66 0 R 67 0 R 68 0 R 69 0 R 70 0 R 71 0 R 72 0 R 73 0 R 74 0 R 75 0 R 76 0 R 77 0 R 78 0 R 79 0 R 80 0 R 81 0 R 82 0 R 83 0 R 84 0 R 85 0 R 86 0 R 87 0 R 88 0 R 89 0 R 90 0 R 91 0 R 92 0 R 93 0 R 94 0 R 95 0 R 96 0 R 97 0 R 98 0 R 99 0 R 100 0 R 101 0 R 102 0 R 103 0 R 104 0 R 105 0 R 106 0 R 107 0 R 108 0 R 109 0 R 110 0 R 111 0 R 112 0 R 113 0 R 114 0 R 115 0 R 116 0 R 117 0 R 118 0 R 119 0 R 120 0 R 121 0 R 122 0 R 123 0 R 124 0 R 125 0 R]
@@ -11463,7 +11463,7 @@ endobj
/F5.1 43 0 R
/F3.1 141 0 R
>>
-/XObject << /Stamp1 1049 0 R
+/XObject << /Stamp1 1031 0 R
>>
>>
/Annots [128 0 R 129 0 R 130 0 R 131 0 R 132 0 R 133 0 R 134 0 R 135 0 R 136 0 R 137 0 R 138 0 R 140 0 R 142 0 R 143 0 R 144 0 R 146 0 R 147 0 R 148 0 R]
@@ -11608,11 +11608,11 @@ endobj
<< /Type /Font
/BaseFont /AAAABS+mplus1mn-regular
/Subtype /TrueType
-/FontDescriptor 1105 0 R
+/FontDescriptor 1087 0 R
/FirstChar 32
/LastChar 255
-/Widths 1107 0 R
-/ToUnicode 1106 0 R
+/Widths 1089 0 R
+/ToUnicode 1088 0 R
>>
endobj
142 0 obj
@@ -14702,7 +14702,7 @@ endobj
/F3.0 18 0 R
/F3.1 141 0 R
>>
-/XObject << /Stamp1 1049 0 R
+/XObject << /Stamp1 1031 0 R
>>
>>
/Annots [152 0 R]
@@ -16271,7 +16271,7 @@ endobj
/F4.0 19 0 R
/F6.0 44 0 R
>>
-/XObject << /Stamp1 1049 0 R
+/XObject << /Stamp1 1031 0 R
>>
>>
/Annots [156 0 R 158 0 R 159 0 R 160 0 R]
@@ -18602,7 +18602,7 @@ endobj
/F2.0 16 0 R
/F1.0 8 0 R
>>
-/XObject << /Stamp1 1049 0 R
+/XObject << /Stamp1 1031 0 R
>>
>>
/Annots [165 0 R]
@@ -20762,7 +20762,7 @@ endobj
/Contents 167 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/XObject << /I1 166 0 R
-/Stamp1 1049 0 R
+/Stamp1 1031 0 R
>>
/Font << /F1.0 8 0 R
/F3.0 18 0 R
@@ -23299,7 +23299,7 @@ endobj
/F4.0 19 0 R
/F1.1 175 0 R
>>
-/XObject << /Stamp1 1049 0 R
+/XObject << /Stamp1 1031 0 R
>>
>>
>>
@@ -23314,15 +23314,15 @@ endobj
<< /Type /Font
/BaseFont /AAAABT+NotoSerif
/Subtype /TrueType
-/FontDescriptor 1109 0 R
+/FontDescriptor 1091 0 R
/FirstChar 32
/LastChar 255
-/Widths 1111 0 R
-/ToUnicode 1110 0 R
+/Widths 1093 0 R
+/ToUnicode 1092 0 R
>>
endobj
176 0 obj
-<< /Length 29971
+<< /Length 30896
>>
stream
q
@@ -24890,12 +24890,12 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-1.757 Tw
+2.006 Tw
BT
48.24000000000001 398.04600000000016 Td
/F1.0 10.5 Tf
-[<76616c75652e202054686973206d61> 20.01953125 <7920626520736f6d652073656e7369626c652064656661756c742028656720746f6461> 20.01953125 <79d57320646174652c206f722030206f722031292c206f72>] TJ
+[<76616c75652e2054686973206d61> 20.01953125 <7920626520736f6d652073656e7369626c652064656661756c742028656720746f6461> 20.01953125 <79d57320646174652c206f722030206f722031292c206f72>] TJ
/F1.1 10.5 Tf
<21> Tj
/F1.0 10.5 Tf
@@ -24977,12 +24977,72 @@ ET
0.694 0.129 0.275 scn
0.694 0.129 0.275 SCN
-0.264 Tw
+0.862 Tw
BT
48.24000000000001 338.70600000000013 Td
/F3.0 10.5 Tf
-<446f6d61696e4f626a656374436f6e7461696e6572236e65775472616e7369656e74496e7374616e636528> Tj
+<5265706f7369746f72795365727669636523696e7374616e746961746528> 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
+
+0.862 Tw
+
+BT
+205.74 338.70600000000013 Td
+/F4.0 10.5 Tf
+<c9> 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
+
+0.862 Tw
+
+BT
+216.24 338.70600000000013 Td
+/F3.0 10.5 Tf
+<29> 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
+
+0.862 Tw
+
+BT
+221.49 338.70600000000013 Td
+/F1.0 10.5 Tf
+<206f7220> 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
+
+0.862 Tw
+
+BT
+239.657 338.70600000000013 Td
+/F3.0 10.5 Tf
+<466163746f72795365727669636523696e7374616e746961746528> Tj
ET
@@ -24992,10 +25052,10 @@ ET
0.694 0.129 0.275 scn
0.694 0.129 0.275 SCN
-0.264 Tw
+0.862 Tw
BT
-273.99 338.70600000000013 Td
+381.40700000000004 338.70600000000013 Td
/F4.0 10.5 Tf
<c9> Tj
ET
@@ -25007,10 +25067,10 @@ ET
0.694 0.129 0.275 scn
0.694 0.129 0.275 SCN
-0.264 Tw
+0.862 Tw
BT
-284.49 338.70600000000013 Td
+391.90700000000004 338.70600000000013 Td
/F3.0 10.5 Tf
<29> Tj
ET
@@ -25022,12 +25082,12 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-0.264 Tw
+0.862 Tw
BT
-289.74 338.70600000000013 Td
+397.15700000000004 338.70600000000013 Td
/F1.0 10.5 Tf
-<2e2020546869732069732061206d756368206c65737320636f6d6d6f6e2075736520636173652e2020496620612064656661756c74> Tj
+<2e20546869732069732061206d756368206c65737320636f6d6d6f6e> Tj
ET
@@ -25037,10 +25097,25 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
+0.559 Tw
+
BT
48.24000000000001 322.92600000000016 Td
/F1.0 10.5 Tf
-<6973206e6f7420737065636966696564207468656e2070726f706572746965732061726520696e697469616c697a656420746f20612064656661756c74206261736564206f6e2074686569722074797065202865672030206f7220> Tj
+<75736520636173652e20496620612064656661756c74206973206e6f7420737065636966696564207468656e2070726f706572746965732061726520696e697469616c697a656420746f20612064656661756c74206261736564206f6e2074686569722074797065> 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
+
+BT
+48.24000000000001 307.1460000000002 Td
+/F1.0 10.5 Tf
+<2865672030206f7220> Tj
ET
0.000 0.000 0.000 SCN
@@ -25049,7 +25124,7 @@ ET
0.694 0.129 0.275 SCN
BT
-475.9155 322.92600000000016 Td
+88.17150000000001 307.1460000000002 Td
/F3.0 10.5 Tf
<66616c7365> Tj
ET
@@ -25060,7 +25135,7 @@ ET
0.200 0.200 0.200 SCN
BT
-502.1655 322.92600000000016 Td
+114.42150000000001 307.1460000000002 Td
/F1.0 10.5 Tf
<292e> Tj
ET
@@ -25073,7 +25148,7 @@ ET
1.865 Tw
BT
-48.24000000000001 295.14600000000013 Td
+48.24000000000001 279.36600000000016 Td
/F1.0 10.5 Tf
[<546865207369676e6174757265206f662074686520737570706f7274696e67206d6574686f6420646570656e6473206f6e207768657468657220697420697320666f7220616e20616374696f6e20706172> 20.01953125 <616d65746572206f722061>] TJ
ET
@@ -25086,7 +25161,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24000000000001 279.3660000000001 Td
+48.24000000000001 263.5860000000001 Td
/F1.0 10.5 Tf
[<70726f7065727479> 89.84375 <2e>] TJ
ET
@@ -25097,7 +25172,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24000000000001 247.53600000000012 Td
+48.24000000000001 231.75600000000014 Td
/F2.0 10.5 Tf
[<506172> 20.01953125 <616d6574657273>] TJ
ET
@@ -25108,7 +25183,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24000000000001 221.7060000000001 Td
+48.24000000000001 205.92600000000013 Td
/F1.0 10.5 Tf
[<46> 40.0390625 <6f7220616e20616374696f6e20706172> 20.01953125 <616d6574657220696e2028302d626173656420706f736974696f6e206e292c20616e64206f66207479706520>] TJ
ET
@@ -25119,7 +25194,7 @@ ET
0.694 0.129 0.275 SCN
BT
-347.510384765625 221.7060000000001 Td
+347.510384765625 205.92600000000013 Td
/F3.0 10.5 Tf
<54> Tj
ET
@@ -25130,7 +25205,7 @@ ET
0.200 0.200 0.200 SCN
BT
-352.760384765625 221.7060000000001 Td
+352.760384765625 205.92600000000013 Td
/F1.0 10.5 Tf
<2c20746865207369676e61747572652069733a> Tj
ET
@@ -25139,28 +25214,28 @@ ET
0.000 0.000 0.000 scn
q
0.961 0.961 0.961 scn
-52.240 205.890 m
-543.040 205.890 l
-545.249 205.890 547.040 204.099 547.040 201.890 c
-547.040 173.150 l
-547.040 170.941 545.249 169.150 543.040 169.150 c
-52.240 169.150 l
-50.031 169.150 48.240 170.941 48.240 173.150 c
-48.240 201.890 l
-48.240 204.099 50.031 205.890 52.240 205.890 c
+52.240 190.110 m
+543.040 190.110 l
+545.249 190.110 547.040 188.319 547.040 186.110 c
+547.040 157.370 l
+547.040 155.161 545.249 153.370 543.040 153.370 c
+52.240 153.370 l
+50.031 153.370 48.240 155.161 48.240 157.370 c
+48.240 186.110 l
+48.240 188.319 50.031 190.110 52.240 190.110 c
h
f
0.800 0.800 0.800 SCN
0.75 w
-52.240 205.890 m
-543.040 205.890 l
-545.249 205.890 547.040 204.099 547.040 201.890 c
-547.040 173.150 l
-547.040 170.941 545.249 169.150 543.040 169.150 c
-52.240 169.150 l
-50.031 169.150 48.240 170.941 48.240 173.150 c
-48.240 201.890 l
-48.240 204.099 50.031 205.890 52.240 205.890 c
+52.240 190.110 m
+543.040 190.110 l
+545.249 190.110 547.040 188.319 547.040 186.110 c
+547.040 157.370 l
+547.040 155.161 545.249 153.370 543.040 153.370 c
+52.240 153.370 l
+50.031 153.370 48.240 155.161 48.240 157.370 c
+48.240 186.110 l
+48.240 188.319 50.031 190.110 52.240 190.110 c
h
S
Q
@@ -25168,7 +25243,7 @@ Q
0.000 0.400 0.600 SCN
BT
-59.24000000000001 183.06500000000008 Td
+59.24000000000001 167.28500000000014 Td
/F3.0 11 Tf
<7075626c6963> Tj
ET
@@ -25179,7 +25254,7 @@ ET
0.200 0.200 0.200 SCN
BT
-92.24000000000001 183.06500000000008 Td
+92.24000000000001 167.28500000000014 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -25190,7 +25265,7 @@ ET
0.200 0.200 0.200 SCN
BT
-97.74000000000001 183.06500000000008 Td
+97.74000000000001 167.28500000000014 Td
/F3.0 11 Tf
<54> Tj
ET
@@ -25201,7 +25276,7 @@ ET
0.200 0.200 0.200 SCN
BT
-103.24000000000001 183.06500000000008 Td
+103.24000000000001 167.28500000000014 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -25212,7 +25287,7 @@ ET
0.200 0.200 0.200 SCN
BT
-108.74000000000001 183.06500000000008 Td
+108.74000000000001 167.28500000000014 Td
/F3.0 11 Tf
<64656661756c744e587878> Tj
ET
@@ -25223,7 +25298,7 @@ ET
0.200 0.200 0.200 SCN
BT
-169.24 183.06500000000008 Td
+169.24 167.28500000000014 Td
/F3.0 11 Tf
<28> Tj
ET
@@ -25234,7 +25309,7 @@ ET
0.200 0.200 0.200 SCN
BT
-174.74 183.06500000000008 Td
+174.74 167.28500000000014 Td
/F3.0 11 Tf
<29> Tj
ET
@@ -25245,7 +25320,7 @@ ET
0.200 0.200 0.200 SCN
BT
-180.24 183.06500000000008 Td
+180.24 167.28500000000014 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -25256,7 +25331,7 @@ ET
0.200 0.200 0.200 SCN
BT
-185.74 183.06500000000008 Td
+185.74 167.28500000000014 Td
/F3.0 11 Tf
<7b> Tj
ET
@@ -25267,7 +25342,7 @@ ET
0.200 0.200 0.200 SCN
BT
-191.24 183.06500000000008 Td
+191.24 167.28500000000014 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -25278,7 +25353,7 @@ ET
0.200 0.200 0.200 SCN
BT
-196.74 183.06500000000008 Td
+196.74 167.28500000000014 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -25289,7 +25364,7 @@ ET
0.200 0.200 0.200 SCN
BT
-202.24 183.06500000000008 Td
+202.24 167.28500000000014 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -25300,7 +25375,7 @@ ET
0.200 0.200 0.200 SCN
BT
-207.74 183.06500000000008 Td
+207.74 167.28500000000014 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -25311,7 +25386,7 @@ ET
0.200 0.200 0.200 SCN
BT
-213.24 183.06500000000008 Td
+213.24 167.28500000000014 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -25322,7 +25397,7 @@ ET
0.200 0.200 0.200 SCN
BT
-218.74 183.06500000000008 Td
+218.74 167.28500000000014 Td
/F3.0 11 Tf
<7d> Tj
ET
@@ -25333,7 +25408,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24000000000001 145.1860000000001 Td
+48.24000000000001 129.40600000000012 Td
/F1.0 10.5 Tf
[<46> 40.0390625 <6f72206578616d706c653a>] TJ
ET
@@ -25379,10 +25454,10 @@ endobj
/F1.1 175 0 R
/F6.0 44 0 R
>>
-/XObject << /Stamp1 1049 0 R
+/XObject << /Stamp1 1031 0 R
>>
>>
-/Annots [178 0 R 179 0 R 180 0 R 182 0 R 183 0 R 184 0 R]
+/Annots [178 0 R 179 0 R 180 0 R 182 0 R 183 0 R 184 0 R 185 0 R 186 0 R 187 0 R]
>>
endobj
178 0 obj
@@ -25425,10 +25500,10 @@ endobj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
-/URI (../rgsvc/rgsvc.pdf#_rgsvc_core-domain-api_DomainObjectContainer)
+/URI (../rgsvc/rgsvc.pdf#_rgsvc_core-domain-api_RepositoryService)
>>
/Subtype /Link
-/Rect [48.24000000000001 337.2360000000001 273.99 347.7360000000001]
+/Rect [48.24000000000001 337.2360000000001 205.74 347.7360000000001]
/Type /Annot
>>
endobj
@@ -25436,10 +25511,10 @@ endobj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
-/URI (../rgsvc/rgsvc.pdf#_rgsvc_core-domain-api_DomainObjectContainer)
+/URI (../rgsvc/rgsvc.pdf#_rgsvc_core-domain-api_RepositoryService)
>>
/Subtype /Link
-/Rect [273.99 337.2360000000001 284.49 347.7360000000001]
+/Rect [205.74 337.2360000000001 216.24 347.7360000000001]
/Type /Annot
>>
endobj
@@ -25447,18 +25522,51 @@ endobj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
-/URI (../rgsvc/rgsvc.pdf#_rgsvc_core-domain-api_DomainObjectContainer)
+/URI (../rgsvc/rgsvc.pdf#_rgsvc_core-domain-api_RepositoryService)
>>
/Subtype /Link
-/Rect [284.49 337.2360000000001 289.74 347.7360000000001]
+/Rect [216.24 337.2360000000001 221.49 347.7360000000001]
/Type /Annot
>>
endobj
185 0 obj
-[177 0 R /XYZ 0 263.5500000000001 null]
+<< /Border [0 0 0]
+/A << /Type /Action
+/S /URI
+/URI (../rgsvc/rgsvc.pdf#_rgsvc_core-domain-api_FactoryService)
+>>
+/Subtype /Link
+/Rect [239.657 337.2360000000001 381.40700000000004 347.7360000000001]
+/Type /Annot
+>>
endobj
186 0 obj
-<< /Length 32310
+<< /Border [0 0 0]
+/A << /Type /Action
+/S /URI
+/URI (../rgsvc/rgsvc.pdf#_rgsvc_core-domain-api_FactoryService)
+>>
+/Subtype /Link
+/Rect [381.40700000000004 337.2360000000001 391.90700000000004 347.7360000000001]
+/Type /Annot
+>>
+endobj
+187 0 obj
+<< /Border [0 0 0]
+/A << /Type /Action
+/S /URI
+/URI (../rgsvc/rgsvc.pdf#_rgsvc_core-domain-api_FactoryService)
+>>
+/Subtype /Link
+/Rect [391.90700000000004 337.2360000000001 397.15700000000004 347.7360000000001]
+/Type /Annot
+>>
+endobj
+188 0 obj
+[177 0 R /XYZ 0 247.77000000000015 null]
+endobj
+189 0 obj
+<< /Length 32306
>>
stream
q
@@ -27729,7 +27837,7 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-0.597 Tw
+0.834 Tw
BT
48.239999999999995 347.86599999999993 Td
@@ -27744,10 +27852,10 @@ ET
0.259 0.545 0.792 scn
0.259 0.545 0.792 SCN
-0.597 Tw
+0.834 Tw
BT
-265.5162247395833 347.86599999999993 Td
+267.174455078125 347.86599999999993 Td
/F1.0 10.5 Tf
<636f6e747269627574656420616374696f6e73> Tj
ET
@@ -27759,12 +27867,12 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-0.597 Tw
+0.834 Tw
BT
-363.34318541666664 347.86599999999993 Td
+365.2383058035714 347.86599999999993 Td
/F1.0 10.5 Tf
-[<2e202046> 40.0390625 <6f72206578616d706c652c2068657265206973206120636f6e7472696275746564>] TJ
+[<2e2046> 40.0390625 <6f72206578616d706c652c2068657265206973206120636f6e7472696275746564>] TJ
ET
@@ -27828,34 +27936,34 @@ Q
endstream
endobj
-187 0 obj
+190 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 186 0 R
+/Contents 189 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/Font << /F3.0 18 0 R
/F3.1 141 0 R
/F1.0 8 0 R
>>
-/XObject << /Stamp1 1049 0 R
+/XObject << /Stamp1 1031 0 R
>>
>>
-/Annots [188 0 R 189 0 R]
+/Annots [191 0 R 192 0 R]
>>
endobj
-188 0 obj
+191 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
/URI (../ugfun/ugfun.pdf#_ugfun_how-tos_contributed-members)
>>
/Subtype /Link
-/Rect [265.5162247395833 344.79999999999995 363.34318541666664 359.0799999999999]
+/Rect [267.174455078125 344.79999999999995 365.2383058035714 359.0799999999999]
/Type /Annot
>>
endobj
-189 0 obj
+192 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -27866,7 +27974,7 @@ endobj
/Type /Annot
>>
endobj
-190 0 obj
+193 0 obj
<< /Length 44651
>>
stream
@@ -31071,27 +31179,27 @@ Q
endstream
endobj
-191 0 obj
+194 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 190 0 R
+/Contents 193 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/Font << /F3.0 18 0 R
/F3.1 141 0 R
/F1.0 8 0 R
/F2.0 16 0 R
>>
-/XObject << /Stamp1 1049 0 R
+/XObject << /Stamp1 1031 0 R
>>
>>
>>
endobj
-192 0 obj
-[191 0 R /XYZ 0 352.78999999999996 null]
+195 0 obj
+[194 0 R /XYZ 0 352.78999999999996 null]
endobj
-193 0 obj
-<< /Length 16286
+196 0 obj
+<< /Length 16986
>>
stream
q
@@ -31167,12 +31275,12 @@ ET
0.694 0.129 0.275 scn
0.694 0.129 0.275 SCN
-5.867 Tw
+4.291 Tw
BT
48.24 727.326 Td
/F3.0 10.5 Tf
-<446f6d61696e4f626a656374436f6e7461696e6572236e65775472616e7369656e74496e7374616e636528> Tj
+<5265706f7369746f72795365727669636523696e7374616e746961746528> Tj
ET
@@ -31182,10 +31290,10 @@ ET
0.694 0.129 0.275 scn
0.694 0.129 0.275 SCN
-5.867 Tw
+4.291 Tw
BT
-273.99 727.326 Td
+205.74 727.326 Td
/F4.0 10.5 Tf
<c9> Tj
ET
@@ -31197,10 +31305,10 @@ ET
0.694 0.129 0.275 scn
0.694 0.129 0.275 SCN
-5.867 Tw
+4.291 Tw
BT
-284.49 727.326 Td
+216.24 727.326 Td
/F3.0 10.5 Tf
<29> Tj
ET
@@ -31212,12 +31320,72 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-5.867 Tw
+4.291 Tw
BT
-289.74 727.326 Td
+221.49 727.326 Td
/F1.0 10.5 Tf
-[<2069732063616c6c65642e202054686973206d6574686f642069732063616c6c656420616674657220616e> 20.01953125 <79>] TJ
+<206f7220> 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
+
+4.291 Tw
+
+BT
+246.5152857142857 727.326 Td
+/F3.0 10.5 Tf
+<466163746f72795365727669636523696e7374616e746961746528> 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
+
+4.291 Tw
+
+BT
+388.2652857142857 727.326 Td
+/F4.0 10.5 Tf
+<c9> 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
+
+4.291 Tw
+
+BT
+398.7652857142857 727.326 Td
+/F3.0 10.5 Tf
+<29> 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
+
+4.291 Tw
+
+BT
+404.0152857142857 727.326 Td
+/F1.0 10.5 Tf
+<2069732063616c6c65642e2054686973206d6574686f64206973> Tj
ET
@@ -31230,7 +31398,7 @@ ET
BT
48.24 711.546 Td
/F1.0 10.5 Tf
-<646570656e64656e636965732068617665206265656e20696e6a656374656420696e746f2074686520736572766963652e> Tj
+[<63616c6c656420616674657220616e> 20.01953125 <792073657276696365732068617665206265656e20696e6a656374656420696e746f2074686520646f6d61696e206f626a6563742e>] TJ
ET
0.000 0.000 0.000 SCN
@@ -31238,12 +31406,12 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-0.762 Tw
+1.052 Tw
BT
48.24 683.766 Td
/F1.0 10.5 Tf
-[<546865207365636f6e64206973206d6f726520737472> 20.01953125 <6169676874666f72776172643a2073696d706c7920696e697469616c697a652070726f7065727469657320696e2074686520636f6e7374727563746f722e2020486f77657665722c2074686973>] TJ
+[<546865207365636f6e64206973206d6f726520737472> 20.01953125 <6169676874666f72776172643a2073696d706c7920696e697469616c697a652070726f7065727469657320696e2074686520636f6e7374727563746f722e20486f77657665722c2074686973>] TJ
ET
@@ -32058,11 +32226,11 @@ Q
endstream
endobj
-194 0 obj
+197 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 193 0 R
+/Contents 196 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/Font << /F2.0 16 0 R
/F1.0 8 0 R
@@ -32070,16 +32238,16 @@ endobj
/F4.0 19 0 R
/F5.1 43 0 R
>>
-/XObject << /Stamp1 1049 0 R
+/XObject << /Stamp1 1031 0 R
>>
>>
-/Annots [196 0 R 197 0 R 198 0 R 199 0 R 201 0 R 202 0 R]
+/Annots [199 0 R 200 0 R 201 0 R 202 0 R 203 0 R 204 0 R 205 0 R 207 0 R 208 0 R]
>>
endobj
-195 0 obj
-[194 0 R /XYZ 0 841.89 null]
+198 0 obj
+[197 0 R /XYZ 0 841.89 null]
endobj
-196 0 obj
+199 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -32090,43 +32258,76 @@ endobj
/Type /Annot
>>
endobj
-197 0 obj
+200 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
-/URI (../rgsvc/rgsvc.pdf#_rgsvc_core-domain-api_DomainObjectContainer)
+/URI (../rgsvc/rgsvc.pdf#_rgsvc_core-domain-api_RepositoryService)
>>
/Subtype /Link
-/Rect [48.24 725.856 273.99 736.356]
+/Rect [48.24 725.856 205.74 736.356]
/Type /Annot
>>
endobj
-198 0 obj
+201 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
-/URI (../rgsvc/rgsvc.pdf#_rgsvc_core-domain-api_DomainObjectContainer)
+/URI (../rgsvc/rgsvc.pdf#_rgsvc_core-domain-api_RepositoryService)
>>
/Subtype /Link
-/Rect [273.99 725.856 284.49 736.356]
+/Rect [205.74 725.856 216.24 736.356]
/Type /Annot
>>
endobj
-199 0 obj
+202 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
-/URI (../rgsvc/rgsvc.pdf#_rgsvc_core-domain-api_DomainObjectContainer)
+/URI (../rgsvc/rgsvc.pdf#_rgsvc_core-domain-api_RepositoryService)
>>
/Subtype /Link
-/Rect [284.49 725.856 289.74 736.356]
+/Rect [216.24 725.856 221.49 736.356]
/Type /Annot
>>
endobj
-200 0 obj
-[194 0 R /XYZ 0 652.1700000000001 null]
+203 0 obj
+<< /Border [0 0 0]
+/A << /Type /Action
+/S /URI
+/URI (../rgsvc/rgsvc.pdf#_rgsvc_core-domain-api_FactoryService)
+>>
+/Subtype /Link
+/Rect [246.5152857142857 725.856 388.2652857142857 736.356]
+/Type /Annot
+>>
endobj
-201 0 obj
+204 0 obj
+<< /Border [0 0 0]
+/A << /Type /Action
+/S /URI
+/URI (../rgsvc/rgsvc.pdf#_rgsvc_core-domain-api_FactoryService)
+>>
+/Subtype /Link
+/Rect [388.2652857142857 725.856 398.7652857142857 736.356]
+/Type /Annot
+>>
+endobj
+205 0 obj
+<< /Border [0 0 0]
+/A << /Type /Action
+/S /URI
+/URI (../rgsvc/rgsvc.pdf#_rgsvc_core-domain-api_FactoryService)
+>>
+/Subtype /Link
+/Rect [398.7652857142857 725.856 404.0152857142857 736.356]
+/Type /Annot
+>>
+endobj
+206 0 obj
+[197 0 R /XYZ 0 652.1700000000001 null]
+endobj
+207 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -32137,7 +32338,7 @@ endobj
/Type /Annot
>>
endobj
-202 0 obj
+208 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -32148,7 +32349,7 @@ endobj
/Type /Annot
>>
endobj
-203 0 obj
+209 0 obj
<< /Length 34784
>>
stream
@@ -34642,11 +34843,11 @@ Q
endstream
endobj
-204 0 obj
+210 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 203 0 R
+/Contents 209 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/Font << /F3.0 18 0 R
/F1.0 8 0 R
@@ -34654,13 +34855,13 @@ endobj
/F2.0 16 0 R
/F4.0 19 0 R
>>
-/XObject << /Stamp1 1049 0 R
+/XObject << /Stamp1 1031 0 R
>>
>>
-/Annots [205 0 R 206 0 R]
+/Annots [211 0 R 212 0 R]
>>
endobj
-205 0 obj
+211 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -34671,7 +34872,7 @@ endobj
/Type /Annot
>>
endobj
-206 0 obj
+212 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -34682,10 +34883,10 @@ endobj
/Type /Annot
>>
endobj
-207 0 obj
-[204 0 R /XYZ 0 139.14999999999998 null]
+213 0 obj
+[210 0 R /XYZ 0 139.14999999999998 null]
endobj
-208 0 obj
+214 0 obj
<< /Length 25175
>>
stream
@@ -36359,11 +36560,11 @@ Q
endstream
endobj
-209 0 obj
+215 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 208 0 R
+/Contents 214 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/Font << /F1.0 8 0 R
/F3.0 18 0 R
@@ -36371,13 +36572,13 @@ endobj
/F4.0 19 0 R
/F2.0 16 0 R
>>
-/XObject << /Stamp1 1049 0 R
+/XObject << /Stamp1 1031 0 R
>>
>>
-/Annots [210 0 R 211 0 R 212 0 R 214 0 R]
+/Annots [216 0 R 217 0 R 218 0 R 220 0 R]
>>
endobj
-210 0 obj
+216 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -36388,7 +36589,7 @@ endobj
/Type /Annot
>>
endobj
-211 0 obj
+217 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -36399,7 +36600,7 @@ endobj
/Type /Annot
>>
endobj
-212 0 obj
+218 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -36410,10 +36611,10 @@ endobj
/Type /Annot
>>
endobj
-213 0 obj
-[209 0 R /XYZ 0 616.62 null]
+219 0 obj
+[215 0 R /XYZ 0 616.62 null]
endobj
-214 0 obj
+220 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -36424,7 +36625,7 @@ endobj
/Type /Annot
>>
endobj
-215 0 obj
+221 0 obj
<< /Length 39979
>>
stream
@@ -39235,11 +39436,11 @@ Q
endstream
endobj
-216 0 obj
+222 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 215 0 R
+/Contents 221 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/Font << /F3.0 18 0 R
/F5.1 43 0 R
@@ -39249,13 +39450,13 @@ endobj
/F1.1 175 0 R
/F3.1 141 0 R
>>
-/XObject << /Stamp1 1049 0 R
+/XObject << /Stamp1 1031 0 R
>>
>>
-/Annots [217 0 R 218 0 R]
+/Annots [223 0 R 224 0 R]
>>
endobj
-217 0 obj
+223 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -39266,7 +39467,7 @@ endobj
/Type /Annot
>>
endobj
-218 0 obj
+224 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -39277,20 +39478,20 @@ endobj
/Type /Annot
>>
endobj
-219 0 obj
-[216 0 R /XYZ 0 466.25 null]
+225 0 obj
+[222 0 R /XYZ 0 466.25 null]
endobj
-220 0 obj
+226 0 obj
<< /Limits [(__rgcms) (__rgcms_classes_AppManifest-bootstrapping_bootstrapping_AppManifestAbstract)]
-/Names [(__rgcms) 13 0 R (__rgcms_classes_AppManifest-bootstrapping_api) 431 0 R (__rgcms_classes_AppManifest-bootstrapping_api_getAdditionalServices) 439 0 R (__rgcms_classes_AppManifest-bootstrapping_api_getAuthenticationMechanism) 444 0 R (__rgcms_classes_AppManifest-bootstrapping_api_getAuthorizationMechanism) 446 0 R (__rgcms_classes_AppManifest-bootstrapping_api_getConfigurationProperties) 451 0 R (__rgcms_classes_AppManifest-bootstrapping_api_getFixtures) 448 0 R (__rgcms_classes_AppManifest-bootstrapping_api_getModules) 434 0 R (__rgcms_classes_AppManifest-bootstrapping_bootstrapping) 452 0 R (__rgcms_classes_AppManifest-bootstrapping_bootstrapping_AppManifestAbstract) 459 0 R]
+/Names [(__rgcms) 13 0 R (__rgcms_classes_AppManifest-bootstrapping_api) 438 0 R (__rgcms_classes_AppManifest-bootstrapping_api_getAdditionalServices) 446 0 R (__rgcms_classes_AppManifest-bootstrapping_api_getAuthenticationMechanism) 451 0 R (__rgcms_classes_AppManifest-bootstrapping_api_getAuthorizationMechanism) 453 0 R (__rgcms_classes_AppManifest-bootstrapping_api_getConfigurationProperties) 458 0 R (__rgcms_classes_AppManifest-bootstrapping_api_getFixtures) 455 0 R (__rgcms_classes_AppManifest-bootstrapping_api_getModules) 441 0 R (__rgcms_classes_AppManifest-bootstrapping_bootstrapping) 459 0 R (__rgcms_classes_AppManifest-bootstrapping_bootstrapping_AppManifestAbstract) 466 0 R]
>>
endobj
-221 0 obj
+227 0 obj
<< /Limits [(_rgcms_methods_prefixes_hide) (_rgcms_methods_reserved_disable)]
-/Names [(_rgcms_methods_prefixes_hide) 213 0 R (_rgcms_methods_prefixes_modify) 219 0 R (_rgcms_methods_prefixes_removeFrom) 227 0 R (_rgcms_methods_prefixes_set) 232 0 R (_rgcms_methods_prefixes_validate) 236 0 R (_rgcms_methods_prefixes_validateAddTo) 245 0 R (_rgcms_methods_prefixes_validateRemoveFrom) 256 0 R (_rgcms_methods_reserved) 267 0 R (_rgcms_methods_reserved_cssClass) 286 0 R (_rgcms_methods_reserved_disable) 300 0 R]
+/Names [(_rgcms_methods_prefixes_hide) 219 0 R (_rgcms_methods_prefixes_modify) 225 0 R (_rgcms_methods_prefixes_removeFrom) 233 0 R (_rgcms_methods_prefixes_set) 238 0 R (_rgcms_methods_prefixes_validate) 242 0 R (_rgcms_methods_prefixes_validateAddTo) 251 0 R (_rgcms_methods_prefixes_validateRemoveFrom) 262 0 R (_rgcms_methods_reserved) 273 0 R (_rgcms_methods_reserved_cssClass) 292 0 R (_rgcms_methods_reserved_disable) 306 0 R]
>>
endobj
-222 0 obj
+228 0 obj
<< /Length 31226
>>
stream
@@ -41430,11 +41631,11 @@ Q
endstream
endobj
-223 0 obj
+229 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 222 0 R
+/Contents 228 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/Font << /F3.1 141 0 R
/F1.0 8 0 R
@@ -41444,13 +41645,13 @@ endobj
/F5.1 43 0 R
/F6.0 44 0 R
>>
-/XObject << /Stamp1 1049 0 R
+/XObject << /Stamp1 1031 0 R
>>
>>
-/Annots [224 0 R 225 0 R 226 0 R 228 0 R 229 0 R 230 0 R 231 0 R 233 0 R 234 0 R 235 0 R 237 0 R]
+/Annots [230 0 R 231 0 R 232 0 R 234 0 R 235 0 R 236 0 R 237 0 R 239 0 R 240 0 R 241 0 R 243 0 R]
>>
endobj
-224 0 obj
+230 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -41461,7 +41662,7 @@ endobj
/Type /Annot
>>
endobj
-225 0 obj
+231 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -41472,7 +41673,7 @@ endobj
/Type /Annot
>>
endobj
-226 0 obj
+232 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -41483,10 +41684,10 @@ endobj
/Type /Annot
>>
endobj
-227 0 obj
-[223 0 R /XYZ 0 750.33 null]
+233 0 obj
+[229 0 R /XYZ 0 750.33 null]
endobj
-228 0 obj
+234 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -41497,7 +41698,7 @@ endobj
/Type /Annot
>>
endobj
-229 0 obj
+235 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -41508,7 +41709,7 @@ endobj
/Type /Annot
>>
endobj
-230 0 obj
+236 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -41519,7 +41720,7 @@ endobj
/Type /Annot
>>
endobj
-231 0 obj
+237 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -41530,10 +41731,10 @@ endobj
/Type /Annot
>>
endobj
-232 0 obj
-[223 0 R /XYZ 0 341.4100000000004 null]
+238 0 obj
+[229 0 R /XYZ 0 341.4100000000004 null]
endobj
-233 0 obj
+239 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -41544,7 +41745,7 @@ endobj
/Type /Annot
>>
endobj
-234 0 obj
+240 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -41555,7 +41756,7 @@ endobj
/Type /Annot
>>
endobj
-235 0 obj
+241 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -41566,10 +41767,10 @@ endobj
/Type /Annot
>>
endobj
-236 0 obj
-[223 0 R /XYZ 0 236.7900000000004 null]
+242 0 obj
+[229 0 R /XYZ 0 236.7900000000004 null]
endobj
-237 0 obj
+243 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -41580,10 +41781,10 @@ endobj
/Type /Annot
>>
endobj
-238 0 obj
-[223 0 R /XYZ 0 100.61000000000035 null]
+244 0 obj
+[229 0 R /XYZ 0 100.61000000000035 null]
endobj
-239 0 obj
+245 0 obj
<< /Length 31476
>>
stream
@@ -43725,25 +43926,25 @@ Q
endstream
endobj
-240 0 obj
+246 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 239 0 R
+/Contents 245 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/Font << /F3.0 18 0 R
/F1.0 8 0 R
/F2.0 16 0 R
>>
-/XObject << /Stamp1 1049 0 R
+/XObject << /Stamp1 1031 0 R
>>
>>
>>
endobj
-241 0 obj
-[240 0 R /XYZ 0 342.19000000000005 null]
+247 0 obj
+[246 0 R /XYZ 0 342.19000000000005 null]
endobj
-242 0 obj
+248 0 obj
<< /Length 41329
>>
stream
@@ -46720,29 +46921,29 @@ Q
endstream
endobj
-243 0 obj
+249 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 242 0 R
+/Contents 248 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/Font << /F3.0 18 0 R
/F2.0 16 0 R
/F1.0 8 0 R
/F4.0 19 0 R
>>
-/XObject << /Stamp1 1049 0 R
+/XObject << /Stamp1 1031 0 R
>>
>>
>>
endobj
-244 0 obj
-[243 0 R /XYZ 0 521.31 null]
+250 0 obj
+[249 0 R /XYZ 0 521.31 null]
endobj
-245 0 obj
-[243 0 R /XYZ 0 101.43000000000006 null]
+251 0 obj
+[249 0 R /XYZ 0 101.43000000000006 null]
endobj
-246 0 obj
+252 0 obj
<< /Length 34147
>>
stream
@@ -49091,11 +49292,11 @@ Q
endstream
endobj
-247 0 obj
+253 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 246 0 R
+/Contents 252 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/Font << /F1.0 8 0 R
/F5.1 43 0 R
@@ -49103,13 +49304,13 @@ endobj
/F4.0 19 0 R
/F2.0 16 0 R
>>
-/XObject << /Stamp1 1049 0 R
+/XObject << /Stamp1 1031 0 R
>>
>>
-/Annots [248 0 R 249 0 R 250 0 R 251 0 R 252 0 R 253 0 R 254 0 R 255 0 R 257 0 R 258 0 R]
+/Annots [254 0 R 255 0 R 256 0 R 257 0 R 258 0 R 259 0 R 260 0 R 261 0 R 263 0 R 264 0 R]
>>
endobj
-248 0 obj
+254 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -49120,7 +49321,7 @@ endobj
/Type /Annot
>>
endobj
-249 0 obj
+255 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -49131,7 +49332,7 @@ endobj
/Type /Annot
>>
endobj
-250 0 obj
+256 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -49142,7 +49343,7 @@ endobj
/Type /Annot
>>
endobj
-251 0 obj
+257 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -49153,7 +49354,7 @@ endobj
/Type /Annot
>>
endobj
-252 0 obj
+258 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -49164,7 +49365,7 @@ endobj
/Type /Annot
>>
endobj
-253 0 obj
+259 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -49175,7 +49376,7 @@ endobj
/Type /Annot
>>
endobj
-254 0 obj
+260 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -49186,7 +49387,7 @@ endobj
/Type /Annot
>>
endobj
-255 0 obj
+261 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -49197,10 +49398,10 @@ endobj
/Type /Annot
>>
endobj
-256 0 obj
-[247 0 R /XYZ 0 369.22000000000014 null]
+262 0 obj
+[253 0 R /XYZ 0 369.22000000000014 null]
endobj
-257 0 obj
+263 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -49211,7 +49412,7 @@ endobj
/Type /Annot
>>
endobj
-258 0 obj
+264 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -49222,7 +49423,7 @@ endobj
/Type /Annot
>>
endobj
-259 0 obj
+265 0 obj
<< /Length 34031
>>
stream
@@ -51653,11 +51854,11 @@ Q
endstream
endobj
-260 0 obj
+266 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 259 0 R
+/Contents 265 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/Font << /F3.0 18 0 R
/F1.0 8 0 R
@@ -51665,13 +51866,13 @@ endobj
/F2.0 16 0 R
/F6.0 44 0 R
>>
-/XObject << /Stamp1 1049 0 R
+/XObject << /Stamp1 1031 0 R
>>
>>
-/Annots [261 0 R 262 0 R 263 0 R 264 0 R 265 0 R 266 0 R 268 0 R 269 0 R 270 0 R 271 0 R 272 0 R 273 0 R 274 0 R 275 0 R 276 0 R 277 0 R 278 0 R 279 0 R 280 0 R 281 0 R 282 0 R 283 0 R 284 0 R 285 0 R 288 0 R 289 0 R]
+/Annots [267 0 R 268 0 R 269 0 R 270 0 R 271 0 R 272 0 R 274 0 R 275 0 R 276 0 R 277 0 R 278 0 R 279 0 R 280 0 R 281 0 R 282 0 R 283 0 R 284 0 R 285 0 R 286 0 R 287 0 R 288 0 R 289 0 R 290 0 R 291 0 R 294 0 R 295 0 R]
>>
endobj
-261 0 obj
+267 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -51682,7 +51883,7 @@ endobj
/Type /Annot
>>
endobj
-262 0 obj
+268 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -51693,7 +51894,7 @@ endobj
/Type /Annot
>>
endobj
-263 0 obj
+269 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -51704,7 +51905,7 @@ endobj
/Type /Annot
>>
endobj
-264 0 obj
+270 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -51715,7 +51916,7 @@ endobj
/Type /Annot
>>
endobj
-265 0 obj
+271 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -51726,7 +51927,7 @@ endobj
/Type /Annot
>>
endobj
-266 0 obj
+272 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -51737,10 +51938,10 @@ endobj
/Type /Annot
>>
endobj
-267 0 obj
-[260 0 R /XYZ 0 611.45 null]
+273 0 obj
+[266 0 R /XYZ 0 611.45 null]
endobj
-268 0 obj
+274 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -51751,7 +51952,7 @@ endobj
/Type /Annot
>>
endobj
-269 0 obj
+275 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -51762,7 +51963,7 @@ endobj
/Type /Annot
>>
endobj
-270 0 obj
+276 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -51773,7 +51974,7 @@ endobj
/Type /Annot
>>
endobj
-271 0 obj
+277 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -51784,7 +51985,7 @@ endobj
/Type /Annot
>>
endobj
-272 0 obj
+278 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -51795,7 +51996,7 @@ endobj
/Type /Annot
>>
endobj
-273 0 obj
+279 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -51806,7 +52007,7 @@ endobj
/Type /Annot
>>
endobj
-274 0 obj
+280 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -51817,7 +52018,7 @@ endobj
/Type /Annot
>>
endobj
-275 0 obj
+281 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -51828,7 +52029,7 @@ endobj
/Type /Annot
>>
endobj
-276 0 obj
+282 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -51839,7 +52040,7 @@ endobj
/Type /Annot
>>
endobj
-277 0 obj
+283 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -51850,7 +52051,7 @@ endobj
/Type /Annot
>>
endobj
-278 0 obj
+284 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -51861,7 +52062,7 @@ endobj
/Type /Annot
>>
endobj
-279 0 obj
+285 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -51872,7 +52073,7 @@ endobj
/Type /Annot
>>
endobj
-280 0 obj
+286 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -51883,7 +52084,7 @@ endobj
/Type /Annot
>>
endobj
-281 0 obj
+287 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -51894,7 +52095,7 @@ endobj
/Type /Annot
>>
endobj
-282 0 obj
+288 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -51905,7 +52106,7 @@ endobj
/Type /Annot
>>
endobj
-283 0 obj
+289 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -51916,7 +52117,7 @@ endobj
/Type /Annot
>>
endobj
-284 0 obj
+290 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -51927,7 +52128,7 @@ endobj
/Type /Annot
>>
endobj
-285 0 obj
+291 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -51938,15 +52139,15 @@ endobj
/Type /Annot
>>
endobj
-286 0 obj
-[260 0 R /XYZ 0 195.55000000000015 null]
+292 0 obj
+[266 0 R /XYZ 0 195.55000000000015 null]
endobj
-287 0 obj
+293 0 obj
<< /Limits [(action-parameter-set) (dependent-choices)]
-/Names [(action-parameter-set) 241 0 R (adapter-classes) 758 0 R (alternative-approaches) 779 0 R (alternatives) 195 0 R (alternatives-2) 306 0 R (alternatives-3) 329 0 R (alternatives-4) 788 0 R (api) 566 0 R (api-2) 574 0 R (api-3) 584 0 R (api-4) 590 0 R (code-changesdto-code) 956 0 R (code-objectsdto-code) 962 0 R (code-specification-code) 752 0 R (code-specification2-code) 754 0 R (combining-specifications) 760 0 R (dependent-choices) 164 0 R]
+/Names [(action-parameter-set) 247 0 R (adapter-classes) 740 0 R (alternative-approaches) 761 0 R (alternatives) 198 0 R (alternatives-2) 312 0 R (alternatives-3) 335 0 R (alternatives-4) 770 0 R (api) 549 0 R (api-2) 557 0 R (api-3) 568 0 R (api-4) 574 0 R (code-changesdto-code) 938 0 R (code-objectsdto-code) 944 0 R (code-specification-code) 734 0 R (code-specification2-code) 738 0 R (combining-specifications) 742 0 R (dependent-choices) 164 0 R]
>>
endobj
-288 0 obj
+294 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -51957,7 +52158,7 @@ endobj
/Type /Annot
>>
endobj
-289 0 obj
+295 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -51968,7 +52169,7 @@ endobj
/Type /Annot
>>
endobj
-290 0 obj
+296 0 obj
<< /Length 14875
>>
stream
@@ -52994,23 +53195,23 @@ Q
endstream
endobj
-291 0 obj
+297 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 290 0 R
+/Contents 296 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/Font << /F1.0 8 0 R
/F3.0 18 0 R
>>
-/XObject << /I2 293 0 R
-/Stamp1 1049 0 R
+/XObject << /I2 299 0 R
+/Stamp1 1031 0 R
>>
>>
-/Annots [292 0 R 294 0 R 295 0 R 296 0 R 297 0 R]
+/Annots [298 0 R 300 0 R 301 0 R 302 0 R 303 0 R]
>>
endobj
-292 0 obj
+298 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -53021,7 +53222,7 @@ endobj
/Type /Annot
>>
endobj
-293 0 obj
+299 0 obj
<< /Type /XObject
/Subtype /Image
/Height 988
@@ -53437,7 +53638,7 @@ L
�� �ɠ\aXB =�+ K�# �'�>p�ai����� [���� � � � �zٺw}Z�����S{��F�� �7[��?|b[橽j��g�%���� � �MZގ�S{��|�V 0p�G ���� MC ��> 4��# 4���T��
endstream
endobj
-294 0 obj
+300 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -53448,7 +53649,7 @@ endobj
/Type /Annot
>>
endobj
-295 0 obj
+301 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -53459,7 +53660,7 @@ endobj
/Type /Annot
>>
endobj
-296 0 obj
+302 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -53470,7 +53671,7 @@ endobj
/Type /Annot
>>
endobj
-297 0 obj
+303 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -53481,7 +53682,7 @@ endobj
/Type /Annot
>>
endobj
-298 0 obj
+304 0 obj
<< /Length 28093
>>
stream
@@ -54704,7 +54905,7 @@ ET
0.694 0.129 0.275 scn
0.694 0.129 0.275 SCN
-0.449 Tw
+0.713 Tw
BT
48.24 246.4260000000002 Td
@@ -54719,7 +54920,7 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-0.449 Tw
+0.713 Tw
BT
158.49 246.4260000000002 Td
@@ -54734,10 +54935,10 @@ ET
0.694 0.129 0.275 scn
0.694 0.129 0.275 SCN
-0.449 Tw
+0.713 Tw
BT
-183.93680078124999 246.4260000000002 Td
+184.46486751302083 246.4260000000002 Td
/F3.0 10.5 Tf
<416374696f6e446f6d61696e4576656e74> Tj
ET
@@ -54749,12 +54950,12 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-0.449 Tw
+0.713 Tw
BT
-273.18680078125 246.4260000000002 Td
+273.7148675130208 246.4260000000002 Td
/F1.0 10.5 Tf
-[<2e20204120676f6f64207061747465726e20697320746f206d616b> 20.01953125 <65207468657365206e65737465642073746174696320636c61737365732e>] TJ
+[<2e204120676f6f64207061747465726e20697320746f206d616b> 20.01953125 <65207468657365206e65737465642073746174696320636c61737365732e>] TJ
ET
@@ -55373,11 +55574,11 @@ Q
endstream
endobj
-299 0 obj
+305 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 298 0 R
+/Contents 304 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/Font << /F2.0 16 0 R
/F3.0 18 0 R
@@ -55385,16 +55586,16 @@ endobj
/F4.0 19 0 R
/F1.1 175 0 R
>>
-/XObject << /Stamp1 1049 0 R
+/XObject << /Stamp1 1031 0 R
>>
>>
-/Annots [301 0 R 302 0 R 303 0 R 304 0 R 305 0 R]
+/Annots [307 0 R 308 0 R 309 0 R 310 0 R 311 0 R]
>>
endobj
-300 0 obj
-[299 0 R /XYZ 0 841.89 null]
+306 0 obj
+[305 0 R /XYZ 0 841.89 null]
endobj
-301 0 obj
+307 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -55405,7 +55606,7 @@ endobj
/Type /Annot
>>
endobj
-302 0 obj
+308 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -55416,7 +55617,7 @@ endobj
/Type /Annot
>>
endobj
-303 0 obj
+309 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -55427,7 +55628,7 @@ endobj
/Type /Annot
>>
endobj
-304 0 obj
+310 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -55438,7 +55639,7 @@ endobj
/Type /Annot
>>
endobj
-305 0 obj
+311 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -55449,11 +55650,11 @@ endobj
/Type /Annot
>>
endobj
-306 0 obj
-[299 0 R /XYZ 0 347.61000000000024 null]
+312 0 obj
+[305 0 R /XYZ 0 347.61000000000024 null]
endobj
-307 0 obj
-<< /Length 35797
+313 0 obj
+<< /Length 37264
>>
stream
q
@@ -55463,10 +55664,10 @@ q
52.240 805.890 m
543.040 805.890 l
545.249 805.890 547.040 804.099 547.040 801.890 c
-547.040 669.970 l
-547.040 667.761 545.249 665.970 543.040 665.970 c
-52.240 665.970 l
-50.031 665.970 48.240 667.761 48.240 669.970 c
+547.040 699.450 l
+547.040 697.241 545.249 695.450 543.040 695.450 c
+52.240 695.450 l
+50.031 695.450 48.240 697.241 48.240 699.450 c
48.240 801.890 l
48.240 804.099 50.031 805.890 52.240 805.890 c
h
@@ -55477,10 +55678,10 @@ f
52.240 805.890 m
543.040 805.890 l
545.249 805.890 547.040 804.099 547.040 801.890 c
-547.040 669.970 l
-547.040 667.761 545.249 665.970 543.040 665.970 c
-52.240 665.970 l
-50.031 665.970 48.240 667.761 48.240 669.970 c
+547.040 699.450 l
+547.040 697.241 545.249 695.450 543.040 695.450 c
+52.240 695.450 l
+50.031 695.450 48.240 697.241 48.240 699.450 c
48.240 801.890 l
48.240 804.099 50.031 805.890 52.240 805.890 c
h
@@ -56097,53 +56298,9 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 724.105 Td
-/F3.0 11 Tf
-<ca20202020202020> Tj
-ET
-
-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
-
-BT
-103.24000000000001 724.105 Td
-/F3.0 11 Tf
-<2e> Tj
-ET
-
-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
-
-BT
-108.74000000000001 724.105 Td
-/F3.0 11 Tf
-<2e> Tj
-ET
-
-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
-
-BT
-114.24000000000001 724.105 Td
-/F3.0 11 Tf
-<2e> Tj
-ET
-
-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
-
-BT
-59.24 709.365 Td
+515.74 738.845 Td
/F3.0 11 Tf
-<ca202020> Tj
+<20> Tj
ET
0.000 0.000 0.000 SCN
@@ -56152,7 +56309,7 @@ ET
0.200 0.200 0.200 SCN
BT
-81.24000000000001 709.365 Td
+521.24 738.845 Td
/F3.0 11 Tf
<7d> Tj
ET
@@ -56163,7 +56320,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 694.625 Td
+59.24 724.105 Td
/F3.0 11 Tf
<ca202020> Tj
ET
@@ -56174,7 +56331,7 @@ ET
0.200 0.200 0.200 SCN
BT
-81.24000000000001 694.625 Td
+81.24000000000001 724.105 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -56185,7 +56342,7 @@ ET
0.200 0.200 0.200 SCN
BT
-86.74000000000001 694.625 Td
+86.74000000000001 724.105 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -56196,7 +56353,7 @@ ET
0.200 0.200 0.200 SCN
BT
-92.24000000000001 694.625 Td
+92.24000000000001 724.105 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -56207,7 +56364,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 679.885 Td
+59.24 709.365 Td
/F3.0 11 Tf
<7d> Tj
ET
@@ -56218,7 +56375,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24 642.006 Td
+48.24 671.4859999999999 Td
/F1.0 10.5 Tf
<5468656e2c20656163682070726f70657274792f636f6c6c656374696f6e2f616374696f6e20656d69747320656974686572207468657365206261736520646f6d61696e206576656e7473206f72207468656972206f776e20737562636c6173733a> Tj
ET
@@ -56227,28 +56384,28 @@ ET
0.000 0.000 0.000 scn
q
0.961 0.961 0.961 scn
-52.240 626.190 m
-543.040 626.190 l
-545.249 626.190 547.040 624.399 547.040 622.190 c
-547.040 446.050 l
-547.040 443.841 545.249 442.050 543.040 442.050 c
-52.240 442.050 l
-50.031 442.050 48.240 443.841 48.240 446.050 c
-48.240 622.190 l
-48.240 624.399 50.031 626.190 52.240 626.190 c
+52.240 655.670 m
+543.040 655.670 l
+545.249 655.670 547.040 653.879 547.040 651.670 c
+547.040 519.750 l
+547.040 517.541 545.249 515.750 543.040 515.750 c
+52.240 515.750 l
+50.031 515.750 48.240 517.541 48.240 519.750 c
+48.240 651.670 l
+48.240 653.879 50.031 655.670 52.240 655.670 c
h
f
0.800 0.800 0.800 SCN
0.75 w
-52.240 626.190 m
-543.040 626.190 l
-545.249 626.190 547.040 624.399 547.040 622.190 c
-547.040 446.050 l
-547.040 443.841 545.249 442.050 543.040 442.050 c
-52.240 442.050 l
-50.031 442.050 48.240 443.841 48.240 446.050 c
-48.240 622.190 l
-48.240 624.399 50.031 626.190 52.240 626.190 c
+52.240 655.670 m
+543.040 655.670 l
+545.249 655.670 547.040 653.879 547.040 651.670 c
+547.040 519.750 l
+547.040 517.541 545.249 515.750 543.040 515.750 c
+52.240 515.750 l
+50.031 515.750 48.240 517.541 48.240 519.750 c
+48.240 651.670 l
+48.240 653.879 50.031 655.670 52.240 655.670 c
h
S
Q
@@ -56256,7 +56413,7 @@ Q
0.000 0.400 0.600 SCN
BT
-59.24 603.365 Td
+59.24 632.8449999999999 Td
/F3.0 11 Tf
<7075626c6963> Tj
ET
@@ -56267,7 +56424,7 @@ ET
0.200 0.200 0.200 SCN
BT
-92.24000000000001 603.365 Td
+92.24000000000001 632.8449999999999 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -56278,7 +56435,7 @@ ET
0.000 0.467 0.533 SCN
BT
-97.74000000000001 603.365 Td
+97.74000000000001 632.8449999999999 Td
/F3.0 11 Tf
<636c617373> Tj
ET
@@ -56289,7 +56446,7 @@ ET
0.200 0.200 0.200 SCN
BT
-125.24000000000001 603.365 Td
+125.24000000000001 632.8449999999999 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -56300,7 +56457,7 @@ ET
0.000 0.667 0.533 SCN
BT
-130.74 603.365 Td
+130.74 632.8449999999999 Td
/F3.0 11 Tf
<546f446f4974656d> Tj
ET
@@ -56311,7 +56468,7 @@ ET
0.200 0.200 0.200 SCN
BT
-174.74 603.365 Td
+174.74 632.8449999999999 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -56322,7 +56479,7 @@ ET
0.200 0.200 0.200 SCN
BT
-180.24 603.365 Td
+180.24 632.8449999999999 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -56333,7 +56490,7 @@ ET
0.200 0.200 0.200 SCN
BT
-185.74 603.365 Td
+185.74 632.8449999999999 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -56344,7 +56501,7 @@ ET
0.200 0.200 0.200 SCN
BT
-191.24 603.365 Td
+191.24 632.8449999999999 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -56355,7 +56512,7 @@ ET
0.200 0.200 0.200 SCN
BT
-196.74 603.365 Td
+196.74 632.8449999999999 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -56366,7 +56523,7 @@ ET
0.200 0.200 0.200 SCN
BT
-202.24 603.365 Td
+202.24 632.8449999999999 Td
/F3.0 11 Tf
<7b> Tj
ET
@@ -56377,7 +56534,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 588.625 Td
+59.24 618.1049999999999 Td
/F3.0 11 Tf
<ca202020> Tj
ET
@@ -56388,7 +56545,7 @@ ET
0.000 0.400 0.600 SCN
BT
-81.24000000000001 588.625 Td
+81.24000000000001 618.1049999999999 Td
/F3.0 11 Tf
<7075626c6963> Tj
ET
@@ -56399,7 +56556,7 @@ ET
0.200 0.200 0.200 SCN
BT
-114.24000000000001 588.625 Td
+114.24000000000001 618.1049999999999 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -56410,7 +56567,7 @@ ET
0.000 0.400 0.600 SCN
BT
-119.74000000000001 588.625 Td
+119.74000000000001 618.1049999999999 Td
/F3.0 11 Tf
<737461746963> Tj
ET
@@ -56421,7 +56578,7 @@ ET
0.200 0.200 0.200 SCN
BT
-152.74 588.625 Td
+152.74 618.1049999999999 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -56432,7 +56589,7 @@ ET
0.000 0.467 0.533 SCN
BT
-158.24 588.625 Td
+158.24 618.1049999999999 Td
/F3.0 11 Tf
<636c617373> Tj
ET
@@ -56443,7 +56600,7 @@ ET
0.200 0.200 0.200 SCN
BT
-185.74 588.625 Td
+185.74 618.1049999999999 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -56454,7 +56611,7 @@ ET
0.000 0.667 0.533 SCN
BT
-191.24 588.625 Td
+191.24 618.1049999999999 Td
/F3.0 11 Tf
<4465736372697074696f6e446f6d61696e4576656e74> Tj
ET
@@ -56465,9 +56622,9 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 573.885 Td
+312.24 618.1049999999999 Td
/F3.0 11 Tf
-<ca2020202020202020202020> Tj
+<20> Tj
ET
0.000 0.000 0.000 SCN
@@ -56476,7 +56633,7 @@ ET
0.000 0.400 0.600 SCN
BT
-125.24000000000001 573.885 Td
+317.74 618.1049999999999 Td
/F3.0 11 Tf
<657874656e6473> Tj
ET
@@ -56487,7 +56644,7 @@ ET
0.200 0.200 0.200 SCN
BT
-163.74 573.885 Td
+356.24 618.1049999999999 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -56498,7 +56655,7 @@ ET
0.200 0.200 0.200 SCN
BT
-169.24 573.885 Td
+361.74 618.1049999999999 Td
/F3.0 11 Tf
<50726f7065727479446f6d61696e4576656e74> Tj
ET
@@ -56509,7 +56666,7 @@ ET
0.200 0.200 0.200 SCN
BT
-273.74 573.885 Td
+466.24 618.1049999999999 Td
/F3.0 11 Tf
<3c> Tj
ET
@@ -56520,7 +56677,7 @@ ET
0.000 0.467 0.533 SCN
BT
-279.24 573.885 Td
+471.74 618.1049999999999 Td
/F3.0 11 Tf
<537472696e67> Tj
ET
@@ -56531,7 +56688,7 @@ ET
0.200 0.200 0.200 SCN
BT
-312.24 573.885 Td
+504.74 618.1049999999999 Td
/F3.0 11 Tf
<3e> Tj
ET
@@ -56542,7 +56699,7 @@ ET
0.200 0.200 0.200 SCN
BT
-317.74 573.885 Td
+510.24 618.1049999999999 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -56553,7 +56710,7 @@ ET
0.200 0.200 0.200 SCN
BT
-323.24 573.885 Td
+515.74 618.1049999999999 Td
/F3.0 11 Tf
<7b> Tj
ET
@@ -56564,53 +56721,9 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 559.145 Td
-/F3.0 11 Tf
-<ca20202020202020> Tj
-ET
-
-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
-
-BT
-103.24000000000001 559.145 Td
-/F3.0 11 Tf
-<2e> Tj
-ET
-
-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
-
-BT
-108.74000000000001 559.145 Td
+521.24 618.1049999999999 Td
/F3.0 11 Tf
-<2e> Tj
-ET
-
-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
-
-BT
-114.24000000000001 559.145 Td
-/F3.0 11 Tf
-<2e> Tj
-ET
-
-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
-
-BT
-59.24 544.405 Td
-/F3.0 11 Tf
-<ca202020> Tj
+<20> Tj
ET
0.000 0.000 0.000 SCN
@@ -56619,7 +56732,7 @@ ET
0.200 0.200 0.200 SCN
BT
-81.24000000000001 544.405 Td
+526.74 618.1049999999999 Td
/F3.0 11 Tf
<7d> Tj
ET
@@ -56630,7 +56743,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 529.6650000000001 Td
+59.24 603.365 Td
/F3.0 11 Tf
<ca202020> Tj
ET
@@ -56641,7 +56754,7 @@ ET
0.600 0.600 1.000 SCN
BT
-81.24000000000001 529.6650000000001 Td
+81.24000000000001 603.365 Td
/F3.0 11 Tf
<4050726f7065727479> Tj
ET
@@ -56652,7 +56765,7 @@ ET
0.200 0.200 0.200 SCN
BT
-130.74 529.6650000000001 Td
+130.74 603.365 Td
/F3.0 11 Tf
<28> Tj
ET
@@ -56663,7 +56776,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 514.9250000000001 Td
+59.24 588.625 Td
/F3.0 11 Tf
<ca20202020202020> Tj
ET
@@ -56674,7 +56787,7 @@ ET
0.200 0.200 0.200 SCN
BT
-103.24000000000001 514.9250000000001 Td
+103.24000000000001 588.625 Td
/F3.0 11 Tf
<646f6d61696e4576656e74> Tj
ET
@@ -56685,7 +56798,7 @@ ET
0.200 0.200 0.200 SCN
BT
-163.74 514.9250000000001 Td
+163.74 588.625 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -56696,7 +56809,7 @@ ET
0.200 0.200 0.200 SCN
BT
-169.24 514.9250000000001 Td
+169.24 588.625 Td
/F3.0 11 Tf
<3d> Tj
ET
@@ -56707,7 +56820,7 @@ ET
0.200 0.200 0.200 SCN
BT
-174.74 514.9250000000001 Td
+174.74 588.625 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -56718,7 +56831,7 @@ ET
0.200 0.200 0.200 SCN
BT
-180.24 514.9250000000001 Td
+180.24 588.625 Td
/F3.0 11 Tf
<4465736372697074696f6e446f6d61696e4576656e74> Tj
ET
@@ -56729,7 +56842,7 @@ ET
0.200 0.200 0.200 SCN
BT
-301.24 514.9250000000001 Td
+301.24 588.625 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -56740,7 +56853,7 @@ ET
0.200 0.200 0.200 SCN
BT
-306.74 514.9250000000001 Td
+306.74 588.625 Td
/F3.0 11 Tf
<636c617373> Tj
ET
@@ -56751,7 +56864,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 500.18500000000006 Td
+59.24 573.885 Td
/F3.0 11 Tf
<ca202020> Tj
ET
@@ -56762,7 +56875,7 @@ ET
0.200 0.200 0.200 SCN
BT
-81.24000000000001 500.18500000000006 Td
+81.24000000000001 573.885 Td
/F3.0 11 Tf
<29> Tj
ET
@@ -56773,7 +56886,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 485.44500000000005 Td
+59.24 559.145 Td
/F3.0 11 Tf
<ca202020> Tj
ET
@@ -56784,7 +56897,7 @@ ET
0.000 0.400 0.600 SCN
BT
-81.24000000000001 485.44500000000005 Td
+81.24000000000001 559.145 Td
/F3.0 11 Tf
<7075626c6963> Tj
ET
@@ -56795,7 +56908,7 @@ ET
0.200 0.200 0.200 SCN
BT
-114.24000000000001 485.44500000000005 Td
+114.24000000000001 559.145 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -56806,7 +56919,7 @@ ET
0.000 0.467 0.533 SCN
BT
-119.74000000000001 485.44500000000005 Td
+119.74000000000001 559.145 Td
/F3.0 11 Tf
<537472696e67> Tj
ET
@@ -56817,7 +56930,7 @@ ET
0.200 0.200 0.200 SCN
BT
-152.74 485.44500000000005 Td
+152.74 559.145 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -56828,7 +56941,7 @@ ET
0.200 0.200 0.200 SCN
BT
-158.24 485.44500000000005 Td
+158.24 559.145 Td
/F3.0 11 Tf
<6765744465736372697074696f6e> Tj
ET
@@ -56839,7 +56952,7 @@ ET
0.200 0.200 0.200 SCN
BT
-235.24 485.44500000000005 Td
+235.24 559.145 Td
/F3.0 11 Tf
<28> Tj
ET
@@ -56850,7 +56963,7 @@ ET
0.200 0.200 0.200 SCN
BT
-240.74 485.44500000000005 Td
+240.74 559.145 Td
/F3.0 11 Tf
<29> Tj
ET
@@ -56861,7 +56974,7 @@ ET
0.200 0.200 0.200 SCN
BT
-246.24 485.44500000000005 Td
+246.24 559.145 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -56872,7 +56985,7 @@ ET
0.200 0.200 0.200 SCN
BT
-251.74 485.44500000000005 Td
+251.74 559.145 Td
/F3.0 11 Tf
<7b> Tj
ET
@@ -56883,7 +56996,7 @@ ET
0.200 0.200 0.200 SCN
BT
-257.24 485.44500000000005 Td
+257.24 559.145 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -56894,7 +57007,7 @@ ET
0.200 0.200 0.200 SCN
BT
-262.74 485.44500000000005 Td
+262.74 559.145 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -56905,7 +57018,7 @@ ET
0.200 0.200 0.200 SCN
BT
-268.24 485.44500000000005 Td
+268.24 559.145 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -56916,7 +57029,7 @@ ET
0.200 0.200 0.200 SCN
BT
-273.74 485.44500000000005 Td
+273.74 559.145 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -56927,7 +57040,7 @@ ET
0.200 0.200 0.200 SCN
BT
-279.24 485.44500000000005 Td
+279.24 559.145 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -56938,7 +57051,7 @@ ET
0.200 0.200 0.200 SCN
BT
-284.74 485.44500000000005 Td
+284.74 559.145 Td
/F3.0 11 Tf
<7d> Tj
ET
@@ -56949,7 +57062,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 470.70500000000004 Td
+59.24 544.405 Td
/F3.0 11 Tf
<ca202020> Tj
ET
@@ -56960,7 +57073,7 @@ ET
0.200 0.200 0.200 SCN
BT
-81.24000000000001 470.70500000000004 Td
+81.24000000000001 544.405 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -56971,7 +57084,7 @@ ET
0.200 0.200 0.200 SCN
BT
-86.74000000000001 470.70500000000004 Td
+86.74000000000001 544.405 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -56982,7 +57095,7 @@ ET
0.200 0.200 0.200 SCN
BT
-92.24000000000001 470.70500000000004 Td
+92.24000000000001 544.405 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -56993,7 +57106,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 455.96500000000003 Td
+59.24 529.665 Td
/F3.0 11 Tf
<7d> Tj
ET
@@ -57004,7 +57117,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24 418.08600000000007 Td
+48.24 491.786 Td
/F1.0 10.5 Tf
<41207665746f696e6720737562736372696265722063616e207468656e2073756273637269626520746f2074686520646f6d61696e206576656e747320616e64207665746f206163636573732c2065673a> Tj
ET
@@ -57013,28 +57126,28 @@ ET
0.000 0.000 0.000 scn
q
0.961 0.961 0.961 scn
-52.240 402.270 m
-543.040 402.270 l
-545.249 402.270 547.040 400.479 547.040 398.270 c
-547.040 236.870 l
-547.040 234.661 545.249 232.870 543.040 232.870 c
-52.240 232.870 l
-50.031 232.870 48.240 234.661 48.240 236.870 c
-48.240 398.270 l
-48.240 400.479 50.031 402.270 52.240 402.270 c
+52.240 475.970 m
+543.040 475.970 l
+545.249 475.970 547.040 474.179 547.040 471.970 c
+547.040 310.570 l
+547.040 308.361 545.249 306.570 543.040 306.570 c
+52.240 306.570 l
+50.031 306.570 48.240 308.361 48.240 310.570 c
+48.240 471.970 l
+48.240 474.179 50.031 475.970 52.240 475.970 c
h
f
0.800 0.800 0.800 SCN
0.75 w
-52.240 402.270 m
-543.040 402.270 l
-545.249 402.270 547.040 400.479 547.040 398.270 c
-547.040 236.870 l
-547.040 234.661 545.249 232.870 543.040 232.870 c
-52.240 232.870 l
-50.031 232.870 48.240 234.661 48.240 236.870 c
-48.240 398.270 l
-48.240 400.479 50.031 402.270 52.240 402.270 c
+52.240 475.970 m
+543.040 475.970 l
+545.249 475.970 547.040 474.179 547.040 471.970 c
+547.040 310.570 l
+547.040 308.361 545.249 306.570 543.040 306.570 c
+52.240 306.570 l
+50.031 306.570 48.240 308.361 48.240 310.570 c
+48.240 471.970 l
+48.240 474.179 50.031 475.970 52.240 475.970 c
h
S
Q
@@ -57042,7 +57155,7 @@ Q
0.600 0.600 1.000 SCN
BT
-59.24 379.4450000000001 Td
+59.24 453.14500000000004 Td
/F3.0 11 Tf
<40446f6d61696e4f626a656374> Tj
ET
@@ -57053,7 +57166,7 @@ ET
0.000 0.400 0.600 SCN
BT
-59.24 364.7050000000001 Td
+59.24 438.40500000000003 Td
/F3.0 11 Tf
<7075626c6963> Tj
ET
@@ -57064,7 +57177,7 @@ ET
0.200 0.200 0.200 SCN
BT
-92.24000000000001 364.7050000000001 Td
+92.24000000000001 438.40500000000003 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -57075,7 +57188,7 @@ ET
0.000 0.467 0.533 SCN
BT
-97.74000000000001 364.7050000000001 Td
+97.74000000000001 438.40500000000003 Td
/F3.0 11 Tf
<636c617373> Tj
ET
@@ -57086,7 +57199,7 @@ ET
0.200 0.200 0.200 SCN
BT
-125.24000000000001 364.7050000000001 Td
+125.24000000000001 438.40500000000003 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -57097,7 +57210,7 @@ ET
0.000 0.667 0.533 SCN
BT
-130.74 364.7050000000001 Td
+130.74 438.40500000000003 Td
/F3.0 11 Tf
<5665746f4f75744f664f6666696365486f757273> Tj
ET
@@ -57108,7 +57221,7 @@ ET
0.200 0.200 0.200 SCN
BT
-240.74 364.7050000000001 Td
+240.74 438.40500000000003 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -57119,7 +57232,7 @@ ET
0.200 0.200 0.200 SCN
BT
-246.24 364.7050000000001 Td
+246.24 438.40500000000003 Td
/F3.0 11 Tf
<7b> Tj
ET
@@ -57130,7 +57243,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 349.9650000000001 Td
+59.24 423.665 Td
/F3.0 11 Tf
<ca202020> Tj
ET
@@ -57141,7 +57254,7 @@ ET
0.600 0.600 1.000 SCN
BT
-81.24000000000001 349.9650000000001 Td
+81.24000000000001 423.665 Td
/F3.0 11 Tf
<40537562736372696265> Tj
ET
@@ -57152,7 +57265,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 335.2250000000001 Td
+59.24 408.925 Td
/F3.0 11 Tf
<ca202020> Tj
ET
@@ -57163,7 +57276,7 @@ ET
0.000 0.400 0.600 SCN
BT
-81.24000000000001 335.2250000000001 Td
+81.24000000000001 408.925 Td
/F3.0 11 Tf
<7075626c6963> Tj
ET
@@ -57174,7 +57287,7 @@ ET
0.200 0.200 0.200 SCN
BT
-114.24000000000001 335.2250000000001 Td
+114.24000000000001 408.925 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -57185,7 +57298,7 @@ ET
0.000 0.467 0.533 SCN
BT
-119.74000000000001 335.2250000000001 Td
+119.74000000000001 408.925 Td
/F3.0 11 Tf
<766f6964> Tj
ET
@@ -57196,7 +57309,7 @@ ET
0.200 0.200 0.200 SCN
BT
-141.74 335.2250000000001 Td
+141.74 408.925 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -57207,7 +57320,7 @@ ET
0.200 0.200 0.200 SCN
BT
-147.24 335.2250000000001 Td
+147.24 408.925 Td
/F3.0 11 Tf
<6f6e> Tj
ET
@@ -57218,7 +57331,7 @@ ET
0.200 0.200 0.200 SCN
BT
-158.24 335.2250000000001 Td
+158.24 408.925 Td
/F3.0 11 Tf
<28> Tj
ET
@@ -57229,7 +57342,7 @@ ET
0.200 0.200 0.200 SCN
BT
-163.74 335.2250000000001 Td
+163.74 408.925 Td
/F3.0 11 Tf
<546f446f4974656d> Tj
ET
@@ -57240,7 +57353,7 @@ ET
0.200 0.200 0.200 SCN
BT
-207.74 335.2250000000001 Td
+207.74 408.925 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -57251,7 +57364,7 @@ ET
0.200 0.200 0.200 SCN
BT
-213.24 335.2250000000001 Td
+213.24 408.925 Td
/F3.0 11 Tf
<50726f7065727479446f6d61696e4576656e74> Tj
ET
@@ -57262,7 +57375,7 @@ ET
0.200 0.200 0.200 SCN
BT
-317.74 335.2250000000001 Td
+317.74 408.925 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -57273,7 +57386,7 @@ ET
0.200 0.200 0.200 SCN
BT
-323.24 335.2250000000001 Td
+323.24 408.925 Td
/F3.0 11 Tf
<6576> Tj
ET
@@ -57284,7 +57397,7 @@ ET
0.200 0.200 0.200 SCN
BT
-334.24 335.2250000000001 Td
+334.24 408.925 Td
/F3.0 11 Tf
<29> Tj
ET
@@ -57295,7 +57408,7 @@ ET
0.200 0.200 0.200 SCN
BT
-339.74 335.2250000000001 Td
+339.74 408.925 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -57306,7 +57419,7 @@ ET
0.200 0.200 0.200 SCN
BT
-345.24 335.2250000000001 Td
+345.24 408.925 Td
/F3.0 11 Tf
<7b> Tj
ET
@@ -57317,7 +57430,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 320.48500000000007 Td
+59.24 394.185 Td
/F3.0 11 Tf
<ca20202020202020> Tj
ET
@@ -57328,7 +57441,7 @@ ET
0.000 0.400 0.600 SCN
BT
-103.24000000000001 320.48500000000007 Td
+103.24000000000001 394.185 Td
/F3.0 11 Tf
<6966> Tj
ET
@@ -57339,7 +57452,7 @@ ET
0.200 0.200 0.200 SCN
BT
-114.24000000000001 320.48500000000007 Td
+114.24000000000001 394.185 Td
/F3.0 11 Tf
<28> Tj
ET
@@ -57350,7 +57463,7 @@ ET
0.200 0.200 0.200 SCN
BT
-119.74000000000001 320.48500000000007 Td
+119.74000000000001 394.185 Td
/F3.0 11 Tf
<21> Tj
ET
@@ -57361,7 +57474,7 @@ ET
0.200 0.200 0.200 SCN
BT
-125.24000000000001 320.48500000000007 Td
+125.24000000000001 394.185 Td
/F3.0 11 Tf
<63616c656e64617253657276696365> Tj
ET
@@ -57372,7 +57485,7 @@ ET
0.200 0.200 0.200 SCN
BT
-207.74 320.48500000000007 Td
+207.74 394.185 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -57383,7 +57496,7 @@ ET
0.200 0.200 0.200 SCN
BT
-213.24 320.48500000000007 Td
+213.24 394.185 Td
/F3.0 11 Tf
<69734f6666696365486f757273> Tj
ET
@@ -57394,7 +57507,7 @@ ET
0.200 0.200 0.200 SCN
BT
-284.74 320.48500000000007 Td
+284.74 394.185 Td
/F3.0 11 Tf
<28> Tj
ET
@@ -57405,7 +57518,7 @@ ET
0.200 0.200 0.200 SCN
BT
-290.24 320.48500000000007 Td
+290.24 394.185 Td
/F3.0 11 Tf
<636c6f636b> Tj
ET
@@ -57416,7 +57529,7 @@ ET
0.200 0.200 0.200 SCN
BT
-317.74 320.48500000000007 Td
+317.74 394.185 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -57427,7 +57540,7 @@ ET
0.200 0.200 0.200 SCN
BT
-323.24 320.48500000000007 Td
+323.24 394.185 Td
/F3.0 11 Tf
<746f646179> Tj
ET
@@ -57438,7 +57551,7 @@ ET
0.200 0.200 0.200 SCN
BT
-350.74 320.48500000000007 Td
+350.74 394.185 Td
/F3.0 11 Tf
<28> Tj
ET
@@ -57449,7 +57562,7 @@ ET
0.200 0.200 0.200 SCN
BT
-356.24 320.48500000000007 Td
+356.24 394.185 Td
/F3.0 11 Tf
<29> Tj
ET
@@ -57460,7 +57573,7 @@ ET
0.200 0.200 0.200 SCN
BT
-361.74 320.48500000000007 Td
+361.74 394.185 Td
/F3.0 11 Tf
<29> Tj
ET
@@ -57471,7 +57584,7 @@ ET
0.200 0.200 0.200 SCN
BT
-367.24 320.48500000000007 Td
+367.24 394.185 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -57482,7 +57595,7 @@ ET
0.200 0.200 0.200 SCN
BT
-372.74 320.48500000000007 Td
+372.74 394.185 Td
/F3.0 11 Tf
<7b> Tj
ET
@@ -57493,7 +57606,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 305.7450000000001 Td
+59.24 379.44500000000005 Td
/F3.0 11 Tf
<ca2020202020202020202020> Tj
ET
@@ -57504,7 +57617,7 @@ ET
0.200 0.200 0.200 SCN
BT
-125.24000000000001 305.7450000000001 Td
+125.24000000000001 379.44500000000005 Td
/F3.0 11 Tf
<6576> Tj
ET
@@ -57515,7 +57628,7 @@ ET
0.200 0.200 0.200 SCN
BT
-136.24 305.7450000000001 Td
+136.24 379.44500000000005 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -57526,7 +57639,7 @@ ET
0.200 0.200 0.200 SCN
BT
-141.74 305.7450000000001 Td
+141.74 379.44500000000005 Td
/F3.0 11 Tf
<7665746f> Tj
ET
@@ -57537,7 +57650,7 @@ ET
0.200 0.200 0.200 SCN
BT
-163.74 305.7450000000001 Td
+163.74 379.44500000000005 Td
/F3.0 11 Tf
<28> Tj
ET
@@ -57548,7 +57661,7 @@ ET
0.800 0.200 0.000 SCN
BT
-169.24 305.7450000000001 Td
+169.24 379.44500000000005 Td
/F3.0 11 Tf
<22> Tj
ET
@@ -57559,7 +57672,7 @@ ET
0.800 0.200 0.000 SCN
BT
-174.74 305.7450000000001 Td
+174.74 379.44500000000005 Td
/F3.0 11 Tf
<43616e6e6f74206d6f64696679206f626a65637473206f757473696465206f66206f666669636520686f757273> Tj
ET
@@ -57570,7 +57683,7 @@ ET
0.800 0.200 0.000 SCN
BT
-422.24 305.7450000000001 Td
+422.24 379.44500000000005 Td
/F3.0 11 Tf
<22> Tj
ET
@@ -57581,7 +57694,7 @@ ET
0.200 0.200 0.200 SCN
BT
-427.74 305.7450000000001 Td
+427.74 379.44500000000005 Td
/F3.0 11 Tf
<29> Tj
ET
@@ -57592,7 +57705,7 @@ ET
0.200 0.200 0.200 SCN
BT
-433.24 305.7450000000001 Td
+433.24 379.44500000000005 Td
/F3.0 11 Tf
<3b> Tj
ET
@@ -57603,7 +57716,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 291.0050000000001 Td
+59.24 364.70500000000004 Td
/F3.0 11 Tf
<ca20202020202020> Tj
ET
@@ -57614,7 +57727,7 @@ ET
0.200 0.200 0.200 SCN
BT
-103.24000000000001 291.0050000000001 Td
+103.24000000000001 364.70500000000004 Td
/F3.0 11 Tf
<7d> Tj
ET
@@ -57625,7 +57738,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 276.2650000000001 Td
+59.24 349.96500000000003 Td
/F3.0 11 Tf
<ca202020> Tj
ET
@@ -57636,7 +57749,7 @@ ET
0.200 0.200 0.200 SCN
BT
-81.24000000000001 276.2650000000001 Td
+81.24000000000001 349.96500000000003 Td
/F3.0 11 Tf
<7d> Tj
ET
@@ -57647,7 +57760,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 261.5250000000001 Td
+59.24 335.225 Td
/F3.0 11 Tf
<ca202020> Tj
ET
@@ -57658,7 +57771,7 @@ ET
0.200 0.200 0.200 SCN
BT
-81.24000000000001 261.5250000000001 Td
+81.24000000000001 335.225 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -57669,7 +57782,7 @@ ET
0.200 0.200 0.200 SCN
BT
-86.74000000000001 261.5250000000001 Td
+86.74000000000001 335.225 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -57680,7 +57793,7 @@ ET
0.200 0.200 0.200 SCN
BT
-92.24000000000001 261.5250000000001 Td
+92.24000000000001 335.225 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -57691,7 +57804,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 246.7850000000001 Td
+59.24 320.485 Td
/F3.0 11 Tf
<7d> Tj
ET
@@ -57702,7 +57815,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24 208.90600000000012 Td
+48.24 282.60600000000005 Td
/F1.0 10.5 Tf
[<4f6276696f75736c79207468657265d57320616e20617766756c206c6f74206d6f726520626f696c6572706c61746520686572652c20627574207468657265d57320616c736f2061206c6f74206d6f726520666c65786962696c697479> 89.84375 <2e>] TJ
ET
@@ -57713,7 +57826,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24 174.40600000000012 Td
+48.24 248.10600000000005 Td
/F2.0 13 Tf
<322e322e332e20> Tj
ET
@@ -57724,7 +57837,7 @@ ET
0.694 0.129 0.275 SCN
BT
-84.83500000000001 174.40600000000012 Td
+84.83500000000001 248.10600000000005 Td
/F3.0 13 Tf
<67657449642829> Tj
ET
@@ -57737,7 +57850,7 @@ ET
0.897 Tw
BT
-48.24 147.8460000000001 Td
+48.24 221.54600000000005 Td
/F1.0 10.5 Tf
<54686520> Tj
ET
@@ -57752,7 +57865,7 @@ ET
0.897 Tw
BT
-70.55667647058823 147.8460000000001 Td
+70.55667647058823 221.54600000000005 Td
/F3.0 10.5 Tf
<67657449642829> Tj
ET
@@ -57767,7 +57880,7 @@ ET
0.897 Tw
BT
-107.30667647058823 147.8460000000001 Td
+107.30667647058823 221.54600000000005 Td
/F1.0 10.5 Tf
<206d6574686f64206170706c696573206f6e6c7920746f20646f6d61696e2073657276696365732c20616e64206973207573656420746f2070726f76696465206120756e6971756520616c69617320666f7220746865> Tj
ET
@@ -57780,7 +57893,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24 132.0660000000001 Td
+48.24 205.76600000000005 Td
/F1.0 10.5 Tf
<646f6d61696e2073657276696365d57320636c617373206e616d652e> Tj
ET
@@ -57793,7 +57906,7 @@ ET
0.205 Tw
BT
-48.24 104.28600000000009 Td
+48.24 177.98600000000005 Td
/F1.0 10.5 Tf
[<546869732076616c7565206973207573656420696e7465726e616c6c7920746f2067656e6572> 20.01953125 <617465206120737472696e6720726570726573656e746174696f6e206f6620616e2073657276696365206964656e74697479202874686520>] TJ
ET
@@ -57808,7 +57921,7 @@ ET
0.205 Tw
BT
-500.93923718261715 104.28600000000009 Td
+500.93923718261715 177.98600000000005 Td
/F3.0 10.5 Tf
<4f6964> Tj
ET
@@ -57823,7 +57936,7 @@ ET
0.205 Tw
BT
-516.6892371826171 104.28600000000009 Td
+516.6892371826171 177.98600000000005 Td
/F1.0 10.5 Tf
<292e2054686973> Tj
ET
@@ -57836,7 +57949,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24 88.50600000000009 Td
+48.24 162.20600000000005 Td
/F1.0 10.5 Tf
[<63616e2061707065617220696e207365766572> 20.01953125 <616c20636f6e74657874732c20696e636c7564696e673a>] TJ
ET
@@ -57849,7 +57962,7 @@ ET
0.200 0.200 0.200 SCN
BT
-56.88050000000001 60.726000000000084 Td
+56.88050000000001 134.42600000000004 Td
/F1.0 10.5 Tf
<a5> Tj
ET
@@ -57864,7 +57977,7 @@ ET
5.114 Tw
BT
-66.24000000000001 60.726000000000084 Td
+66.24000000000001 134.42600000000004 Td
/F1.0 10.5 Tf
<6173207468652076616c7565206f6620> Tj
ET
@@ -57879,7 +57992,7 @@ ET
5.114 Tw
BT
-161.62366666666668 60.726000000000084 Td
+161.62366666666668 134.42600000000004 Td
/F3.0 10.5 Tf
<426f6f6b6d61726b236765744f626a656374547970652829> Tj
ET
@@ -57894,7 +58007,7 @@ ET
5.114 Tw
BT
-287.6236666666667 60.726000000000084 Td
+287.6236666666667 134.42600000000004 Td
/F1.0 10.5 Tf
<20616e6420696e2074686520> Tj
ET
@@ -57909,7 +58022,7 @@ ET
5.114 Tw
BT
-364.1598333333333 60.726000000000084 Td
+364.1598333333333 134.42600000000004 Td
/F3.0 10.5 Tf
<746f537472696e672829> Tj
ET
@@ -57924,7 +58037,7 @@ ET
5.114 Tw
BT
-416.6598333333333 60.726000000000084 Td
+416.6598333333333 134.42600000000004 Td
/F1.0 10.5 Tf
<2076616c7565206f6620> Tj
ET
@@ -57939,7 +58052,7 @@ ET
5.114 Tw
BT
-477.6030833333333 60.726000000000084 Td
+477.6030833333333 134.42600000000004 Td
/F3.0 10.5 Tf
<426f6f6b6d61726b> Tj
ET
@@ -57954,7 +58067,7 @@ ET
5.114 Tw
BT
-519.6030833333333 60.726000000000084 Td
+519.6030833333333 134.42600000000004 Td
/F1.0 10.5 Tf
<2028736565> Tj
ET
@@ -57963,60 +58076,11 @@ ET
0.000 Tw
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-q
-0.000 0.000 0.000 scn
-0.000 0.000 0.000 SCN
-1 w
-0 J
-0 j
-[ ] 0 d
-/Stamp1 Do
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-BT
-49.24 14.388 Td
-/F1.0 9 Tf
-<3234> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-Q
-Q
-
-endstream
-endobj
-308 0 obj
-<< /Type /Page
-/Parent 3 0 R
-/MediaBox [0 0 595.28 841.89]
-/Contents 307 0 R
-/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F3.0 18 0 R
-/F1.0 8 0 R
-/F2.0 16 0 R
->>
-/XObject << /Stamp1 1049 0 R
->>
->>
->>
-endobj
-309 0 obj
-[308 0 R /XYZ 0 193.09000000000012 null]
-endobj
-310 0 obj
-<< /Length 19086
->>
-stream
-q
-/DeviceRGB cs
0.694 0.129 0.275 scn
-/DeviceRGB CS
0.694 0.129 0.275 SCN
BT
-66.24000000000001 794.6759999999999 Td
+66.24000000000001 118.64600000000004 Td
/F3.0 10.5 Tf
<426f6f6b6d61726b53657276696365> Tj
ET
@@ -58027,7 +58091,7 @@ ET
0.200 0.200 0.200 SCN
BT
-144.99 794.6759999999999 Td
+144.99 118.64600000000004 Td
/F1.0 10.5 Tf
<29> Tj
ET
@@ -58040,7 +58104,7 @@ ET
0.200 0.200 0.200 SCN
BT
-56.88050000000001 772.896 Td
+56.88050000000001 96.86600000000004 Td
/F1.0 10.5 Tf
<a5> Tj
ET
@@ -58053,7 +58117,7 @@ ET
0.200 0.200 0.200 SCN
BT
-66.24000000000001 772.896 Td
+66.24000000000001 96.86600000000004 Td
/F1.0 10.5 Tf
<696e207468652073657269616c697a6174696f6e206f6620> Tj
ET
@@ -58064,7 +58128,7 @@ ET
0.694 0.129 0.275 SCN
BT
-175.44 772.896 Td
+175.44 96.86600000000004 Td
/F3.0 10.5 Tf
<4f696444746f> Tj
ET
@@ -58075,7 +58139,7 @@ ET
0.200 0.200 0.200 SCN
BT
-206.94000000000003 772.896 Td
+206.94000000000003 96.86600000000004 Td
/F1.0 10.5 Tf
<20696e2074686520> Tj
ET
@@ -58086,7 +58150,7 @@ ET
0.259 0.545 0.792 SCN
BT
-241.19100000000003 772.896 Td
+241.19100000000003 96.86600000000004 Td
/F1.0 10.5 Tf
<636f6d6d616e64> Tj
ET
@@ -58097,7 +58161,7 @@ ET
0.200 0.200 0.200 SCN
BT
-291.34950000000003 772.896 Td
+291.34950000000003 96.86600000000004 Td
/F1.0 10.5 Tf
<20616e6420> Tj
ET
@@ -58108,7 +58172,7 @@ ET
0.259 0.545 0.792 SCN
BT
-315.8985 772.896 Td
+315.8985 96.86600000000004 Td
/F1.0 10.5 Tf
[<696e746572> 20.01953125 <616374696f6e>] TJ
ET
@@ -58119,7 +58183,7 @@ ET
0.200 0.200 0.200 SCN
BT
-371.01279492187507 772.896 Td
+371.01279492187507 96.86600000000004 Td
/F1.0 10.5 Tf
<20736368656d6173> Tj
ET
@@ -58132,7 +58196,7 @@ ET
0.200 0.200 0.200 SCN
BT
-56.88050000000001 751.116 Td
+56.88050000000001 75.08600000000004 Td
/F1.0 10.5 Tf
<a5> Tj
ET
@@ -58145,7 +58209,7 @@ ET
0.200 0.200 0.200 SCN
BT
-66.24000000000001 751.116 Td
+66.24000000000001 75.08600000000004 Td
/F1.0 10.5 Tf
<696e207468652055524c73206f662074686520> Tj
ET
@@ -58156,7 +58220,7 @@ ET
0.259 0.545 0.792 SCN
BT
-157.50600000000003 751.116 Td
+157.50600000000003 75.08600000000004 Td
/F1.0 10.5 Tf
<5265737466756c4f626a6563747320766965776572> Tj
ET
@@ -58169,7 +58233,7 @@ ET
0.200 0.200 0.200 SCN
BT
-56.88050000000001 729.336 Td
+56.88050000000001 53.30600000000004 Td
/F1.0 10.5 Tf
<a5> Tj
ET
@@ -58182,7 +58246,7 @@ ET
0.200 0.200 0.200 SCN
BT
-66.24000000000001 729.336 Td
+66.24000000000001 53.30600000000004 Td
/F1.0 10.5 Tf
<696e207468652055524c73206f662074686520> Tj
ET
@@ -58193,7 +58257,7 @@ ET
0.259 0.545 0.792 SCN
BT
-157.50600000000003 729.336 Td
+157.50600000000003 53.30600000000004 Td
/F1.0 10.5 Tf
[<5769636b> 20.01953125 <657420766965776572>] TJ
ET
@@ -58204,18 +58268,123 @@ ET
0.200 0.200 0.200 SCN
BT
-229.609294921875 729.336 Td
+229.609294921875 53.30600000000004 Td
/F1.0 10.5 Tf
[<20287370656369666963616c6c79> 89.84375 <2c20666f7220626f6f6b6d61726b> 20.01953125 <656420616374696f6e7329>] TJ
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
+q
+0.000 0.000 0.000 scn
+0.000 0.000 0.000 SCN
+1 w
+0 J
+0 j
+[ ] 0 d
+/Stamp1 Do
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
BT
-48.24000000000001 697.5060000000001 Td
+49.24 14.388 Td
+/F1.0 9 Tf
+<3234> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+Q
+Q
+
+endstream
+endobj
+314 0 obj
+<< /Type /Page
+/Parent 3 0 R
+/MediaBox [0 0 595.28 841.89]
+/Contents 313 0 R
+/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
+/Font << /F3.0 18 0 R
+/F1.0 8 0 R
+/F2.0 16 0 R
+>>
+/XObject << /Stamp1 1031 0 R
+>>
+>>
+/Annots [316 0 R 317 0 R 318 0 R 319 0 R 320 0 R]
+>>
+endobj
+315 0 obj
+[314 0 R /XYZ 0 266.7900000000001 null]
+endobj
+316 0 obj
+<< /Border [0 0 0]
+/A << /Type /Action
+/S /URI
+/URI (../rgsvc/rgsvc.pdf#_rgsvc_integration-api_BookmarkService)
+>>
+/Subtype /Link
+/Rect [66.24000000000001 117.17600000000004 144.99 127.67600000000004]
+/Type /Annot
+>>
+endobj
+317 0 obj
+<< /Border [0 0 0]
+/A << /Type /Action
+/S /URI
+/URI (../rgcms/rgcms.pdf#_rgcms_schema-cmd)
+>>
+/Subtype /Link
+/Rect [241.19100000000003 93.80000000000004 291.34950000000003 108.08000000000004]
+/Type /Annot
+>>
+endobj
+318 0 obj
+<< /Border [0 0 0]
+/A << /Type /Action
+/S /URI
+/URI (../rgcms/rgcms.pdf#_rgcms_schema-ixn)
+>>
+/Subtype /Link
+/Rect [315.8985 93.80000000000004 371.01279492187507 108.08000000000004]
+/Type /Annot
+>>
+endobj
+319 0 obj
+<< /Border [0 0 0]
+/A << /Type /Action
+/S /URI
+/URI (../ugvro/ugvro.pdf)
+>>
+/Subtype /Link
+/Rect [157.50600000000003 72.02000000000004 266.1705 86.30000000000004]
+/Type /Annot
+>>
+endobj
+320 0 obj
+<< /Border [0 0 0]
+/A << /Type /Action
+/S /URI
+/URI (../ugvw/ugvw.pdf)
+>>
+/Subtype /Link
+/Rect [157.50600000000003 50.24000000000004 229.609294921875 64.52000000000004]
+/Type /Annot
+>>
+endobj
+321 0 obj
+<< /Length 20976
+>>
+stream
+q
+/DeviceRGB cs
+0.200 0.200 0.200 scn
+/DeviceRGB CS
+0.200 0.200 0.200 SCN
+
+BT
+48.24000000000001 794.6759999999999 Td
/F2.0 10.5 Tf
<4578616d706c65> Tj
ET
@@ -58226,7 +58395,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24000000000001 671.6760000000002 Td
+48.24000000000001 768.846 Td
/F1.0 10.5 Tf
[<46> 40.0390625 <6f72206578616d706c653a>] TJ
ET
@@ -58235,28 +58404,28 @@ ET
0.000 0.000 0.000 scn
q
0.961 0.961 0.961 scn
-52.240 655.860 m
-543.040 655.860 l
-545.249 655.860 547.040 654.069 547.040 651.860 c
-547.040 564.160 l
-547.040 561.951 545.249 560.160 543.040 560.160 c
-52.240 560.160 l
-50.031 560.160 48.240 561.951 48.240 564.160 c
-48.240 651.860 l
-48.240 654.069 50.031 655.860 52.240 655.860 c
+52.240 753.030 m
+543.040 753.030 l
+545.249 753.030 547.040 751.239 547.040 749.030 c
+547.040 661.330 l
+547.040 659.121 545.249 657.330 543.040 657.330 c
+52.240 657.330 l
+50.031 657.330 48.240 659.121 48.240 661.330 c
+48.240 749.030 l
+48.240 751.239 50.031 753.030 52.240 753.030 c
h
f
0.800 0.800 0.800 SCN
0.75 w
-52.240 655.860 m
-543.040 655.860 l
-545.249 655.860 547.040 654.069 547.040 651.860 c
-547.040 564.160 l
-547.040 561.951 545.249 560.160 543.040 560.160 c
-52.240 560.160 l
-50.031 560.160 48.240 561.951 48.240 564.160 c
-48.240 651.860 l
-48.240 654.069 50.031 655.860 52.240 655.860 c
+52.240 753.030 m
+543.040 753.030 l
+545.249 753.030 547.040 751.239 547.040 749.030 c
+547.040 661.330 l
+547.040 659.121 545.249 657.330 543.040 657.330 c
+52.240 657.330 l
+50.031 657.330 48.240 659.121 48.240 661.330 c
+48.240 749.030 l
+48.240 751.239 50.031 753.030 52.240 753.030 c
h
S
Q
@@ -58264,7 +58433,7 @@ Q
0.600 0.600 1.000 SCN
BT
-59.24000000000001 633.0350000000002 Td
+59.24000000000001 730.205 Td
/F3.0 11 Tf
<40446f6d61696e53657276696365> Tj
ET
@@ -58275,7 +58444,7 @@ ET
0.000 0.400 0.600 SCN
BT
-59.24000000000001 618.2950000000002 Td
+59.24000000000001 715.465 Td
/F3.0 11 Tf
<7075626c6963> Tj
ET
@@ -58286,7 +58455,7 @@ ET
0.200 0.200 0.200 SCN
BT
-92.24000000000001 618.2950000000002 Td
+92.24000000000001 715.465 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -58297,7 +58466,7 @@ ET
0.000 0.467 0.533 SCN
BT
-97.74000000000001 618.2950000000002 Td
+97.74000000000001 715.465 Td
/F3.0 11 Tf
<636c617373> Tj
ET
@@ -58308,7 +58477,7 @@ ET
0.200 0.200 0.200 SCN
BT
-125.24000000000001 618.2950000000002 Td
+125.24000000000001 715.465 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -58319,7 +58488,7 @@ ET
0.000 0.667 0.533 SCN
BT
-130.74 618.2950000000002 Td
+130.74 715.465 Td
/F3.0 11 Tf
<4f726465724d656e75> Tj
ET
@@ -58330,7 +58499,7 @@ ET
0.200 0.200 0.200 SCN
BT
-180.24 618.2950000000002 Td
+180.24 715.465 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -58341,7 +58510,7 @@ ET
0.200 0.200 0.200 SCN
BT
-185.74 618.2950000000002 Td
+185.74 715.465 Td
/F3.0 11 Tf
<7b> Tj
ET
@@ -58352,7 +58521,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24000000000001 603.5550000000003 Td
+59.24000000000001 700.7250000000001 Td
/F3.0 11 Tf
<ca202020> Tj
ET
@@ -58363,7 +58532,7 @@ ET
0.200 0.200 0.200 SCN
BT
-81.24000000000001 603.5550000000003 Td
+81.24000000000001 700.7250000000001 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -58374,7 +58543,7 @@ ET
0.200 0.200 0.200 SCN
BT
-86.74000000000001 603.5550000000003 Td
+86.74000000000001 700.7250000000001 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -58385,7 +58554,7 @@ ET
0.200 0.200 0.200 SCN
BT
-92.24000000000001 603.5550000000003 Td
+92.24000000000001 700.7250000000001 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -58396,7 +58565,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24000000000001 588.8150000000003 Td
+59.24000000000001 685.9850000000001 Td
/F3.0 11 Tf
<ca202020> Tj
ET
@@ -58407,7 +58576,7 @@ ET
0.200 0.200 0.200 SCN
BT
-81.24000000000001 588.8150000000003 Td
+81.24000000000001 685.9850000000001 Td
/F3.0 11 Tf
<7075626c6963> Tj
ET
@@ -58418,7 +58587,7 @@ ET
0.200 0.200 0.200 SCN
BT
-114.24000000000001 588.8150000000003 Td
+114.24000000000001 685.9850000000001 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -58429,7 +58598,7 @@ ET
0.000 0.467 0.533 SCN
BT
-119.74000000000001 588.8150000000003 Td
+119.74000000000001 685.9850000000001 Td
/F3.0 11 Tf
<537472696e67> Tj
ET
@@ -58440,7 +58609,7 @@ ET
0.200 0.200 0.200 SCN
BT
-152.74 588.8150000000003 Td
+152.74 685.9850000000001 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -58451,7 +58620,7 @@ ET
0.200 0.200 0.200 SCN
BT
-158.24 588.8150000000003 Td
+158.24 685.9850000000001 Td
/F3.0 11 Tf
<6765744964> Tj
ET
@@ -58462,7 +58631,7 @@ ET
0.200 0.200 0.200 SCN
BT
-185.74 588.8150000000003 Td
+185.74 685.9850000000001 Td
/F3.0 11 Tf
<28> Tj
ET
@@ -58473,7 +58642,7 @@ ET
0.200 0.200 0.200 SCN
BT
-191.24 588.8150000000003 Td
+191.24 685.9850000000001 Td
/F3.0 11 Tf
<29> Tj
ET
@@ -58484,7 +58653,7 @@ ET
0.200 0.200 0.200 SCN
BT
-196.74 588.8150000000003 Td
+196.74 685.9850000000001 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -58495,7 +58664,7 @@ ET
0.200 0.200 0.200 SCN
BT
-202.24 588.8150000000003 Td
+202.24 685.985000000000
<TRUNCATED>
[02/39] isis-site git commit: ISIS-1810: updates docs for 2.0.0-M1
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/274edd1d/content/versions/current/migration-notes/migration-notes.html
----------------------------------------------------------------------
diff --git a/content/versions/current/migration-notes/migration-notes.html b/content/versions/current/migration-notes/migration-notes.html
index 7a37dd7..192bb88 100644
--- a/content/versions/current/migration-notes/migration-notes.html
+++ b/content/versions/current/migration-notes/migration-notes.html
@@ -381,13 +381,13 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-DomainService">@DomainService</a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-DomainService">@DomainService</a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-DomainServiceLayout">@DomainServiceLayout</a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-DomainServiceLayout">@DomainServiceLayout</a></p>
</div>
</div></td>
</tr>
@@ -401,13 +401,13 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-DomainObject">@DomainObject</a><br> <a href="../guides/rgant/rgant.html#_rgant-ViewModel">@ViewModel</a><br> <a href="../guides/rgant/rgant.html#_rgant-MemberGroupLayout">@MemberGroupLayout</a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-DomainObject">@DomainObject</a><br> <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-ViewModel">@ViewModel</a><br> <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-MemberGroupLayout">@MemberGroupLayout</a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-DomainObjectLayout">@DomainObjectLayout</a><br> <a href="../guides/rgant/rgant.html#_rgant-ViewModelLayout">@ViewModelLayout</a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-DomainObjectLayout">@DomainObjectLayout</a><br> <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-ViewModelLayout">@ViewModelLayout</a></p>
</div>
</div></td>
</tr>
@@ -421,13 +421,13 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-Action">@Action</a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-Action">@Action</a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-ActionLayout">@ActionLayout</a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-ActionLayout">@ActionLayout</a></p>
</div>
</div></td>
</tr>
@@ -441,13 +441,13 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-Parameter">@Parameter</a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-Parameter">@Parameter</a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-ParameterLayout">@ParameterLayout</a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-ParameterLayout">@ParameterLayout</a></p>
</div>
</div></td>
</tr>
@@ -461,13 +461,13 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-Property">@Property</a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-Property">@Property</a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-PropertyLayout">@PropertyLayout</a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-PropertyLayout">@PropertyLayout</a></p>
</div>
</div></td>
</tr>
@@ -481,13 +481,13 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-Collection">@Collection</a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-Collection">@Collection</a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-CollectionLayout">@CollectionLayout</a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-CollectionLayout">@CollectionLayout</a></p>
</div>
</div></td>
</tr>
@@ -507,7 +507,7 @@ table.CodeRay td.code>pre{padding:0}
</ul>
</div>
<div class="paragraph">
- <p>Prior to v2.0.0, several annotation attributes were defined as booleans. In order to support <a href="#__migration-notes_1.15.0-to-1.16.0_meta-annotations">meta annotations</a>, these have been replaced by enums which also include a <code>NOT_SPECIFIED</code> value. Other enums have been extended (where necessary) to also have a <code>NOT_SPECIFIED</code> value. In all cases <code>NOT_SPECIFIED</code> is the new default.</p>
+ <p>Prior to v2.0.0, several annotation attributes were defined as booleans. In order to support <a href="https://isis.apache.org/versions/2.0.0-M1/migration-notes/migration-notes.html#__migration-notes_1.15.0-to-1.16.0_meta-annotations">meta annotations</a>, these have been replaced by enums which also include a <code>NOT_SPECIFIED</code> value. Other enums have been extended (where necessary) to also have a <code>NOT_SPECIFIED</code> value. In all cases <code>NOT_SPECIFIED</code> is the new default.</p>
</div>
<table class="tableblock frame-all grid-all spread">
<caption class="title">
@@ -530,13 +530,13 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top" rowspan="7">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-Action"><code>@Action</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-Action"><code>@Action</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-Action_command"><code>command</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-Action_command"><code>command</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -550,7 +550,7 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-Action_hidden"><code>hidden</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-Action_hidden"><code>hidden</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -564,7 +564,7 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-Action_invokeOn"><code>invokeOn</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-Action_invokeOn"><code>invokeOn</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -578,7 +578,7 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-Action_publishing"><code>publishing</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-Action_publishing"><code>publishing</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -592,7 +592,7 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-Action_publishing"><code>publishing</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-Action_publishing"><code>publishing</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -606,7 +606,7 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-Action_restrictTo"><code>restrictTo</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-Action_restrictTo"><code>restrictTo</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -620,7 +620,7 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-Action_semantics"><code>semantics</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-Action_semantics"><code>semantics</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -634,13 +634,13 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top" rowspan="3">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-ActionLayout"><code>@ActionLayout</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-ActionLayout"><code>@ActionLayout</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-ActionLayout_bookmarking"><code>bookmarking</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-ActionLayout_bookmarking"><code>bookmarking</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -654,7 +654,7 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-ActionLayout_contributed"><code>contributed</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-ActionLayout_contributed"><code>contributed</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -668,7 +668,7 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-ActionLayout_position"><code>position</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-ActionLayout_position"><code>position</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -682,13 +682,13 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top" rowspan="3">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-Collection"><code>@Collection</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-Collection"><code>@Collection</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-Collection_hidden"><code>hidden</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-Collection_hidden"><code>hidden</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -702,7 +702,7 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-Collection_editing"><code>editing</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-Collection_editing"><code>editing</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -716,7 +716,7 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-Collection_mementoSerialization"><code>mementoSerialization</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-Collection_mementoSerialization"><code>mementoSerialization</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -730,13 +730,13 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top" rowspan="4">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-DomainObject"><code>@DomainObject</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-DomainObject"><code>@DomainObject</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-DomainObject_auditing"><code>auditing</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-DomainObject_auditing"><code>auditing</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -750,7 +750,7 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-DomainObject_bounding"><code>bounding</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-DomainObject_bounding"><code>bounding</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -764,7 +764,7 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-DomainObject_editing"><code>editing</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-DomainObject_editing"><code>editing</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -778,7 +778,7 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-DomainObject_publishing"><code>publishing</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-DomainObject_publishing"><code>publishing</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -792,13 +792,13 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-DomainObjectLayout"><code>@DomainObjectLayout</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-DomainObjectLayout"><code>@DomainObjectLayout</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-DomainObjectLayout_bookmarking"><code>bookmarking</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-DomainObjectLayout_bookmarking"><code>bookmarking</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -812,13 +812,13 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-Parameter"><code>@Parameter</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-Parameter"><code>@Parameter</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-Parameter_optionality"><code>optionality</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-Parameter_optionality"><code>optionality</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -832,13 +832,13 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top" rowspan="2">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-ParameterLayout"><code>@ParameterLayout</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-ParameterLayout"><code>@ParameterLayout</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-ParameterLayout_labelPosition"><code>labelPosition</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-ParameterLayout_labelPosition"><code>labelPosition</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -852,7 +852,7 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-ParameterLayout_renderDay"><code>renderDay</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-ParameterLayout_renderDay"><code>renderDay</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -866,13 +866,13 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top" rowspan="6">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-Property"><code>@Property</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-Property"><code>@Property</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-Property_commandReification"><code>commandReification</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-Property_commandReification"><code>commandReification</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -886,7 +886,7 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-Property_editing"><code>editing</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-Property_editing"><code>editing</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -900,7 +900,7 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-Property_hidden"><code>hidden</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-Property_hidden"><code>hidden</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -914,7 +914,7 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-Property_mementoSerialization"><code>mementoSerialization</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-Property_mementoSerialization"><code>mementoSerialization</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -928,7 +928,7 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-Property_optionality"><code>optionality</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-Property_optionality"><code>optionality</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -942,7 +942,7 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-Property_publishing"><code>publishing</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-Property_publishing"><code>publishing</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -956,13 +956,13 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top" rowspan="5">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-PropertyLayout"><code>@PropertyLayout</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-PropertyLayout"><code>@PropertyLayout</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-PropertyLayout_labelPosition"><code>labelPosition</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-PropertyLayout_labelPosition"><code>labelPosition</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -976,7 +976,7 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-PropertyLayout_promptStyle"><code>promptStyle</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-PropertyLayout_promptStyle"><code>promptStyle</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -990,7 +990,7 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-PropertyLayout_renderDay"><code>renderDay</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-PropertyLayout_renderDay"><code>renderDay</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -1004,7 +1004,7 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-PropertyLayout_repainting"><code>repainting</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-PropertyLayout_repainting"><code>repainting</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -1018,13 +1018,13 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-ViewModelLayout"><code>@ViewModelLayout</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-ViewModelLayout"><code>@ViewModelLayout</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-ViewModelLayout_bookmarking"><code>bookmarking</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-ViewModelLayout_bookmarking"><code>bookmarking</code></a></p>
</div>
</div></td>
</tr>
@@ -1065,61 +1065,65 @@ table.CodeRay td.code>pre{padding:0}
<tbody>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@Action</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@Action</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>publishingPayloadFactory()</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>publishingPayloadFactory()</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p>Removed, use the simpler <a href="../guides/rgsvc/rgsvc.html#PublisherService">PublisherService</a> SPI instead.</p>
+ <p>Removed, use the simpler <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgsvc/rgsvc.html#PublisherService">PublisherService</a> SPI instead.</p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@ActionInteraction</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@ActionInteraction</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant_Action_domainEvent"><code>@Action#domainEvent()</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Action_domainEvent"><code>@Action#domainEvent()</code></a></p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@ActionOrder</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@ActionOrder</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant_MemberOrder"><code>@MemberOrder()</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_MemberOrder"><code>@MemberOrder()</code></a></p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@Aggregated</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@Aggregated</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
@@ -1129,414 +1133,429 @@ table.CodeRay td.code>pre{padding:0}
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@Auditable
-(JDO applib)</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@Auditable</code> (JDO applib)</p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant_DomainObject_audited"><code>@DomainObject#auditing()</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_DomainObject_audited"><code>@DomainObject#auditing()</code></a></p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@Audited</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@Audited</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant_DomainObject_audited"><code>@DomainObject#auditing()</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_DomainObject_audited"><code>@DomainObject#auditing()</code></a></p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@AutoComplete</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@AutoComplete</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant_DomainObject_autoComplete"><code>@DomainObject#autoComplete()</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_DomainObject_autoComplete"><code>@DomainObject#autoComplete()</code></a></p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@ActionSemantics</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@ActionSemantics</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant_Action_semantics"><code>@Action#semantics()</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Action_semantics"><code>@Action#semantics()</code></a></p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@Bookmarkable</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@Bookmarkable</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant_DomainObject_bookmarking"><code>@DomainObject#bookmarking()</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_DomainObject_bookmarking"><code>@DomainObject#bookmarking()</code></a></p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@Bounded</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@Bounded</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant_DomainObject_bounding"><code>@DomainObject#bounding()</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_DomainObject_bounding"><code>@DomainObject#bounding()</code></a></p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@Bulk</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@Bulk</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant_Action_invokeOn"><code>@Action#invokeOn()</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Action_invokeOn"><code>@Action#invokeOn()</code></a></p>
</div>
<div class="paragraph">
- <p>Similarly, the <code>Bulk.InteractionContext</code> domain service is replaced with the <a href="../guides/rgsvc/rgsvc.html#ActionInvocationContext">ActionInvocationContext</a> domain service.</p>
+ <p>Similarly, the <code>Bulk.InteractionContext</code> domain service is replaced with the <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgsvc/rgsvc.html#ActionInvocationContext">ActionInvocationContext</a> domain service.</p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@Collection</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@Collection</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>notPersisted</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>notPersisted</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p>Removed, replaced with <a href="../guides/rgant/rgant.html#_rgant_Collection_mementoSerialization"><code>@Collection#mementoSerialization()</code></a></p>
+ <p>Removed, replaced with <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Collection_mementoSerialization"><code>@Collection#mementoSerialization()</code></a></p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@CollectionInteraction</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@CollectionInteraction</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant_Collection_domainEvent"><code>@Collection #domainEvent()</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Collection_domainEvent"><code>@Collection #domainEvent()</code></a></p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@CollectionLayout</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@CollectionLayout</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>render()</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>render</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant_CollectionLayout_defaultView"><code>@CollectionLayout#defaultView()</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_CollectionLayout_defaultView"><code>@CollectionLayout#defaultView()</code></a></p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@Command</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@Command</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant_Action_command"><code>@Action#command()</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Action_command"><code>@Action#command()</code></a></p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@CssClass</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@CssClass</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p>Either <a href="../guides/rgant/rgant.html#_rgant_ActionLayout_cssClass"><code>@ActionLayout#cssClass()</code></a>, <a href="../guides/rgant/rgant.html#_rgant_PropertyLayout_cssClass"><code>@PropertyLayout#cssClass()</code></a>, <a href="../guides/rgant/rgant.html#_rgant_CollectionLayout_cssClass"><code>@CollectionLayout#cssClass()</code></a>, <a href="../guides/rgant/rgant.html#_rgant_ParameterLayout_cssClass"><code>@ParameterLayout#cssClass()</code></a>, <a href="../guides/rgant/rgant.html#_rgant_DomainObjectLayout_cssClass"><code>@DomainObjectLayout#cssClass()</code></a> or <a href="../guides/rgant/rgant.html#_rgant_ViewModelLayout_cssClass"><code>@ViewModelLayout#cssClass()</code></a>.</p>
+ <p>Either <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_ActionLayout_cssClass"><code>@ActionLayout#cssClass()</code></a>, <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_PropertyLayout_cssClass"><code>@PropertyLayout#cssClass()</code></a>, <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_CollectionLayout_cssClass"><code>@CollectionLayout#cssClass()</code></a>, <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_ParameterLayout_cssClass"><code>@ParameterLayout#cssClass()</code></a>, <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_DomainObjectLayout_cssClass"><code>@DomainObjectLayout#cssClass()</code></a> or <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_ViewModelLayout_cssClass"><code>@ViewModelLayout#cssClass()</code></a>.</p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@CssClassFa</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@CssClassFa</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p>Either <a href="../guides/rgant/rgant.html#_rgant_ActionLayout_cssClassFa"><code>@ActionLayout#cssClassFa()</code></a>, <a href="../guides/rgant/rgant.html#_rgant_DomainObjectLayout_cssClassFa"><code>@DomainObjectLayout#cssClassFa()</code></a> or <a href="../guides/rgant/rgant.html#_rgant_ViewModelLayout_cssClassFa"><code>@ViewModelLayout#cssClassFa()</code></a>.</p>
+ <p>Either <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_ActionLayout_cssClassFa"><code>@ActionLayout#cssClassFa()</code></a>, <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_DomainObjectLayout_cssClassFa"><code>@DomainObjectLayout#cssClassFa()</code></a> or <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_ViewModelLayout_cssClassFa"><code>@ViewModelLayout#cssClassFa()</code></a>.</p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@Debug</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@Debug</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant_Action_restrictTo"><code>@Action#restrictTo()</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Action_restrictTo"><code>@Action#restrictTo()</code></a></p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@DescribedAs</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@DescribedAs</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p>Either <a href="../guides/rgant/rgant.html#_rgant_ActionLayout_describedAs"><code>@ActionLayout#describedAs()</code></a>, <a href="../guides/rgant/rgant.html#_rgant_PropertyLayout_describedAs"><code>@PropertyLayout#describedAs()</code></a>, <a href="../guides/rgant/rgant.html#_rgant_CollectionLayout_describedAs"><code>@CollectionLayout#describedAs()</code></a>, <a href="../guides/rgant/rgant.html#_rgant_ParameterLayout_describedAs"><code>@ParameterLayout#describedAs()</code></a>, <a href="../guides/rgant/rgant.html#_rgant_DomainObjectLayout_describedAs"><code>@DomainObjectLayout#describedAs()</code></a> or <a href="../guides/rgant/rgant.html#_rgant_ViewModelLayout_describedAs"><code>@ViewModelLayout#describedAs()</code></a>.</p>
+ <p>Either <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_ActionLayout_describedAs"><code>@ActionLayout#describedAs()</code></a>, <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_PropertyLayout_describedAs"><code>@PropertyLayout#describedAs()</code></a>, <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_CollectionLayout_describedAs"><code>@CollectionLayout#describedAs()</code></a>, <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_ParameterLayout_describedAs"><code>@ParameterLayout#describedAs()</code></a>, <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_DomainObjectLayout_describedAs"><code>@DomainObjectLayout#describedAs()</code></a> or <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_ViewModelLayout_describedAs"><code>@ViewModelLayout#describedAs()</code></a>.</p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@Disabled</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@Disabled</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant_Property_editingDisabledReason"><code>@Property#editingDisabledReason()</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Property_editingDisabledReason"><code>@Property#editingDisabledReason()</code></a></p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top" rowspan="2">
- <div class="literal">
- <pre>@DomainObject</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@DomainObject</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>bounded</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>bounded</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p>Deleted (was a boolean attribute), replaced by <a href="../guides/rgant/rgant.html#_rgant_DomainObject_bounding"><code>@Property#bounding</code></a></p>
+ <p>Deleted (was a boolean attribute), replaced by <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_DomainObject_bounding"><code>@Property#bounding</code></a></p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>publishingPayloadFactory</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>publishingPayloadFactory</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>Removed, use the simpler <a href="../guides/rgsvc/rgsvc.html#PublisherService">PublisherService</a> SPI instead.</pre>
+ <div>
+ <div class="paragraph">
+ <p>Removed, use the simpler <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgsvc/rgsvc.html#PublisherService">PublisherService</a> SPI instead.</p>
+ </div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@Exploration</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@Exploration</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant_Action_restrictTo"><code>@Action#restrictTo()</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Action_restrictTo"><code>@Action#restrictTo()</code></a></p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@FieldOrder</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@FieldOrder</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant_MemberOrder"><code>@MemberOrder()</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_MemberOrder"><code>@MemberOrder()</code></a></p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@Hidden</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@Hidden</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p>For actions by either <a href="../guides/rgant/rgant.html#_rgant_Action_hidden"><code>@Action#hidden()</code></a> or <a href="../guides/rgant/rgant.html#_rgant_ActionLayout_hidden"><code>@ActionLayout#hidden()</code></a>, for properties by either <a href="../guides/rgant/rgant.html#_rgant_Property_hidden"><code>@Property#hidden()</code></a> or <a href="../guides/rgant/rgant.html#_rgant_PropertyLayout_hidden"><code>@PropertyLayout#hidden()</code></a>, for collections by either <a href="../guides/rgant/rgant.html#_rgant_Collection_hidden"><code>@Collection#hidden()</code></a> or <a href="../guides/rgant/rgant.html#_rgant_CollectionLayout_hidden"><code>@CollectionLayout#hidden()</code></a>.</p>
+ <p>For actions by either <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Action_hidden"><code>@Action#hidden()</code></a> or <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_ActionLayout_hidden"><code>@ActionLayout#hidden()</code></a>, for properties by either <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Property_hidden"><code>@Property#hidden()</code></a> or <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_PropertyLayout_hidden"><code>@PropertyLayout#hidden()</code></a>, for collections by either <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Collection_hidden"><code>@Collection#hidden()</code></a> or <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_CollectionLayout_hidden"><code>@CollectionLayout#hidden()</code></a>.</p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@Idempotent</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@Idempotent</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant_Action_semantics"><code>@Action#semantics()</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Action_semantics"><code>@Action#semantics()</code></a></p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@Ignore</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@Ignore</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant_Programmatic"><code>@Programmatic</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Programmatic"><code>@Programmatic</code></a></p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@Immutable</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@Immutable</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant_DomainObject_editing"><code>@DomainObject#editing()</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_DomainObject_editing"><code>@DomainObject#editing()</code></a></p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@Mandatory</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@Mandatory</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p>Either <a href="../guides/rgant/rgant.html#_rgant_Property_optionality"><code>@Property#optionality()</code></a> or <a href="../guides/rgant/rgant.html#_rgant_Parameter_optionality"><code>@Parameter#optionality()</code></a>.</p>
+ <p>Either <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Property_optionality"><code>@Property#optionality()</code></a> or <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Parameter_optionality"><code>@Parameter#optionality()</code></a>.</p>
</div>
<div class="paragraph">
- <p>For properties, can also use <a href="../guides/rgant/rgant.html#_rgant_Column_allowsNull"><code>@Column#allowsNull()</code></a> Can also use <a href="../guides/rgant/rgant.html#_rgant_Nullable"><code>@Nullable</code></a> for either properties or parameters.</p>
+ <p>For properties, can also use <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Column_allowsNull"><code>@Column#allowsNull()</code></a> Can also use <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Nullable"><code>@Nullable</code></a> for either properties or parameters.</p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@Mask</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@Mask</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
@@ -1546,154 +1565,154 @@ table.CodeRay td.code>pre{padding:0}
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@MaxLength</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@MaxLength</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p>Either <a href="../guides/rgant/rgant.html#_rgant_Property_maxLength"><code>@Property#maxLength()</code></a> or <a href="../guides/rgant/rgant.html#_rgant_Parameter_maxLength"><code>@Parameter#maxLength()</code></a>.</p>
+ <p>Either <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Property_maxLength"><code>@Property#maxLength()</code></a> or <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Parameter_maxLength"><code>@Parameter#maxLength()</code></a>.</p>
</div>
<div class="paragraph">
- <p>For properties, can also use <a href="../guides/rgant/rgant.html#_rgant_Column_length"><code>@Column#length()</code></a></p>
+ <p>For properties, can also use <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Column_length"><code>@Column#length()</code></a></p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@MemberGroups</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@MemberGroups</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/ugvw/ugvw.html#_ugvw_layout_file-based">.layout.xml</a> file instead.</p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/ugvw/ugvw.html#_ugvw_layout_file-based">.layout.xml</a> file instead.</p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@MultiLine</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@MultiLine</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p>Either <a href="../guides/rgant/rgant.html#_rgant_PropertyLayout_multiLine"><code>@PropertyLayout#multiLine()</code></a> or <a href="../guides/rgant/rgant.html#_rgant_ParameterLayout_multiLine"><code>@ParameterLayout#multiLine()</code></a>.</p>
+ <p>Either <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_PropertyLayout_multiLine"><code>@PropertyLayout#multiLine()</code></a> or <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_ParameterLayout_multiLine"><code>@ParameterLayout#multiLine()</code></a>.</p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@MustSatisfy</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@MustSatisfy</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p>Either <a href="../guides/rgant/rgant.html#_rgant_Property_mustSatisfy"><code>@Property#mustSatisfy()</code></a> or <a href="../guides/rgant/rgant.html#_rgant_Parameter_mustSatisfy"><code>@Parameter#mustSatisfy()</code></a>.</p>
+ <p>Either <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Property_mustSatisfy"><code>@Property#mustSatisfy()</code></a> or <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Parameter_mustSatisfy"><code>@Parameter#mustSatisfy()</code></a>.</p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@NotPersisted</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@NotPersisted</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant_Property_notPersisted"><code>@Property#notPersisted()</code></a>.</p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Property_notPersisted"><code>@Property#notPersisted()</code></a>.</p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@Optional</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@Optional</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p>Either <a href="../guides/rgant/rgant.html#_rgant_Property_optionality"><code>@Property#optionality()</code></a> or <a href="../guides/rgant/rgant.html#_rgant_Parameter_optionality"><code>@Parameter#optionality()</code></a>.</p>
+ <p>Either <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Property_optionality"><code>@Property#optionality()</code></a> or <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Parameter_optionality"><code>@Parameter#optionality()</code></a>.</p>
</div>
<div class="paragraph">
- <p>For properties, can also use <a href="../guides/rgant/rgant.html#_rgant_Column_allowsNull"><code>@Column#allowsNull()</code></a> Can also use <a href="../guides/rgant/rgant.html#_rgant_Nullable"><code>@Nullable</code></a> for either properties or parameters.</p>
+ <p>For properties, can also use <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Column_allowsNull"><code>@Column#allowsNull()</code></a> Can also use <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Nullable"><code>@Nullable</code></a> for either properties or parameters.</p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@Named</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@Named</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p>Either <a href="../guides/rgant/rgant.html#_rgant_ActionLayout_named"><code>@ActionLayout#named()</code></a>, <a href="../guides/rgant/rgant.html#_rgant_PropertyLayout_named"><code>@PropertyLayout#named()</code></a>, <a href="../guides/rgant/rgant.html#_rgant_CollectionLayout_named"><code>@CollectionLayout#named()</code></a>, <a href="../guides/rgant/rgant.html#_rgant_ParameterLayout_named"><code>@ParameterLayout#named()</code></a>, <a href="../guides/rgant/rgant.html#_rgant_DomainObjectLayout_named"><code>@DomainObjectLayout#named()</code></a> or <a href="../guides/rgant/rgant.html#_rgant_ViewModelLayout_named"><code>@ViewModelLayout#named()</code></a>.</p>
+ <p>Either <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_ActionLayout_named"><code>@ActionLayout#named()</code></a>, <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_PropertyLayout_named"><code>@PropertyLayout#named()</code></a>, <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_CollectionLayout_named"><code>@CollectionLayout#named()</code></a>, <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_ParameterLayout_named"><code>@ParameterLayout#named()</code></a>, <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_DomainObjectLayout_named"><code>@DomainObjectLayout#named()</code></a> or <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_ViewModelLayout_named"><code>@ViewModelLayout#named()</code></a>.</p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@NotInServiceMenu</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@NotInServiceMenu</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant_DomainService_nature"><code>@DomainService#nature()</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_DomainService_nature"><code>@DomainService#nature()</code></a></p>
</div>
<div class="paragraph">
- <p>Specify nature of <code>VIEW_CONTRIBUTIONS_ONLY</code>. Alternatively, use a <a href="../guides/rgant/rgant.html#_rgant_Mixin">mixin</a>.</p>
+ <p>Specify nature of <code>VIEW_CONTRIBUTIONS_ONLY</code>. Alternatively, use a <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Mixin">mixin</a>.</p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@NotContributed</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@NotContributed</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant_DomainService_nature"><code>@DomainService#nature()</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_DomainService_nature"><code>@DomainService#nature()</code></a></p>
</div>
<div class="paragraph">
<p>Specify nature of <code>VIEW_MENU_ONLY</code>.</p>
@@ -1702,13 +1721,13 @@ table.CodeRay td.code>pre{padding:0}
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@NotPersistable</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@NotPersistable</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
@@ -1718,37 +1737,41 @@ table.CodeRay td.code>pre{padding:0}
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@ObjectType</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@ObjectType</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p>Removed, <a href="../guides/rgant/rgant.html#_rgant_DomainObject_objectType"><code>@DomainObject#objectType()</code></a> or <a href="../guides/rgant/rgant.html#_rgant_DomainService_objectType"><code>@DomainService#objectType()</code></a></p>
+ <p>Removed, <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_DomainObject_objectType"><code>@DomainObject#objectType()</code></a> or <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_DomainService_objectType"><code>@DomainService#objectType()</code></a></p>
</div>
<div class="paragraph">
<p>Alternatively, for domain entities either:</p>
</div>
<div class="ulist">
<ul>
- <li> <p>the <a href="../guides/rgant/rgant.html#_rgant_Discriminator"><code>@Discriminator</code></a> annotation can be specified; the value is used as the object type, or</p> </li>
- <li> <p>the <a href="../guides/rgant/rgant.html#_rgant_PersistenceCapable_schema"><code>@PersistenceCapable#schema()</code></a> can be specified; the value is used as the concatenated with the class name to create a two part object type.</p> </li>
+ <li> <p>the <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Discriminator"><code>@Discriminator</code></a> annotation can be specified; the value is used as the object type, or</p> </li>
+ <li> <p>the <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_PersistenceCapable_schema"><code>@PersistenceCapable#schema()</code></a> can be specified; the value is used as the concatenated with the class name to create a two part object type.</p> </li>
</ul>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@Parameter</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@Parameter</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>minLength()</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>minLength</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
<div>
@@ -1756,311 +1779,321 @@ table.CodeRay td.code>pre{padding:0}
<p>Never implemented internally in Isis 1.x so no replacement.</p>
</div>
<div class="paragraph">
- <p>Note that the <a href="../guides/rgant/rgant.html#_rgant_MinLength"><code>@MinLength</code></a> annotation is for use with autocomplete supporting methods (specifying the minimum number of characters to enter before an auto-complete search is performed).</p>
+ <p>Note that the <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_MinLength"><code>@MinLength</code></a> annotation is for use with autocomplete supporting methods (specifying the minimum number of characters to enter before an auto-complete search is performed).</p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@Paged</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@Paged</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p>Either <a href="../guides/rgant/rgant.html#_rgant_CollectionLayout_paged"><code>@CollectionLayout#paged()</code></a> (for parented collections), or <a href="../guides/rgant/rgant.html#_rgant_DomainObject_paged"><code>@DomainObject#paged()</code></a> (for standalone collections)</p>
+ <p>Either <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_CollectionLayout_paged"><code>@CollectionLayout#paged()</code></a> (for parented collections), or <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_DomainObject_paged"><code>@DomainObject#paged()</code></a> (for standalone collections)</p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@ParameterLayout</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@ParameterLayout</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>renderedAsDayBefore</pre>
+ <div>
+ <div class="paragraph">
+ <p>renderedAsDayBefore</p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p>Deleted (was a boolean attribute), replaced by <a href="../guides/rgant/rgant.html#_rgant_ParameterLayout_renderDay"><code>@ParameterLayout#renderDay</code></a>.</p>
+ <p>Deleted (was a boolean attribute), replaced by <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_ParameterLayout_renderDay"><code>@ParameterLayout#renderDay</code></a>.</p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@Plural</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@Plural</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant_DomainObjectLayout_plural"><code>@DomainObjectLayout#plural()</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_DomainObjectLayout_plural"><code>@DomainObjectLayout#plural()</code></a></p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@PostsAction
-InvokedEvent</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@PostsAction<br> InvokedEvent</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant_Action_domainEvent"><code>@Action#domainEvent()</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Action_domainEvent"><code>@Action#domainEvent()</code></a></p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@PostsCollection
-AddedToEvent</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@PostsCollection<br> AddedToEvent</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant_Collection_domainEvent"><code>@Collection#domainEvent()</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Collection_domainEvent"><code>@Collection#domainEvent()</code></a></p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@PostsCollection
-RemovedFromEvent</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@PostsCollection<br> RemovedFromEvent</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
<TRUNCATED>
[37/39] isis-site git commit: ISIS-1810: updates docs for 2.0.0-M1
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/274edd1d/content/release-notes/release-notes.html
----------------------------------------------------------------------
diff --git a/content/release-notes/release-notes.html b/content/release-notes/release-notes.html
index 0318aae..06ead74 100644
--- a/content/release-notes/release-notes.html
+++ b/content/release-notes/release-notes.html
@@ -309,7 +309,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_release-notes_2.0.0-M1">2.0.0-M1</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/2.0.0-M1/release-notes/release-notes.html#_release-notes_2.0.0-M1">2.0.0-M1</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">31-07-2018</p></td>
<td class="tableblock halign-left valign-top">
<div>
@@ -328,7 +328,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_release-notes_1.16.2">1.16.2</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/1.16.2/release-notes/release-notes.html#_release-notes_1.16.2">1.16.2</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">05-03-2018</p></td>
<td class="tableblock halign-left valign-top">
<div>
@@ -347,7 +347,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_release-notes_1.16.1">1.16.1</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/1.16.1/release-notes/release-notes.html#_release-notes_1.16.1">1.16.1</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">22-02-2018</p></td>
<td class="tableblock halign-left valign-top">
<div>
@@ -366,7 +366,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_release-notes_1.16.0">1.16.0</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/1.16.0/release-notes/release-notes.html#_release-notes_1.16.0">1.16.0</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">08-01-2018</p></td>
<td class="tableblock halign-left valign-top">
<div>
@@ -385,7 +385,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_release-notes_1.15.1">1.15.1</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/1.15.1/release-notes/release-notes.html#_release-notes_1.15.1">1.15.1</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">25-09-2017</p></td>
<td class="tableblock halign-left valign-top">
<div>
@@ -404,7 +404,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_release-notes_1.15.0">1.15.0</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/1.15.0/release-notes/release-notes.html#_release-notes_1.15.0">1.15.0</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">14-08-2017</p></td>
<td class="tableblock halign-left valign-top">
<div>
@@ -423,7 +423,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_release-notes_1.14.0">1.14.0</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/1.14.0/release-notes/release-notes.html#_release-notes_1.14.0">1.14.0</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">19-02-2017</p></td>
<td class="tableblock halign-left valign-top">
<div>
@@ -442,7 +442,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_release-notes_1.13.2.1">1.13.2.1</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/1.13.2.1/release-notes/release-notes.html#_release-notes_1.13.2.1">1.13.2.1</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">03-jan-2017</p></td>
<td class="tableblock halign-left valign-top">
<div>
@@ -461,7 +461,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_release-notes_1.13.2">1.13.2</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/1.13.2/release-notes/release-notes.html#_release-notes_1.13.2">1.13.2</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">14-dec-2016</p></td>
<td class="tableblock halign-left valign-top">
<div>
@@ -480,7 +480,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_release-notes_1.13.1">1.13.1</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/1.13.1/release-notes/release-notes.html#_release-notes_1.13.1">1.13.1</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">30-oct-2016</p></td>
<td class="tableblock halign-left valign-top">
<div>
@@ -499,7 +499,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_release-notes_1.13.0">1.13.0</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/1.13.0/release-notes/release-notes.html#_release-notes_1.13.0">1.13.0</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">11-jul-2016</p></td>
<td class="tableblock halign-left valign-top">
<div>
@@ -518,7 +518,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_release-notes_1.12.2">1.12.2</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/1.12.2/release-notes/release-notes.html#_release-notes_1.12.2">1.12.2</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">06-jun-2016</p></td>
<td class="tableblock halign-left valign-top">
<div>
@@ -537,7 +537,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_release-notes_1.12.1">1.12.1</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/1.12.1/release-notes/release-notes.html#_release-notes_1.12.1">1.12.1</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">12-apr-2016</p></td>
<td class="tableblock halign-left valign-top">
<div>
@@ -556,7 +556,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_release-notes_1.12.0">1.12.0</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/1.12.0/release-notes/release-notes.html#_release-notes_1.12.0">1.12.0</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">29-mar-2016</p></td>
<td class="tableblock halign-left valign-top">
<div>
@@ -575,7 +575,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_release-notes_1.11.1">1.11.1</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/1.11.1/release-notes/release-notes.html#_release-notes_1.11.1">1.11.1</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">17-jan-2016</p></td>
<td class="tableblock halign-left valign-top">
<div>
@@ -594,7 +594,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_release-notes_1.11.0">1.11.0</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/1.11.0/release-notes/release-notes.html#_release-notes_1.11.0">1.11.0</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">02-jan-2016</p></td>
<td class="tableblock halign-left valign-top">
<div>
@@ -613,7 +613,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_release-notes_1.10.0">1.10.0</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/1.10.0/release-notes/release-notes.html#_release-notes_1.10.0">1.10.0</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">10-nov-2015</p></td>
<td class="tableblock halign-left valign-top">
<div>
@@ -632,7 +632,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_release-notes_1.9.0">1.9.0</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/1.9.0/release-notes/release-notes.html#_release-notes_1.9.0">1.9.0</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">1-sep-2015</p></td>
<td class="tableblock halign-left valign-top">
<div>
@@ -651,7 +651,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_release-notes_1.8.0">1.8.0</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/1.8.0/release-notes/release-notes.html#_release-notes_1.8.0">1.8.0</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">24-feb-2015</p></td>
<td class="tableblock halign-left valign-top">
<div>
@@ -673,7 +673,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_release-notes_1.7.0">1.7.0</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/1.7.0/release-notes/release-notes.html#_release-notes_1.7.0">1.7.0</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">18-oct-2014</p></td>
<td class="tableblock halign-left valign-top">
<div>
@@ -697,7 +697,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_release-notes_1.6.0">1.6.0</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/1.6.0/release-notes/release-notes.html#_release-notes_1.6.0">1.6.0</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">28-jul-2014</p></td>
<td class="tableblock halign-left valign-top">
<div>
@@ -721,7 +721,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_release-notes_1.5.0">1.5.0</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/1.5.0/release-notes/release-notes.html#_release-notes_1.5.0">1.5.0</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">08-jun-2014</p></td>
<td class="tableblock halign-left valign-top">
<div>
@@ -748,7 +748,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_release-notes_1.4.1">1.4.1</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/1.4.1/release-notes/release-notes.html#_release-notes_1.4.1">1.4.1</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">14-mar-2014</p></td>
<td class="tableblock halign-left valign-top">
<div>
@@ -772,7 +772,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#r1.4.0">1.4.0</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/1.4.0/release-notes/release-notes.html#_release-notes_1.4.0">1.4.0</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">11-mar-2014</p></td>
<td class="tableblock halign-left valign-top">
<div></div></td>
@@ -796,7 +796,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_release-notes_1.3.1">1.3.1</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/1.3.1/release-notes/release-notes.html#_release-notes_1.3.1">1.3.1</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">7-nov-2013</p></td>
<td class="tableblock halign-left valign-top">
<div>
@@ -819,7 +819,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_release-notes_1.3.0">1.3.0</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/1.3.0/release-notes/release-notes.html#_release-notes_1.3.0">1.3.0</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">25-oct-2013</p></td>
<td class="tableblock halign-left valign-top">
<div>
@@ -847,7 +847,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_release-notes_1.2.0">1.2.0</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/1.2.0/release-notes/release-notes.html#_release-notes_1.2.0">1.2.0</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">30-may-2013</p></td>
<td class="tableblock halign-left valign-top">
<div></div></td>
@@ -870,7 +870,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_release-notes_1.1.0">1.1.0</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/1.1.0/release-notes/release-notes.html#_release-notes_1.1.0">1.1.0</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">31-jan-2013</p></td>
<td class="tableblock halign-left valign-top">
<div></div></td>
@@ -890,7 +890,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#r1.0.1">1.0.1</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/1.0.1/release-notes/release-notes.html#_release-notes_1.0.1">1.0.1</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">10-jan-2013</p></td>
<td class="tableblock halign-left valign-top">
<div>
@@ -912,7 +912,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_release-notes_1.0.0">1.0.0</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/1.0.0/release-notes/release-notes.html#_release-notes_1.0.0">1.0.0</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">24-dec-2012</p></td>
<td class="tableblock halign-left valign-top">
<div>
@@ -1579,7 +1579,7 @@ table.CodeRay td.code>pre{padding:0}
<p>The version of Apache Wicket has also been upgraded from <code>6.x</code> to <code>7.x</code>.</p>
</div>
<div class="paragraph">
- <p>Most applications written against v1.14.x should run against v1.15.0 with few if any changes. That said, we do recommend that you read and keep in mind the <a href="../migration-notes/migration-notes.html#_migration-notes_1.14.0-to-1.15.0">migration notes</a> when you upgrade your app.</p>
+ <p>Most applications written against v1.14.x should run against v1.15.0 with few if any changes. That said, we do recommend that you read and keep in mind the <a href="https://isis.apache.org/versions/1.15.0/migration-notes/migration-notes.html#_migration-notes_1.14.0-to-1.15.0">migration notes</a> when you upgrade your app.</p>
</div>
<div class="admonitionblock note">
<table>
@@ -1770,7 +1770,7 @@ table.CodeRay td.code>pre{padding:0}
<p>The release also has a number of bug fixes.</p>
</div>
<div class="paragraph">
- <p>Most applications written against v1.13.x should run against v1.14.0 with few if any changes. That said, we do recommend that you read and keep in mind the <a href="../migration-notes/migration-notes.html#_migration-notes_1.13.0-to-1.14.0">migration notes</a> when you upgrade your app.</p>
+ <p>Most applications written against v1.13.x should run against v1.14.0 with few if any changes. That said, we do recommend that you read and keep in mind the <a href="https://isis.apache.org/versions/1.14.0/migration-notes/migration-notes.html#_migration-notes_1.13.0-to-1.14.0">migration notes</a> when you upgrade your app.</p>
</div>
<div class="sect2">
<h3 id="_new_feature_7">New Feature</h3>
@@ -2091,19 +2091,19 @@ table.CodeRay td.code>pre{padding:0}
</div>
<div class="sectionbody">
<div class="paragraph">
- <p>Apache Isis 1.13.0 improves and formalizes the support for commands and auditing, and introduces the new concept of an interaction. A command now represents the <em>intention</em> to interact with the application, either to invoke an action or to edit a property. This is captured as a JAXB DTO. An interaction on the other hand captures the fact that a command has been performed. Interactions are also captured as DTOs. Interactions can include sub-interactions, representing the fact that an action can invoke another action by way of the <a href="../guides/rgsvc/rgsvc.html#_rgsvc_application-layer-api_WrapperFactory"><code>WrapperFactory</code></a>.</p>
+ <p>Apache Isis 1.13.0 improves and formalizes the support for commands and auditing, and introduces the new concept of an interaction. A command now represents the <em>intention</em> to interact with the application, either to invoke an action or to edit a property. This is captured as a JAXB DTO. An interaction on the other hand captures the fact that a command has been performed. Interactions are also captured as DTOs. Interactions can include sub-interactions, representing the fact that an action can invoke another action by way of the <a href="https://isis.apache.org/versions/1.13.0/guides/rgsvc/rgsvc.html#_rgsvc_application-layer-api_WrapperFactory"><code>WrapperFactory</code></a>.</p>
</div>
<div class="paragraph">
- <p>The existing <a href="../guides/rgsvc/rgsvc.html#_rgsvc_persistence-layer-spi_AuditingService"><code>AuditingService</code></a> and <a href="../guides/rgsvc/rgsvc.html#_rgsvc_persistence-layer-spi_PublishingService"><code>PublishingService</code></a> SPI services have both been deprecated, instead replaced by <a href="../guides/rgsvc/rgsvc.html#_rgsvc_persistence-layer-spi_AuditerService"><code>AuditerService</code></a> and <a href="../guides/rgsvc/rgsvc.html#_rgsvc_persistence-layer-spi_PublisherService"><code>PublisherService</code></a>. It is now possible to have multiple implementations of each.</p>
+ <p>The existing <a href="https://isis.apache.org/versions/1.13.0/guides/rgsvc/rgsvc.html#_rgsvc_persistence-layer-spi_AuditingService"><code>AuditingService</code></a> and <a href="https://isis.apache.org/versions/1.13.0/guides/rgsvc/rgsvc.html#_rgsvc_persistence-layer-spi_PublishingService"><code>PublishingService</code></a> SPI services have both been deprecated, instead replaced by <a href="https://isis.apache.org/versions/1.13.0/guides/rgsvc/rgsvc.html#_rgsvc_persistence-layer-spi_AuditerService"><code>AuditerService</code></a> and <a href="https://isis.apache.org/versions/1.13.0/guides/rgsvc/rgsvc.html#_rgsvc_persistence-layer-spi_PublisherService"><code>PublisherService</code></a>. It is now possible to have multiple implementations of each.</p>
</div>
<div class="paragraph">
- <p>The (non-ASF) <a href="http://platform.incode.org" target="_blank">Incode Platform</a>'s auditing module has been reworked to implement <a href="../guides/rgsvc/rgsvc.html#_rgsvc_spi_AuditService"><code>AuditService</code></a>, while the new (non-ASF) <a href="http://platform.incode.org" target="_blank">Incode Platform</a>'s publishmq module implements <a href="../guides/rgsvc/rgsvc.html#_rgsvc_persistence-layer-spi_PublisherService"><code>PublisherService</code></a> to publish interaction events to an ActiveMQ bus (and to allow such events to be replayed if necessary).</p>
+ <p>The (non-ASF) <a href="http://platform.incode.org" target="_blank">Incode Platform</a>'s auditing module has been reworked to implement <a href="https://isis.apache.org/versions/1.13.0/guides/rgsvc/rgsvc.html#_rgsvc_spi_AuditService"><code>AuditService</code></a>, while the new (non-ASF) <a href="http://platform.incode.org" target="_blank">Incode Platform</a>'s publishmq module implements <a href="https://isis.apache.org/versions/1.13.0/guides/rgsvc/rgsvc.html#_rgsvc_persistence-layer-spi_PublisherService"><code>PublisherService</code></a> to publish interaction events to an ActiveMQ bus (and to allow such events to be replayed if necessary).</p>
</div>
<div class="paragraph">
<p>The release also includes a great deal of internal refactorings and simplifications.</p>
</div>
<div class="paragraph">
- <p>Most applications written against v1.12.x should run against v1.13.0 with few if any changes. That said, this release has removed a small number of features that were dependent on internal APIs, and some configuration properties are now removed/unsupported. We therefore do recommend that you read and keep in mind the <a href="../migration-notes/migration-notes.html#_migration-notes_1.12.0-to-1.13.0">migration notes</a> when you upgrade your app.</p>
+ <p>Most applications written against v1.12.x should run against v1.13.0 with few if any changes. That said, this release has removed a small number of features that were dependent on internal APIs, and some configuration properties are now removed/unsupported. We therefore do recommend that you read and keep in mind the <a href="https://isis.apache.org/versions/1.13.0/migration-notes/migration-notes.html#_migration-notes_1.12.0-to-1.13.0">migration notes</a> when you upgrade your app.</p>
</div>
<div class="sect2">
<h3 id="_new_feature_11">New Feature</h3>
@@ -2328,21 +2328,21 @@ table.CodeRay td.code>pre{padding:0}
<p>As a result of this change, the support for editing objects has been modified; rather than an 'edit' button which toggles the entire page into edit mode, instead each property is edited individually. The current implementation of this is using a prompt dialog (very similar to the action prompt dialogs; in a future release we hope to support "in-place" edits instead.</p>
</div>
<div class="paragraph">
- <p>Another notable change in this release include various new domain services. Some of these are in support of the file-based layouts functionality, others including new access into Apache Isis' metamodel. (Some of these new services were originally part of the (non-ASF) <a href="http://www.isisaddons.org">Isis Addons</a>). In addition, the <a href="../guides/rgsvc/rgsvc.html#_rgsvc_core-domain-api_DomainObjectContainer"><code>DomainObjectContainer</code></a> service has been deprecated, replaced by a number of fine-grained services (such as <a href="../guides/rgsvc/rgsvc.html#_rgsvc_persistence-layer-api_RepositoryService"><code>RepositoryService</code></a> and <a href="../guides/rgsvc/rgsvc.html#_rgsvc_application-layer-api_MessageService"><code>MessageService</code></a>).</p>
+ <p>Another notable change in this release include various new domain services. Some of these are in support of the file-based layouts functionality, others including new access into Apache Isis' metamodel. (Some of these new services were originally part of the (non-ASF) <a href="http://www.isisaddons.org">Isis Addons</a>). In addition, the <a href="https://isis.apache.org/versions/1.12.0/guides/rgsvc/rgsvc.html#_rgsvc_core-domain-api_DomainObjectContainer"><code>DomainObjectContainer</code></a> service has been deprecated, replaced by a number of fine-grained services (such as <a href="https://isis.apache.org/versions/1.12.0/guides/rgsvc/rgsvc.html#_rgsvc_persistence-layer-api_RepositoryService"><code>RepositoryService</code></a> and <a href="https://isis.apache.org/versions/1.12.0/guides/rgsvc/rgsvc.html#_rgsvc_application-layer-api_MessageService"><code>MessageService</code></a>).</p>
</div>
<div class="paragraph">
- <p>The release also includes a number of new mixins, to automatically surface in the UI an entity’s id, version (if any), and to download the layout XML and rebuild the metamodel for a given domain entity. There is also a mixin to clear any UI hints (part of the file-based layouts functionality). In all cases these mixins can be hidden using either security or by writing a <a href="../guides/rgcms/rgcms.html#_rgcms_classes_super_AbstractSubscriber">subscriber</a> to veto the visibility of the corresponding domain event.</p>
+ <p>The release also includes a number of new mixins, to automatically surface in the UI an entity’s id, version (if any), and to download the layout XML and rebuild the metamodel for a given domain entity. There is also a mixin to clear any UI hints (part of the file-based layouts functionality). In all cases these mixins can be hidden using either security or by writing a <a href="https://isis.apache.org/versions/1.12.0/guides/rgcms/rgcms.html#_rgcms_classes_super_AbstractSubscriber">subscriber</a> to veto the visibility of the corresponding domain event.</p>
</div>
<div class="sect2">
<h3 id="_new_feature_12">New Feature</h3>
<div class="ulist">
<ul>
- <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1351">ISIS-1351</a> - Extend <a href="../guides/rgsvc/rgsvc.html#_rgsvc_core-domain-api_ConfigurationService"><code>ConfigurationService</code></a> to list all configuration properties in the UI</p> </li>
- <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1325">ISIS-1325</a> - New <a href="../guides/rgsvc/rgsvc.html#_rgsvc_application-layer-api_SessionManagementService"><code>SessionManagementService</code></a></p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1351">ISIS-1351</a> - Extend <a href="https://isis.apache.org/versions/1.12.0/guides/rgsvc/rgsvc.html#_rgsvc_core-domain-api_ConfigurationService"><code>ConfigurationService</code></a> to list all configuration properties in the UI</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1325">ISIS-1325</a> - New <a href="https://isis.apache.org/versions/1.12.0/guides/rgsvc/rgsvc.html#_rgsvc_application-layer-api_SessionManagementService"><code>SessionManagementService</code></a></p> </li>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1317">ISIS-1317</a> - Allow single domain object class to be invalidated through a mixin.</p> </li>
- <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1313">ISIS-1313</a> - Enhancement to <a href="../guides/rgmvn/rgmvn.html#_rgmvn_xsd">xsd</a> goal of the isis-maven-plugin to ignore/include the Isis common schemas.</p> </li>
- <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1292">ISIS-1292</a> - Extend <a href="../guides/rgsvc/rgsvc.html#_rgsvc_metadata-api_MetamodelService"><code>MetaModelService</code></a> to surface packages, classes etc (as used by the security module).</p> </li>
- <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-993">ISIS-993</a> - Show different object members on multiple tabs (<a href="../guides/ugvw/ugvw.html#_ugvw_layout_file-based">dynamic XML layouts</a>)</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1313">ISIS-1313</a> - Enhancement to <a href="https://isis.apache.org/versions/1.12.0/guides/rgmvn/rgmvn.html#_rgmvn_xsd">xsd</a> goal of the isis-maven-plugin to ignore/include the Isis common schemas.</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1292">ISIS-1292</a> - Extend <a href="https://isis.apache.org/versions/1.12.0/guides/rgsvc/rgsvc.html#_rgsvc_metadata-api_MetamodelService"><code>MetaModelService</code></a> to surface packages, classes etc (as used by the security module).</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-993">ISIS-993</a> - Show different object members on multiple tabs (<a href="https://isis.apache.org/versions/1.12.0/guides/ugvw/ugvw.html#_ugvw_layout_file-based">dynamic XML layouts</a>)</p> </li>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-784">ISIS-784</a> - Change Wicket viewer to get rid of edit mode, instead allow individual fields to be edited by clicking on them (similar to the way that JIRA works).</p> </li>
</ul>
</div>
@@ -2352,25 +2352,25 @@ table.CodeRay td.code>pre{padding:0}
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1333">ISIS-1333</a> - Remove self-host profile from the archetype</p> </li>
- <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1332">ISIS-1332</a> - Factor out a <a href="../guides/rgsvc/rgsvc.html#_rgsvc_presentation-layer-spi_HintStore"><code>HintStore</code></a> service, so that this is pluggable.</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1332">ISIS-1332</a> - Factor out a <a href="https://isis.apache.org/versions/1.12.0/guides/rgsvc/rgsvc.html#_rgsvc_presentation-layer-spi_HintStore"><code>HintStore</code></a> service, so that this is pluggable.</p> </li>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1330">ISIS-1330</a> - Add CSS classes for table cells and for collections to make it easier to fine tune pages using CSS.</p> </li>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1329">ISIS-1329</a> - Extend hint support for "show all"</p> </li>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1327">ISIS-1327</a> - Change the view mode of the select2 (value drop down) to be a simple text field.</p> </li>
- <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1324">ISIS-1324</a> - Allow multiple different views of same collection in a layout (<a href="../guides/ugvw/ugvw.html#_ugvw_layout_file-based">dynamic XML layouts</a>)</p> </li>
- <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1323">ISIS-1323</a> - Deprecate @CollectionLayout#renderType, since is duplicated by <a href="../guides/rgant/rgant.html#_rgant-CollectionLayout_defaultView"><code>@CollectionLayout#defaultView()</code></a></p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1324">ISIS-1324</a> - Allow multiple different views of same collection in a layout (<a href="https://isis.apache.org/versions/1.12.0/guides/ugvw/ugvw.html#_ugvw_layout_file-based">dynamic XML layouts</a>)</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1323">ISIS-1323</a> - Deprecate @CollectionLayout#renderType, since is duplicated by <a href="https://isis.apache.org/versions/1.12.0/guides/rgant/rgant.html#_rgant-CollectionLayout_defaultView"><code>@CollectionLayout#defaultView()</code></a></p> </li>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1322">ISIS-1322</a> - Mixins not exposing the mixedin object in events (for subscribers to veto).</p> </li>
- <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1321">ISIS-1321</a> - Extend <a href="../guides/rgsvc/rgsvc.html#_rgsvc_metadata-api_MetamodelService"><code>MetaModelService</code></a> to allow CSV of metamodel to be downloaded.</p> </li>
- <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1320">ISIS-1320</a> - Move <a href="../guides/rgsvc/rgsvc.html#_rgsvc_presentation-layer-spi_ContentMappingService"><code>ContentMappingService</code></a> to applib (and simplify)</p> </li>
- <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1312">ISIS-1312</a> - Improve <a href="../guides/rgsvc/rgsvc.html#_rgsvc_integration-api_JaxbService"><code>JaxbServiceDefault#xsd(…)</code></a> to correctly reference the Isis common schema imports.</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1321">ISIS-1321</a> - Extend <a href="https://isis.apache.org/versions/1.12.0/guides/rgsvc/rgsvc.html#_rgsvc_metadata-api_MetamodelService"><code>MetaModelService</code></a> to allow CSV of metamodel to be downloaded.</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1320">ISIS-1320</a> - Move <a href="https://isis.apache.org/versions/1.12.0/guides/rgsvc/rgsvc.html#_rgsvc_presentation-layer-spi_ContentMappingService"><code>ContentMappingService</code></a> to applib (and simplify)</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1312">ISIS-1312</a> - Improve <a href="https://isis.apache.org/versions/1.12.0/guides/rgsvc/rgsvc.html#_rgsvc_integration-api_JaxbService"><code>JaxbServiceDefault#xsd(…)</code></a> to correctly reference the Isis common schema imports.</p> </li>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1300">ISIS-1300</a> - Allow the enablement of the WicketSource plugin to be configurable, and disabled by default</p> </li>
- <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1299">ISIS-1299</a> - <a href="../guides/rgant/rgant.html#_rgant-ViewModel"><code>@ViewModel</code></a> and <a href="../guides/rgant/rgant.html#_rgant-XmlRootElement"><code>@XmlRootElement</code></a> view models should automatically support isCloneable.</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1299">ISIS-1299</a> - <a href="https://isis.apache.org/versions/1.12.0/guides/rgant/rgant.html#_rgant-ViewModel"><code>@ViewModel</code></a> and <a href="https://isis.apache.org/versions/1.12.0/guides/rgant/rgant.html#_rgant-XmlRootElement"><code>@XmlRootElement</code></a> view models should automatically support isCloneable.</p> </li>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1298">ISIS-1298</a> - Fix deprecated annotation use for ViewModel.Cloneable#clone</p> </li>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1295">ISIS-1295</a> - Run integration tests using thread-local, to allow "complete" tests that also exercise, eg Quartz jobs.</p> </li>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1240">ISIS-1240</a> - Derive icon from service when not provided</p> </li>
- <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1239">ISIS-1239</a> - For wicket ui, use a cookie or similar to remember the hint from last time (<a href="../guides/ugvw/ugvw.html#_ugvw_layout_file-based">dynamic XML layouts</a>)</p> </li>
- <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1228">ISIS-1228</a> - Reorganizing/splitting out <a href="../guides/rgant/rgant.html#_rgant-DomainObjectContainer"><code>@DomainObjectContainer</code></a> service.</p> </li>
- <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1048">ISIS-1048</a> - Make view model URLs more secure, eg through a private key (<a href="../guides/rgsvc/rgsvc.html#_rgsvc_presentation-layer-spi_UrlEncodingService"><code>UrlEncodingService</code></a>).</p> </li>
- <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1037">ISIS-1037</a> - Support layout.xml as well as layout.json (<a href="../guides/ugvw/ugvw.html#_ugvw_layout_file-based">dynamic XML layouts</a>)</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1239">ISIS-1239</a> - For wicket ui, use a cookie or similar to remember the hint from last time (<a href="https://isis.apache.org/versions/1.12.0/guides/ugvw/ugvw.html#_ugvw_layout_file-based">dynamic XML layouts</a>)</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1228">ISIS-1228</a> - Reorganizing/splitting out <a href="https://isis.apache.org/versions/1.12.0/guides/rgant/rgant.html#_rgant-DomainObjectContainer"><code>@DomainObjectContainer</code></a> service.</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1048">ISIS-1048</a> - Make view model URLs more secure, eg through a private key (<a href="https://isis.apache.org/versions/1.12.0/guides/rgsvc/rgsvc.html#_rgsvc_presentation-layer-spi_UrlEncodingService"><code>UrlEncodingService</code></a>).</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1037">ISIS-1037</a> - Support layout.xml as well as layout.json (<a href="https://isis.apache.org/versions/1.12.0/guides/ugvw/ugvw.html#_ugvw_layout_file-based">dynamic XML layouts</a>)</p> </li>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-806">ISIS-806</a> - In Wicket viewer, shouldn’t be possible to invoke an action if editing a form.</p> </li>
</ul>
</div>
@@ -2379,7 +2379,7 @@ table.CodeRay td.code>pre{padding:0}
<h3 id="_bug_14">Bug</h3>
<div class="ulist">
<ul>
- <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1348">ISIS-1348</a> - Bug with <a href="../guides/ugtst/ugtst.html#_ugtst_unit-test-support_soap-fake-server-junit-rule">SoapEndpointPublishingRule</a> when multiple endpoints.</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1348">ISIS-1348</a> - Bug with <a href="https://isis.apache.org/versions/1.12.0/guides/ugtst/ugtst.html#_ugtst_unit-test-support_soap-fake-server-junit-rule">SoapEndpointPublishingRule</a> when multiple endpoints.</p> </li>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1347">ISIS-1347</a> - Missing annotation in SimpleObject</p> </li>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1346">ISIS-1346</a> - ActionInvocationContext isn’t populated properly</p> </li>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1342">ISIS-1342</a> - The metamodel validation error page doesn’t reliably render itself if there are errors.</p> </li>
@@ -2387,8 +2387,8 @@ table.CodeRay td.code>pre{padding:0}
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1340">ISIS-1340</a> - Rebuild metamodel mixin action isn’t working reliably</p> </li>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1328">ISIS-1328</a> - Bookmark hints are not being honoured</p> </li>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1319">ISIS-1319</a> - Input dialog for action label for mandatory parameter not shown when the parameter is an view model</p> </li>
- <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1318">ISIS-1318</a> - contributed actions/mixins breaks publishing; also flush any pending actions to be published as the result of doing a wrapped action via the <a href="../guides/rgsvc/rgsvc.html#_rgsvc_application-layer-api_WrapperFactory"><code>WrapperFactory</code></a></p> </li>
- <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1315">ISIS-1315</a> - Can’t generate <a href="../guides/rgmvn/rgmvn.html#_rgmvn_swagger">swagger</a> specs, where actions are contributed.</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1318">ISIS-1318</a> - contributed actions/mixins breaks publishing; also flush any pending actions to be published as the result of doing a wrapped action via the <a href="https://isis.apache.org/versions/1.12.0/guides/rgsvc/rgsvc.html#_rgsvc_application-layer-api_WrapperFactory"><code>WrapperFactory</code></a></p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1315">ISIS-1315</a> - Can’t generate <a href="https://isis.apache.org/versions/1.12.0/guides/rgmvn/rgmvn.html#_rgmvn_swagger">swagger</a> specs, where actions are contributed.</p> </li>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1314">ISIS-1314</a> - Filename parameter label missing for DTO mixins</p> </li>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1311">ISIS-1311</a> - Mixins for Persistable metadata causes exception when rendering.</p> </li>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1310">ISIS-1310</a> - DomainObjectContainer#titleOf(..) does not resolve @Title annotated on private field</p> </li>
@@ -2468,7 +2468,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
<div class="ulist">
<ul>
- <li> <p>the <a href="../guides/ugvro/ugvro.html">Restful Objects viewer</a> now supports simplified representations intended to make it easier to write custom Javascript (and other) clients that consume the REST API; these are obtained using the HTTP Accept header. There is also support for <a href="http://swagger.io">Swagger</a> spec files so that the REST API can be more easily explored and tested.<br></p>
+ <li> <p>the <a href="https://isis.apache.org/versions/1.11.0/guides/ugvro/ugvro.html#">Restful Objects viewer</a> now supports simplified representations intended to make it easier to write custom Javascript (and other) clients that consume the REST API; these are obtained using the HTTP Accept header. There is also support for <a href="http://swagger.io">Swagger</a> spec files so that the REST API can be more easily explored and tested.<br></p>
<div class="paragraph">
<p>In addition, the <code>x-ro-follow-links</code> capability for RO spec representations is now supported.</p>
</div> </li>
@@ -2686,7 +2686,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
<div class="sectionbody">
<div class="paragraph">
- <p>Apache Isis 1.9.0 provides various new "under-the-cover" features, such as <code>AppManifest</code> for simplified bootstrapping, and content negotiation support within <a href="../guides/ugvro/ugvro.html">RestfulObjects viewer</a>. It also updates the DataNucleus version to DN 4.1.x.</p>
+ <p>Apache Isis 1.9.0 provides various new "under-the-cover" features, such as <code>AppManifest</code> for simplified bootstrapping, and content negotiation support within <a href="https://isis.apache.org/versions/1.9.0/guides/ugvro/ugvro.html#">RestfulObjects viewer</a>. It also updates the DataNucleus version to DN 4.1.x.</p>
</div>
<div class="paragraph">
<p>This release was also the first to include the updated Asciidoc website.</p>
[18/39] isis-site git commit: ISIS-1810: updates docs for 2.0.0-M1
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/274edd1d/content/versions/SNAPSHOT/guides/cgcom/cgcom.pdf
----------------------------------------------------------------------
diff --git a/content/versions/SNAPSHOT/guides/cgcom/cgcom.pdf b/content/versions/SNAPSHOT/guides/cgcom/cgcom.pdf
index bedb767..2d27106 100644
--- a/content/versions/SNAPSHOT/guides/cgcom/cgcom.pdf
+++ b/content/versions/SNAPSHOT/guides/cgcom/cgcom.pdf
@@ -4,8 +4,8 @@
<< /Title (Committers' Guide)
/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:20180812182249+01'00')
-/ModDate (D:20180812182249+01'00')
+/CreationDate (D:20180814003630+02'00')
+/ModDate (D:20180814003630+02'00')
>>
endobj
2 0 obj
http://git-wip-us.apache.org/repos/asf/isis-site/blob/274edd1d/content/versions/SNAPSHOT/guides/dg/dg.html
----------------------------------------------------------------------
diff --git a/content/versions/SNAPSHOT/guides/dg/dg.html b/content/versions/SNAPSHOT/guides/dg/dg.html
index ce5118e..e1d2c68 100644
--- a/content/versions/SNAPSHOT/guides/dg/dg.html
+++ b/content/versions/SNAPSHOT/guides/dg/dg.html
@@ -5090,11 +5090,11 @@ xxx
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><code>xref:../rgsvc/rgsvc.adoc#_rgsvc_api_xxx[`xxx</code>]` </p><p class="tableblock">a hyperlink to the "man page" for an (API) domain service within the reference guide for domain services, where: </p><p class="tableblock">* <code>xxx</code> is the domain service (eg <code>DomainObjectContainer</code>) </p><p class="tableblock">for example: </p><p class="tableblock"><code>xref:../rgsvc/rgsvc.adoc#_rgsvc_core-domain-api_DomainObjectContainer[`DomainObjectContainer</code>]`</p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><code>xref:../rgsvc/rgsvc.adoc#_rgsvc_api_xxx[`xxx</code>]` </p><p class="tableblock">a hyperlink to the "man page" for an (API) domain service within the reference guide for domain services, where: </p><p class="tableblock">* <code>xxx</code> is the domain service (eg <code>RepositoryService</code>) </p><p class="tableblock">for example: </p><p class="tableblock"><code>xref:../rgsvc/rgsvc.adoc#_rgsvc_core-domain-api_RepositoryService[`RepositoryService</code>]`</p></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_DomainObjectContainer"><code>DomainObjectContainer</code></a></p>
+ <p><a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_RepositoryService"><code>RepositoryService</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
http://git-wip-us.apache.org/repos/asf/isis-site/blob/274edd1d/content/versions/SNAPSHOT/guides/dg/dg.pdf
----------------------------------------------------------------------
diff --git a/content/versions/SNAPSHOT/guides/dg/dg.pdf b/content/versions/SNAPSHOT/guides/dg/dg.pdf
index 33948a4..b0579cb 100644
--- a/content/versions/SNAPSHOT/guides/dg/dg.pdf
+++ b/content/versions/SNAPSHOT/guides/dg/dg.pdf
@@ -4,8 +4,8 @@
<< /Title (Developers' Guide)
/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:20180812182306+01'00')
-/ModDate (D:20180812182306+01'00')
+/CreationDate (D:20180814003647+02'00')
+/ModDate (D:20180814003647+02'00')
>>
endobj
2 0 obj
@@ -64929,7 +64929,7 @@ endobj
>>
endobj
651 0 obj
-<< /Length 7487
+<< /Length 7322
>>
stream
q
@@ -64947,15 +64947,15 @@ f
f
0.000 0.000 0.000 scn
1.000 1.000 1.000 scn
-48.240 378.579 71.257 404.031 re
+48.240 390.024 71.257 392.586 re
f
0.000 0.000 0.000 scn
1.000 1.000 1.000 scn
-119.497 378.579 285.028 404.031 re
+119.497 390.024 285.028 392.586 re
f
0.000 0.000 0.000 scn
1.000 1.000 1.000 scn
-404.525 378.579 142.515 404.031 re
+404.525 390.024 142.515 392.586 re
f
0.000 0.000 0.000 scn
0.5 w
@@ -65072,20 +65072,20 @@ S
[ ] 0 d
0.5 w
0.867 0.867 0.867 SCN
-48.240 378.579 m
-119.497 378.579 l
+48.240 390.024 m
+119.497 390.024 l
S
[ ] 0 d
0.5 w
0.867 0.867 0.867 SCN
48.240 782.860 m
-48.240 378.329 l
+48.240 389.774 l
S
[ ] 0 d
0.5 w
0.867 0.867 0.867 SCN
119.497 782.860 m
-119.497 378.329 l
+119.497 389.774 l
S
[ ] 0 d
1 w
@@ -65262,7 +65262,7 @@ ET
BT
51.24 520.5119999999997 Td
/F5.0 10.5 Tf
-<446f6d61696e4f626a656374> Tj
+<5265706f7369746f72795365> Tj
ET
0.000 0.000 0.000 SCN
@@ -65273,23 +65273,23 @@ ET
BT
51.24 506.23199999999963 Td
/F5.0 10.5 Tf
-<436f6e7461696e6572> Tj
+<7276696365> Tj
ET
0.000 0.000 0.000 SCN
0.200 0.200 0.200 scn
BT
-98.49000000000001 506.23199999999963 Td
+77.49000000000001 506.23199999999963 Td
/F1.0 10.5 Tf
-<29> Tj
+<2920666f72> Tj
ET
BT
51.24 491.95199999999966 Td
/F1.0 10.5 Tf
-<666f72206578616d706c653a> Tj
+<6578616d706c653a> Tj
ET
0.694 0.129 0.275 scn
@@ -65342,7 +65342,7 @@ ET
BT
51.24 434.7269999999997 Td
/F5.0 10.5 Tf
-<2d6170695f446f6d61696e4f> Tj
+<2d6170695f5265706f736974> Tj
ET
0.000 0.000 0.000 SCN
@@ -65353,7 +65353,7 @@ ET
BT
51.24 423.2819999999997 Td
/F5.0 10.5 Tf
-<626a656374436f6e7461696e> Tj
+<6f7279536572766963655b60> Tj
ET
0.000 0.000 0.000 SCN
@@ -65364,7 +65364,7 @@ ET
BT
51.24 411.8369999999997 Td
/F5.0 10.5 Tf
-<65725b60446f6d61696e4f62> Tj
+<5265706f7369746f72795365> Tj
ET
0.000 0.000 0.000 SCN
@@ -65373,27 +65373,16 @@ ET
0.694 0.129 0.275 SCN
BT
-51.24 400.3919999999997 Td
+51.24 397.5569999999997 Td
/F5.0 10.5 Tf
-<6a656374436f6e7461696e65> Tj
+<7276696365> Tj
ET
0.000 0.000 0.000 SCN
0.200 0.200 0.200 scn
-0.694 0.129 0.275 scn
-0.694 0.129 0.275 SCN
BT
-51.24 386.11199999999974 Td
-/F5.0 10.5 Tf
-<72> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-
-BT
-56.49 386.11199999999974 Td
+77.49000000000001 397.5569999999997 Td
/F1.0 10.5 Tf
<5d60> Tj
ET
@@ -65407,20 +65396,20 @@ S
[ ] 0 d
0.5 w
0.867 0.867 0.867 SCN
-119.497 378.579 m
-404.525 378.579 l
+119.497 390.024 m
+404.525 390.024 l
S
[ ] 0 d
0.5 w
0.867 0.867 0.867 SCN
119.497 782.860 m
-119.497 378.329 l
+119.497 389.774 l
S
[ ] 0 d
0.5 w
0.867 0.867 0.867 SCN
404.525 782.860 m
-404.525 378.329 l
+404.525 389.774 l
S
[ ] 0 d
1 w
@@ -65432,7 +65421,7 @@ S
BT
122.4970716 769.0469999999997 Td
/F5.0 10.5 Tf
-<446f6d61696e4f626a656374436f6e7461696e6572> Tj
+<5265706f7369746f727953657276696365> Tj
ET
0.000 0.000 0.000 SCN
@@ -65446,20 +65435,20 @@ S
[ ] 0 d
0.5 w
0.867 0.867 0.867 SCN
-404.525 378.579 m
-547.040 378.579 l
+404.525 390.024 m
+547.040 390.024 l
S
[ ] 0 d
0.5 w
0.867 0.867 0.867 SCN
404.525 782.860 m
-404.525 378.329 l
+404.525 389.774 l
S
[ ] 0 d
0.5 w
0.867 0.867 0.867 SCN
547.040 782.860 m
-547.040 378.329 l
+547.040 389.774 l
S
[ ] 0 d
1 w
@@ -65521,15 +65510,15 @@ endobj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
-/URI (../rgsvc/rgsvc.pdf#_rgsvc_core-domain-api_DomainObjectContainer)
+/URI (../rgsvc/rgsvc.pdf#_rgsvc_core-domain-api_RepositoryService)
>>
/Subtype /Link
-/Rect [122.4970716 767.5769999999997 232.7470716 778.0769999999997]
+/Rect [122.4970716 767.5769999999997 211.7470716 778.0769999999997]
/Type /Annot
>>
endobj
654 0 obj
-<< /Length 11850
+<< /Length 12115
>>
stream
q
@@ -65707,7 +65696,7 @@ S
0.694 0.129 0.275 SCN
BT
-51.24 769.0470000000001 Td
+51.24 769.0470000000006 Td
/F5.0 10.5 Tf
<787265663a2e2e2f72677376> Tj
ET
@@ -65718,7 +65707,7 @@ ET
0.694 0.129 0.275 SCN
BT
-51.24 757.6020000000001 Td
+51.24 757.6020000000005 Td
/F5.0 10.5 Tf
<632f72677376632e61646f63> Tj
ET
@@ -65729,7 +65718,7 @@ ET
0.694 0.129 0.275 SCN
BT
-51.24 746.1570000000002 Td
+51.24 746.1570000000006 Td
/F5.0 10.5 Tf
<235f72677376635f7370695f> Tj
ET
@@ -65740,7 +65729,7 @@ ET
0.694 0.129 0.275 SCN
BT
-51.24 731.8770000000002 Td
+51.24 731.8770000000006 Td
/F5.0 10.5 Tf
<7878785b60787878> Tj
ET
@@ -65749,84 +65738,84 @@ ET
0.200 0.200 0.200 scn
BT
-93.24000000000001 731.8770000000002 Td
+93.24000000000001 731.8770000000006 Td
/F1.0 10.5 Tf
<5d602061> Tj
ET
BT
-51.24 717.5970000000001 Td
+51.24 717.5970000000005 Td
/F1.0 10.5 Tf
[<68> 20.01953125 <797065726c696e6b20746f>] TJ
ET
BT
-51.24 703.3170000000001 Td
+51.24 703.3170000000006 Td
/F1.0 10.5 Tf
<74686520226d616e> Tj
ET
BT
-51.24 689.037 Td
+51.24 689.0370000000005 Td
/F1.0 10.5 Tf
<706167652220666f7220616e> Tj
ET
BT
-51.24 674.7570000000001 Td
+51.24 674.7570000000005 Td
/F1.0 10.5 Tf
<285350492920646f6d61696e> Tj
ET
BT
-51.24 660.4770000000001 Td
+51.24 660.4770000000005 Td
/F1.0 10.5 Tf
<73657276696365> Tj
ET
BT
-51.24 646.1970000000001 Td
+51.24 646.1970000000006 Td
/F1.0 10.5 Tf
<77697468696e20746865> Tj
ET
BT
-51.24 631.9170000000001 Td
+51.24 631.9170000000006 Td
/F1.0 10.5 Tf
<7265666572656e6365> Tj
ET
BT
-51.24 617.6370000000002 Td
+51.24 617.6370000000006 Td
/F1.0 10.5 Tf
<677569646520666f72> Tj
ET
BT
-51.24 603.3570000000001 Td
+51.24 603.3570000000005 Td
/F1.0 10.5 Tf
<646f6d61696e> Tj
ET
BT
-51.24 589.0770000000001 Td
+51.24 589.0770000000006 Td
/F1.0 10.5 Tf
<73657276696365732c> Tj
ET
BT
-51.24 574.7970000000001 Td
+51.24 574.7970000000006 Td
/F1.0 10.5 Tf
<77686572653a202a20> Tj
ET
@@ -65835,7 +65824,7 @@ ET
0.694 0.129 0.275 SCN
BT
-96.81 574.7970000000001 Td
+96.81 574.7970000000006 Td
/F5.0 10.5 Tf
<787878> Tj
ET
@@ -65844,26 +65833,26 @@ ET
0.200 0.200 0.200 scn
BT
-112.56 574.7970000000001 Td
+112.56 574.7970000000006 Td
ET
BT
-51.24 560.517 Td
+51.24 560.5170000000005 Td
/F1.0 10.5 Tf
<697320746865> Tj
ET
BT
-51.24 546.2370000000001 Td
+51.24 546.2370000000005 Td
/F1.0 10.5 Tf
<646f6d61696e> Tj
ET
BT
-51.24 531.9570000000001 Td
+51.24 531.9570000000006 Td
/F1.0 10.5 Tf
<7365727669636520286567> Tj
ET
@@ -65872,7 +65861,7 @@ ET
0.694 0.129 0.275 SCN
BT
-51.24 520.5120000000002 Td
+51.24 520.5120000000006 Td
/F5.0 10.5 Tf
<436f6e74656e744d61707069> Tj
ET
@@ -65883,7 +65872,7 @@ ET
0.694 0.129 0.275 SCN
BT
-51.24 506.2320000000001 Td
+51.24 506.23200000000054 Td
/F5.0 10.5 Tf
<6e6753657276696365> Tj
ET
@@ -65892,14 +65881,14 @@ ET
0.200 0.200 0.200 scn
BT
-98.49000000000001 506.2320000000001 Td
+98.49000000000001 506.23200000000054 Td
/F1.0 10.5 Tf
<29> Tj
ET
BT
-51.24 491.9520000000001 Td
+51.24 491.95200000000057 Td
/F1.0 10.5 Tf
<666f72206578616d706c653a> Tj
ET
@@ -65908,7 +65897,7 @@ ET
0.694 0.129 0.275 SCN
BT
-51.24 480.5070000000001 Td
+51.24 480.5070000000006 Td
/F5.0 10.5 Tf
<787265663a2e2e2f72677376> Tj
ET
@@ -65919,7 +65908,7 @@ ET
0.694 0.129 0.275 SCN
BT
-51.24 469.0620000000001 Td
+51.24 469.0620000000006 Td
/F5.0 10.5 Tf
<632f72677376632e61646f63> Tj
ET
@@ -65930,7 +65919,7 @@ ET
0.694 0.129 0.275 SCN
BT
-51.24 457.61700000000013 Td
+51.24 457.6170000000006 Td
/F5.0 10.5 Tf
<235f72677376635f70726573> Tj
ET
@@ -65941,7 +65930,7 @@ ET
0.694 0.129 0.275 SCN
BT
-51.24 446.17200000000014 Td
+51.24 446.1720000000006 Td
/F5.0 10.5 Tf
<656e746174696f6e2d> Tj
ET
@@ -65952,7 +65941,7 @@ ET
0.694 0.129 0.275 SCN
BT
-51.24 434.72700000000015 Td
+51.24 434.7270000000006 Td
/F5.0 10.5 Tf
<6c617965722d> Tj
ET
@@ -65963,7 +65952,7 @@ ET
0.694 0.129 0.275 SCN
BT
-51.24 423.28200000000015 Td
+51.24 423.2820000000006 Td
/F5.0 10.5 Tf
<7370695f436f6e74656e744d> Tj
ET
@@ -65974,7 +65963,7 @@ ET
0.694 0.129 0.275 SCN
BT
-51.24 411.83700000000016 Td
+51.24 411.8370000000006 Td
/F5.0 10.5 Tf
<617070696e67536572766963> Tj
ET
@@ -65985,7 +65974,7 @@ ET
0.694 0.129 0.275 SCN
BT
-51.24 400.39200000000017 Td
+51.24 400.3920000000006 Td
/F5.0 10.5 Tf
<655b60436f6e74656e744d61> Tj
ET
@@ -65996,7 +65985,7 @@ ET
0.694 0.129 0.275 SCN
BT
-51.24 388.9470000000002 Td
+51.24 388.9470000000006 Td
/F5.0 10.5 Tf
<7070696e6753657276696365> Tj
ET
@@ -66005,7 +65994,7 @@ ET
0.200 0.200 0.200 scn
BT
-51.24 374.66700000000014 Td
+51.24 374.6670000000006 Td
/F1.0 10.5 Tf
<5d60> Tj
ET
@@ -66042,7 +66031,7 @@ S
0.694 0.129 0.275 SCN
BT
-122.4970716 769.0470000000001 Td
+122.4970716 769.0470000000006 Td
/F5.0 10.5 Tf
<436f6e74656e744d617070696e6753657276696365> Tj
ET
@@ -66081,7 +66070,7 @@ S
0.694 0.129 0.275 SCN
BT
-407.52535800000004 769.0470000000001 Td
+407.52535800000004 769.0470000000006 Td
/F5.0 10.5 Tf
<6164756766756e> Tj
ET
@@ -66120,7 +66109,7 @@ S
0.694 0.129 0.275 SCN
BT
-51.24 353.571 Td
+51.24 353.5710000000005 Td
/F5.0 10.5 Tf
<787265663a2e2e2f75676675> Tj
ET
@@ -66131,7 +66120,7 @@ ET
0.694 0.129 0.275 SCN
BT
-51.24 342.126 Td
+51.24 342.12600000000043 Td
/F5.0 10.5 Tf
<6e2f756766756e2e61646f63> Tj
ET
@@ -66142,7 +66131,7 @@ ET
0.694 0.129 0.275 SCN
BT
-51.24 327.846 Td
+51.24 327.84600000000046 Td
/F5.0 10.5 Tf
<237878785b7474745d> Tj
ET
@@ -66151,56 +66140,56 @@ ET
0.200 0.200 0.200 scn
BT
-98.49000000000001 327.846 Td
+98.49000000000001 327.84600000000046 Td
/F1.0 10.5 Tf
<2061> Tj
ET
BT
-51.24 313.566 Td
+51.24 313.56600000000043 Td
/F1.0 10.5 Tf
[<68> 20.01953125 <797065726c696e6b20746f>] TJ
ET
BT
-51.24 299.286 Td
+51.24 299.28600000000046 Td
/F1.0 10.5 Tf
<6120626f6f6b6d61726b> Tj
ET
BT
-51.24 285.006 Td
+51.24 285.0060000000004 Td
/F1.0 10.5 Tf
<77697468696e20746865> Tj
ET
BT
-51.24 270.726 Td
+51.24 270.72600000000045 Td
/F1.0 10.5 Tf
<66756e64616d656e74616c> Tj
ET
BT
-51.24 256.446 Td
+51.24 256.4460000000005 Td
/F1.0 10.5 Tf
<7320757365727327> Tj
ET
BT
-51.24 242.166 Td
+51.24 242.16600000000045 Td
/F1.0 10.5 Tf
<67756964652c> Tj
ET
BT
-51.24 227.886 Td
+51.24 227.88600000000045 Td
/F1.0 10.5 Tf
<77686572653a202a20> Tj
ET
@@ -66209,7 +66198,7 @@ ET
0.694 0.129 0.275 SCN
BT
-96.81 227.886 Td
+96.81 227.88600000000045 Td
/F5.0 10.5 Tf
<787878> Tj
ET
@@ -66218,26 +66207,26 @@ ET
0.200 0.200 0.200 scn
BT
-112.56 227.886 Td
+112.56 227.88600000000045 Td
ET
BT
-51.24 213.606 Td
+51.24 213.60600000000045 Td
/F1.0 10.5 Tf
<697320746865> Tj
ET
BT
-51.24 199.326 Td
+51.24 199.32600000000045 Td
/F1.0 10.5 Tf
<626f6f6b6d61726bd573> Tj
ET
BT
-51.24 185.046 Td
+51.24 185.04600000000045 Td
/F1.0 10.5 Tf
<616e63686f72202a20> Tj
ET
@@ -66246,7 +66235,7 @@ ET
0.694 0.129 0.275 SCN
BT
-97.4295 185.046 Td
+97.4295 185.04600000000045 Td
/F5.0 10.5 Tf
<747474> Tj
ET
@@ -66255,40 +66244,40 @@ ET
0.200 0.200 0.200 scn
BT
-113.1795 185.046 Td
+113.1795 185.04600000000045 Td
ET
BT
-51.24 170.766 Td
+51.24 170.76600000000045 Td
/F1.0 10.5 Tf
<697320746865207465787420746f> Tj
ET
BT
-51.24 156.486 Td
+51.24 156.48600000000044 Td
/F1.0 10.5 Tf
[<646973706c61> 20.01953125 <79206173>] TJ
ET
BT
-51.24 142.206 Td
+51.24 142.20600000000044 Td
/F1.0 10.5 Tf
<746865> Tj
ET
BT
-51.24 127.92599999999999 Td
+51.24 127.92600000000044 Td
/F1.0 10.5 Tf
[<68> 20.01953125 <797065726c696e6b>] TJ
ET
BT
-51.24 113.64599999999999 Td
+51.24 113.64600000000044 Td
/F1.0 10.5 Tf
<666f72206578616d706c653a> Tj
ET
@@ -66297,7 +66286,7 @@ ET
0.694 0.129 0.275 SCN
BT
-51.24 102.20099999999996 Td
+51.24 102.20100000000042 Td
/F5.0 10.5 Tf
<787265663a2e2e2f75676675> Tj
ET
@@ -66308,7 +66297,7 @@ ET
0.694 0.129 0.275 SCN
BT
-51.24 90.75599999999997 Td
+51.24 90.75600000000043 Td
/F5.0 10.5 Tf
<6e2f756766756e2e61646f63> Tj
ET
@@ -66319,7 +66308,7 @@ ET
0.694 0.129 0.275 SCN
BT
-51.24 79.31099999999998 Td
+51.24 79.31100000000043 Td
/F5.0 10.5 Tf
<235f756766756e5f636f7265> Tj
ET
@@ -66330,7 +66319,7 @@ ET
0.694 0.129 0.275 SCN
BT
-51.24 67.86599999999999 Td
+51.24 67.86600000000044 Td
/F5.0 10.5 Tf
<2d636f6e63657074735b436f> Tj
ET
@@ -66341,7 +66330,7 @@ ET
0.694 0.129 0.275 SCN
BT
-51.24 56.42099999999999 Td
+51.24 56.42100000000045 Td
/F5.0 10.5 Tf
<726520636f6e63657074735d> Tj
ET
@@ -66380,7 +66369,7 @@ S
0.259 0.545 0.792 SCN
BT
-122.4970716 351.387 Td
+122.4970716 351.38700000000046 Td
/F1.0 10.5 Tf
<436f726520636f6e6365707473> Tj
ET
@@ -66419,7 +66408,7 @@ S
0.694 0.129 0.275 SCN
BT
-407.52535800000004 353.571 Td
+407.52535800000004 353.5710000000005 Td
/F5.0 10.5 Tf
<616475677677> Tj
ET
@@ -66474,7 +66463,7 @@ endobj
/URI (../rgsvc/rgsvc.pdf#_rgsvc_presentation-layer-spi_ContentMappingServicef)
>>
/Subtype /Link
-/Rect [122.4970716 767.5770000000001 232.7470716 778.0770000000001]
+/Rect [122.4970716 767.5770000000006 232.7470716 778.0770000000006]
/Type /Annot
>>
endobj
@@ -66485,7 +66474,7 @@ endobj
/URI (../ugfun/ugfun.pdf#_ugfun_core-concepts)
>>
/Subtype /Link
-/Rect [122.4970716 348.321 191.92307160000001 362.601]
+/Rect [122.4970716 348.3210000000005 191.92307160000001 362.60100000000045]
/Type /Annot
>>
endobj
@@ -78289,327 +78278,327 @@ xref
0003385558 00000 n
0003385817 00000 n
0003386033 00000 n
-0003393574 00000 n
-0003393833 00000 n
-0003394070 00000 n
-0003405975 00000 n
-0003406242 00000 n
-0003406487 00000 n
-0003406687 00000 n
-0003418180 00000 n
-0003418447 00000 n
-0003418657 00000 n
-0003418865 00000 n
-0003430830 00000 n
-0003431097 00000 n
-0003431329 00000 n
-0003431546 00000 n
-0003460449 00000 n
-0003460721 00000 n
-0003460767 00000 n
-0003460825 00000 n
-0003673414 00000 n
-0003677087 00000 n
-0003677307 00000 n
-0003706416 00000 n
-0003706689 00000 n
-0003706735 00000 n
-0003706792 00000 n
-0003707219 00000 n
-0003707277 00000 n
-0003707488 00000 n
-0003707556 00000 n
-0003708100 00000 n
-0003726359 00000 n
-0003726698 00000 n
-0003726744 00000 n
-0003726924 00000 n
-0003727166 00000 n
-0003727370 00000 n
-0003727572 00000 n
-0003727780 00000 n
-0003727982 00000 n
-0003728192 00000 n
-0003728397 00000 n
-0003728602 00000 n
-0003728648 00000 n
-0003728858 00000 n
-0003729084 00000 n
-0003740429 00000 n
-0003740709 00000 n
-0003740755 00000 n
-0003740941 00000 n
-0003741172 00000 n
-0003741299 00000 n
-0003741417 00000 n
-0003741542 00000 n
-0003741668 00000 n
-0003741809 00000 n
-0003741941 00000 n
-0003742081 00000 n
-0003742222 00000 n
-0003742371 00000 n
-0003742520 00000 n
-0003742660 00000 n
-0003742812 00000 n
-0003742986 00000 n
-0003743170 00000 n
-0003743340 00000 n
-0003743520 00000 n
-0003743696 00000 n
-0003743872 00000 n
-0003744067 00000 n
-0003744262 00000 n
-0003744413 00000 n
-0003744575 00000 n
-0003744731 00000 n
-0003744898 00000 n
-0003745077 00000 n
-0003745256 00000 n
-0003745427 00000 n
-0003745608 00000 n
-0003745789 00000 n
-0003745980 00000 n
-0003746172 00000 n
-0003746364 00000 n
-0003746556 00000 n
-0003746758 00000 n
-0003746917 00000 n
-0003747076 00000 n
-0003747234 00000 n
-0003747402 00000 n
-0003747569 00000 n
-0003747746 00000 n
-0003747910 00000 n
-0003748084 00000 n
-0003748259 00000 n
-0003748434 00000 n
-0003748608 00000 n
-0003748782 00000 n
-0003748959 00000 n
-0003749136 00000 n
-0003749287 00000 n
-0003749449 00000 n
-0003749621 00000 n
-0003749793 00000 n
-0003749964 00000 n
-0003750135 00000 n
-0003750286 00000 n
-0003750448 00000 n
-0003750618 00000 n
-0003750788 00000 n
-0003750961 00000 n
-0003751136 00000 n
-0003751302 00000 n
-0003751479 00000 n
-0003751630 00000 n
-0003751791 00000 n
-0003751960 00000 n
-0003752129 00000 n
-0003752292 00000 n
-0003752455 00000 n
-0003752616 00000 n
-0003752777 00000 n
-0003752948 00000 n
-0003753119 00000 n
-0003753278 00000 n
-0003753439 00000 n
-0003753609 00000 n
-0003753779 00000 n
-0003753942 00000 n
-0003754105 00000 n
-0003754241 00000 n
-0003754389 00000 n
-0003754535 00000 n
-0003754692 00000 n
-0003754893 00000 n
-0003755105 00000 n
-0003755317 00000 n
-0003755529 00000 n
-0003755731 00000 n
-0003755944 00000 n
-0003756116 00000 n
-0003756288 00000 n
-0003756436 00000 n
-0003756594 00000 n
-0003756748 00000 n
-0003756905 00000 n
-0003757070 00000 n
-0003757216 00000 n
-0003757375 00000 n
-0003757537 00000 n
-0003757701 00000 n
-0003757864 00000 n
-0003758038 00000 n
-0003758204 00000 n
-0003758373 00000 n
-0003758536 00000 n
-0003758709 00000 n
-0003758872 00000 n
-0003759045 00000 n
-0003759219 00000 n
-0003759393 00000 n
-0003759558 00000 n
-0003759723 00000 n
-0003759893 00000 n
-0003760063 00000 n
-0003760223 00000 n
-0003760393 00000 n
-0003760548 00000 n
-0003760714 00000 n
-0003760880 00000 n
-0003761056 00000 n
-0003761214 00000 n
-0003761382 00000 n
-0003761543 00000 n
-0003761706 00000 n
-0003761868 00000 n
-0003762032 00000 n
-0003762197 00000 n
-0003762365 00000 n
-0003762533 00000 n
-0003762701 00000 n
-0003762868 00000 n
-0003763035 00000 n
-0003763189 00000 n
-0003763345 00000 n
-0003763504 00000 n
-0003763663 00000 n
-0003763819 00000 n
-0003763975 00000 n
-0003764118 00000 n
-0003764271 00000 n
-0003764437 00000 n
-0003764603 00000 n
-0003764756 00000 n
-0003764909 00000 n
-0003765048 00000 n
-0003765197 00000 n
-0003765360 00000 n
-0003765523 00000 n
-0003765672 00000 n
-0003765832 00000 n
-0003765987 00000 n
-0003766144 00000 n
-0003766431 00000 n
-0003766509 00000 n
-0003766686 00000 n
-0003766878 00000 n
-0003767143 00000 n
-0003767318 00000 n
-0003767563 00000 n
-0003767824 00000 n
-0003768051 00000 n
-0003768305 00000 n
-0003768527 00000 n
-0003768736 00000 n
-0003768984 00000 n
-0003769239 00000 n
-0003769517 00000 n
-0003769671 00000 n
-0003769887 00000 n
-0003770107 00000 n
-0003770372 00000 n
-0003770629 00000 n
-0003770920 00000 n
-0003771206 00000 n
-0003771436 00000 n
-0003771665 00000 n
-0003771874 00000 n
-0003772150 00000 n
-0003772418 00000 n
-0003772617 00000 n
-0003772863 00000 n
-0003773121 00000 n
-0003773382 00000 n
-0003773598 00000 n
-0003773835 00000 n
-0003774104 00000 n
-0003774375 00000 n
-0003774662 00000 n
-0003774900 00000 n
-0003775120 00000 n
-0003775333 00000 n
-0003775574 00000 n
-0003775783 00000 n
-0003776039 00000 n
-0003776316 00000 n
-0003776528 00000 n
-0003776776 00000 n
-0003777109 00000 n
-0003777491 00000 n
-0003777821 00000 n
-0003778004 00000 n
-0003778200 00000 n
-0003778387 00000 n
-0003778686 00000 n
-0003778860 00000 n
-0003779056 00000 n
-0003779268 00000 n
-0003779481 00000 n
-0003779730 00000 n
-0003779900 00000 n
-0003780089 00000 n
-0003780290 00000 n
-0003780470 00000 n
-0003780691 00000 n
-0003780883 00000 n
-0003781092 00000 n
-0003781297 00000 n
-0003781512 00000 n
-0003781826 00000 n
-0003782060 00000 n
-0003782260 00000 n
-0003782477 00000 n
-0003782670 00000 n
-0003782855 00000 n
-0003783088 00000 n
-0003783272 00000 n
-0003783439 00000 n
-0003783737 00000 n
-0003783918 00000 n
-0003784141 00000 n
-0003784813 00000 n
-0003794497 00000 n
-0003794713 00000 n
-0003796076 00000 n
-0003797121 00000 n
-0003805963 00000 n
-0003806184 00000 n
-0003807547 00000 n
-0003808613 00000 n
-0003810062 00000 n
-0003810273 00000 n
-0003810594 00000 n
-0003811510 00000 n
-0003817875 00000 n
-0003818101 00000 n
-0003819464 00000 n
-0003820541 00000 n
-0003826652 00000 n
-0003826866 00000 n
-0003828229 00000 n
-0003829274 00000 n
-0003830737 00000 n
-0003830955 00000 n
-0003832318 00000 n
-0003833455 00000 n
-0003834618 00000 n
-0003834834 00000 n
-0003835137 00000 n
-0003836274 00000 n
-0003837850 00000 n
-0003838064 00000 n
-0003838372 00000 n
-0003839510 00000 n
-0003841231 00000 n
-0003841444 00000 n
-0003842807 00000 n
+0003393409 00000 n
+0003393668 00000 n
+0003393901 00000 n
+0003406071 00000 n
+0003406338 00000 n
+0003406583 00000 n
+0003406804 00000 n
+0003418297 00000 n
+0003418564 00000 n
+0003418774 00000 n
+0003418982 00000 n
+0003430947 00000 n
+0003431214 00000 n
+0003431446 00000 n
+0003431663 00000 n
+0003460566 00000 n
+0003460838 00000 n
+0003460884 00000 n
+0003460942 00000 n
+0003673531 00000 n
+0003677204 00000 n
+0003677424 00000 n
+0003706533 00000 n
+0003706806 00000 n
+0003706852 00000 n
+0003706909 00000 n
+0003707336 00000 n
+0003707394 00000 n
+0003707605 00000 n
+0003707673 00000 n
+0003708217 00000 n
+0003726476 00000 n
+0003726815 00000 n
+0003726861 00000 n
+0003727041 00000 n
+0003727283 00000 n
+0003727487 00000 n
+0003727689 00000 n
+0003727897 00000 n
+0003728099 00000 n
+0003728309 00000 n
+0003728514 00000 n
+0003728719 00000 n
+0003728765 00000 n
+0003728975 00000 n
+0003729201 00000 n
+0003740546 00000 n
+0003740826 00000 n
+0003740872 00000 n
+0003741058 00000 n
+0003741289 00000 n
+0003741416 00000 n
+0003741534 00000 n
+0003741659 00000 n
+0003741785 00000 n
+0003741926 00000 n
+0003742058 00000 n
+0003742198 00000 n
+0003742339 00000 n
+0003742488 00000 n
+0003742637 00000 n
+0003742777 00000 n
+0003742929 00000 n
+0003743103 00000 n
+0003743287 00000 n
+0003743457 00000 n
+0003743637 00000 n
+0003743813 00000 n
+0003743989 00000 n
+0003744184 00000 n
+0003744379 00000 n
+0003744530 00000 n
+0003744692 00000 n
+0003744848 00000 n
+0003745015 00000 n
+0003745194 00000 n
+0003745373 00000 n
+0003745544 00000 n
+0003745725 00000 n
+0003745906 00000 n
+0003746097 00000 n
+0003746289 00000 n
+0003746481 00000 n
+0003746673 00000 n
+0003746875 00000 n
+0003747034 00000 n
+0003747193 00000 n
+0003747351 00000 n
+0003747519 00000 n
+0003747686 00000 n
+0003747863 00000 n
+0003748027 00000 n
+0003748201 00000 n
+0003748376 00000 n
+0003748551 00000 n
+0003748725 00000 n
+0003748899 00000 n
+0003749076 00000 n
+0003749253 00000 n
+0003749404 00000 n
+0003749566 00000 n
+0003749738 00000 n
+0003749910 00000 n
+0003750081 00000 n
+0003750252 00000 n
+0003750403 00000 n
+0003750565 00000 n
+0003750735 00000 n
+0003750905 00000 n
+0003751078 00000 n
+0003751253 00000 n
+0003751419 00000 n
+0003751596 00000 n
+0003751747 00000 n
+0003751908 00000 n
+0003752077 00000 n
+0003752246 00000 n
+0003752409 00000 n
+0003752572 00000 n
+0003752733 00000 n
+0003752894 00000 n
+0003753065 00000 n
+0003753236 00000 n
+0003753395 00000 n
+0003753556 00000 n
+0003753726 00000 n
+0003753896 00000 n
+0003754059 00000 n
+0003754222 00000 n
+0003754358 00000 n
+0003754506 00000 n
+0003754652 00000 n
+0003754809 00000 n
+0003755010 00000 n
+0003755222 00000 n
+0003755434 00000 n
+0003755646 00000 n
+0003755848 00000 n
+0003756061 00000 n
+0003756233 00000 n
+0003756405 00000 n
+0003756553 00000 n
+0003756711 00000 n
+0003756865 00000 n
+0003757022 00000 n
+0003757187 00000 n
+0003757333 00000 n
+0003757492 00000 n
+0003757654 00000 n
+0003757818 00000 n
+0003757981 00000 n
+0003758155 00000 n
+0003758321 00000 n
+0003758490 00000 n
+0003758653 00000 n
+0003758826 00000 n
+0003758989 00000 n
+0003759162 00000 n
+0003759336 00000 n
+0003759510 00000 n
+0003759675 00000 n
+0003759840 00000 n
+0003760010 00000 n
+0003760180 00000 n
+0003760340 00000 n
+0003760510 00000 n
+0003760665 00000 n
+0003760831 00000 n
+0003760997 00000 n
+0003761173 00000 n
+0003761331 00000 n
+0003761499 00000 n
+0003761660 00000 n
+0003761823 00000 n
+0003761985 00000 n
+0003762149 00000 n
+0003762314 00000 n
+0003762482 00000 n
+0003762650 00000 n
+0003762818 00000 n
+0003762985 00000 n
+0003763152 00000 n
+0003763306 00000 n
+0003763462 00000 n
+0003763621 00000 n
+0003763780 00000 n
+0003763936 00000 n
+0003764092 00000 n
+0003764235 00000 n
+0003764388 00000 n
+0003764554 00000 n
+0003764720 00000 n
+0003764873 00000 n
+0003765026 00000 n
+0003765165 00000 n
+0003765314 00000 n
+0003765477 00000 n
+0003765640 00000 n
+0003765789 00000 n
+0003765949 00000 n
+0003766104 00000 n
+0003766261 00000 n
+0003766548 00000 n
+0003766626 00000 n
+0003766803 00000 n
+0003766995 00000 n
+0003767260 00000 n
+0003767435 00000 n
+0003767680 00000 n
+0003767941 00000 n
+0003768168 00000 n
+0003768422 00000 n
+0003768644 00000 n
+0003768853 00000 n
+0003769101 00000 n
+0003769356 00000 n
+0003769634 00000 n
+0003769788 00000 n
+0003770004 00000 n
+0003770224 00000 n
+0003770489 00000 n
+0003770746 00000 n
+0003771037 00000 n
+0003771323 00000 n
+0003771553 00000 n
+0003771782 00000 n
+0003771991 00000 n
+0003772267 00000 n
+0003772535 00000 n
+0003772734 00000 n
+0003772980 00000 n
+0003773238 00000 n
+0003773499 00000 n
+0003773715 00000 n
+0003773952 00000 n
+0003774221 00000 n
+0003774492 00000 n
+0003774779 00000 n
+0003775017 00000 n
+0003775237 00000 n
+0003775450 00000 n
+0003775691 00000 n
+0003775900 00000 n
+0003776156 00000 n
+0003776433 00000 n
+0003776645 00000 n
+0003776893 00000 n
+0003777226 00000 n
+0003777608 00000 n
+0003777938 00000 n
+0003778121 00000 n
+0003778317 00000 n
+0003778504 00000 n
+0003778803 00000 n
+0003778977 00000 n
+0003779173 00000 n
+0003779385 00000 n
+0003779598 00000 n
+0003779847 00000 n
+0003780017 00000 n
+0003780206 00000 n
+0003780407 00000 n
+0003780587 00000 n
+0003780808 00000 n
+0003781000 00000 n
+0003781209 00000 n
+0003781414 00000 n
+0003781629 00000 n
+0003781943 00000 n
+0003782177 00000 n
+0003782377 00000 n
+0003782594 00000 n
+0003782787 00000 n
+0003782972 00000 n
+0003783205 00000 n
+0003783389 00000 n
+0003783556 00000 n
+0003783854 00000 n
+0003784035 00000 n
+0003784258 00000 n
+0003784930 00000 n
+0003794614 00000 n
+0003794830 00000 n
+0003796193 00000 n
+0003797238 00000 n
+0003806080 00000 n
+0003806301 00000 n
+0003807664 00000 n
+0003808730 00000 n
+0003810179 00000 n
+0003810390 00000 n
+0003810711 00000 n
+0003811627 00000 n
+0003817992 00000 n
+0003818218 00000 n
+0003819581 00000 n
+0003820658 00000 n
+0003826769 00000 n
+0003826983 00000 n
+0003828346 00000 n
+0003829391 00000 n
+0003830854 00000 n
+0003831072 00000 n
+0003832435 00000 n
+0003833572 00000 n
+0003834735 00000 n
+0003834951 00000 n
+0003835254 00000 n
+0003836391 00000 n
+0003837967 00000 n
+0003838181 00000 n
+0003838489 00000 n
+0003839627 00000 n
+0003841348 00000 n
+0003841561 00000 n
+0003842924 00000 n
trailer
<< /Size 968
/Root 2 0 R
/Info 1 0 R
>>
startxref
-3843940
+3844057
%%EOF
http://git-wip-us.apache.org/repos/asf/isis-site/blob/274edd1d/content/versions/SNAPSHOT/guides/htg.html
----------------------------------------------------------------------
diff --git a/content/versions/SNAPSHOT/guides/htg.html b/content/versions/SNAPSHOT/guides/htg.html
index 1d4f12c..2a62fba 100644
--- a/content/versions/SNAPSHOT/guides/htg.html
+++ b/content/versions/SNAPSHOT/guides/htg.html
@@ -916,14 +916,17 @@ table.CodeRay td.code>pre{padding:0}
<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 (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>
+ <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).</p>
+ </div>
+ <div class="paragraph">
+ <p>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>
</table>
</div>
<div class="paragraph">
- <p>The framework also supports i18n: locale-specific names and descriptions. for more information, see the <a href="../ugbtb/ugbtb.html#_ugbtb_i18n">beyond-the-basics</a> guide.</p>
+ <p>The framework also supports i18n: locale-specific names and descriptions. For more information, see the <a href="../ugbtb/ugbtb.html#_ugbtb_i18n">beyond-the-basics</a> guide.</p>
</div>
</div>
<div class="sect2">
@@ -2195,7 +2198,7 @@ securityManager.cacheManager = $memoryCacheManager</code></pre>
<p>The framework provides default implementations for many of the <a href="../rgsvc/rgsvc.html">domain services</a>. This is convenient, but sometimes you will want to replace the default implementation with your own service implementation.</p>
</div>
<div class="paragraph">
- <p>For example, suppose you wanted to provide your own implementation of <a href="../rgsvc/rgsvc.html#_rgsvc_api_LocaleProvider"><code>LocaleProvider</code></a>. The trick is to use the <a href="../rgant/rgant.html#_rgant-DomainService_menuOrder"><code>@DomainService#menuOrder()</code></a> attribute, specifying a low number (typically <code>"1"</code>).</p>
+ <p>For example, suppose you wanted to provide your own implementation of <a href="../rgsvc/rgsvc.html#_rgsvc_presentation-layer-spi_LocaleProvider"><code>LocaleProvider</code></a>. The trick is to use the <a href="../rgant/rgant.html#_rgant-DomainService_menuOrder"><code>@DomainService#menuOrder()</code></a> attribute, specifying a low number (typically <code>"1"</code>).</p>
</div>
<div class="paragraph">
<p>Here’s how:</p>
@@ -2762,7 +2765,7 @@ serviceRegistry.injectServicesInto(viewModel);</code></pre>
<span class="keyword">if</span>(original != <span class="predefined-constant">null</span>) { <i class="conum" data-value="2"></i><b>(2)</b>
<span class="keyword">return</span> original;
}
- container.flush(); <i class="conum" data-value="3"></i><b>(3)</b>
+ repositoryService.flush(); <i class="conum" data-value="3"></i><b>(3)</b>
<span class="directive">final</span> BreadcrumbModelProvider wicketSession = <i class="conum" data-value="4"></i><b>(4)</b>
(BreadcrumbModelProvider) AuthenticatedWebSession.get();
@@ -2788,7 +2791,7 @@ serviceRegistry.injectServicesInto(viewModel);</code></pre>
<span class="annotation">@Inject</span>
HomePageProviderService homePageProviderService;
<span class="annotation">@Inject</span>
- DomainObjectContainer container;
+ RepositoryService repositoryService;
}</code></pre>
</div>
</div>
[36/39] isis-site git commit: ISIS-1810: updates docs for 2.0.0-M1
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/274edd1d/content/versions/2.0.0-M1/elasticlunr/index.json
----------------------------------------------------------------------
diff --git a/content/versions/2.0.0-M1/elasticlunr/index.json b/content/versions/2.0.0-M1/elasticlunr/index.json
index 5cde563..e8bd10a 100644
--- a/content/versions/2.0.0-M1/elasticlunr/index.json
+++ b/content/versions/2.0.0-M1/elasticlunr/index.json
@@ -1 +1 @@
-{"version":"0.9.5","fields":["title","body","description","url"],"ref":"id","documentStore":{"docs":{"372886":{"title":"Rows, full-width cols, and tabs","url":"guides/ugvw/ugvw.html#_rows_full_width_cols_and_tabs","body":"Rows, full-width cols, and tabs The example layout consists of three rows: a row for the object/icon, a row containing a properties, and a row containing collections. In all three cases the row contains a single column spanning the full width of the page. For the property and collection rows, the column contains a tab group. This corresponds to the following XML: You will notice that one of the columns has an unreferencedActions attribute, while one of the tabGroups has a similar unreferencedCollections attribute. This topic is discussed in more detail below. ","description":" The example layout consists of three rows: a row for the object/icon, a row containing a properties, and a row containing collections. In all three cases the row contains a single column s
panning the full width of the page. For the property and collection rows, the column contains a","id":372886},"2646929":{"title":"Apache Isis vs …","url":"guides/ugfun/ugfun.html#_ugfun_core-concepts_apache-isis-vs","body":"Apache Isis vs … Many other frameworks promise rapid application development and provide automatically generated user interfaces, so how do they compare to Apache Isis? ","description":" Many other frameworks promise rapid application development and provide automatically generated user interfaces, so how do they compare to Apache Isis? ","id":2646929},"3836440":{"title":"Running","url":"guides/dg/dg.html#__dg_ide_intellij_running","body":"Running Let’s see how to run both the app and the tests. ","description":" Let’s see how to run both the app and the tests. ","id":3836440},"11600575":{"title":"Using Contributions","url":"pages/tg/tg.html#_using_contributions","body":"Using Contributions ","description":"","id":11600575},"12196042":{"title":"Te
rtiary Menu","url":"guides/ugvw/ugvw.html#_tertiary_menu","body":"Tertiary Menu Domain services' actions can be associated with the tertiary menu using the same @DomainServiceLayout annotation, but be aware that the @DomainServiceLayout#name() attribute will be ignored (there is only one effective menu). For example, the updateEpochDate(…) and listAllSettings(…) actions come from the following service: Because the number of items on the tertiary menu is expected to be small and most will pertain to the current user, the viewer does not place dividers between actions from different services on the tertiary menu. ","description":" Domain services' actions can be associated with the tertiary menu using the same @DomainServiceLayout annotation, but be aware that the @DomainServiceLayout#name() attribute will be ignored (there is only one effective menu). ","id":12196042},"12649581":{"title":"Mark the version as released","url":"guides/cgcom/cgcom.html#_mark_the_version_as_r
eleased","body":"Mark the version as released In JIRA, go to the administration section for the Apache Isis project and update the version as being released. In the Kanban view this will have the effect of marking all tickets as released (clearing the \"done\" column). ","description":" In JIRA, go to the administration section for the Apache Isis project and update the version as being released. ","id":12649581},"13573617":{"title":"hide…()","url":"guides/rgcms/rgcms.html#_rgcms_methods_prefixes_hide","body":"hide…() The hide…() supporting method is called for properties, collections and actions. It allows the property/collection to be completely hidden from view. It’s comparatively rare for properties or collections to be imperatively hidden from view, but actions are sometimes hidden or shown visible (as opposed to being just disabled, ie greyed out). The signature of the supporting method is simply: Returning true will hide the property, collection or acti
on, returning false leaves it visible. For example, to hide an action: Or, to hide a property: ","description":" The hide…() supporting method is called for properties, collections and actions. It allows the property/collection to be completely hidden from view. ","id":13573617},"14290952":{"title":"Vetoing Visibility","url":"guides/htg.html#_ugbtb_hints-and-tips_vetoing-visibility","body":"Vetoing Visibility eg if included an addon such as auditing or security. solution is to write a domain event subscriber that vetoes the visibility All the addons actions inherit from common base classes so this can be as broad-brush or fine-grained as required ","description":" eg if included an addon such as auditing or security. ","id":14290952},"14971197":{"title":"Suppressing 'remember me'","url":"guides/ugvw/ugvw.html#_ugvw_configuration-properties_suppressing-remember-me","body":"Suppressing 'remember me' The 'remember me' checkbox on the login page can be suppressed, if required
, by setting a configuration flag. ","description":" The 'remember me' checkbox on the login page can be suppressed, if required, by setting a configuration flag. ","id":14971197},"16629694":{"title":"allowLateRegistration","url":"migration-notes/migration-notes.html#__code_allowlateregistration_code","body":"allowLateRegistration One possible issue is that (as per ISIS-830) the EventBusService is now initialized as one of the first domain services; this is to ensure that any object lifecycle events caused by domain services initializing themselves can be posted on the event bus for subscribers. The typical case for such lifecycle events to occur is from domain services that seed reference data; one such example can be found in the (non-ASF) Incode Platform's security module. In previous releases, the ordering of initialization for the EventBusService was undefined (but would typically be towards the \"end\" of the list of services. What this meant in practice is that it generally
didn’t matter whether (domain service) subscribers were initialized before or after seed services. Now, though, because the EventBusService is initialized early on, it proactively checks that all subscribers have been registered before any event posts occur (so that no events get missed). If any subscriber attempts to register after at least one event has been posted, then the service will fail fast and the framework will not start. The error looks something like: To ensure that subscriber domain services are initialized before \"seed\" domain services, the @DomainServiceLayout#menuOrder() attribute can be used. Normally this attribute is just used to order UI-visible services on the menu bars, but it also is used internally to sequence the internal list of services being initialized. Alternatively, you can disable this checking within the EventBusService using: If you do that, be aware that not all subscribers may not receive some events generated by other domain services.
For more details, see the EventBusService man page. ","description":" One possible issue is that (as per ISIS-830) the EventBusService is now initialized as one of the first domain services; this is to ensure that any object lifecycle events caused by domain services initializing themselves can be posted on the event bus for subscribers. The typical case for such","id":16629694},"17000573":{"title":"ObjectCreatedEvent","url":"guides/rgcms/rgcms.html#_rgcms_classes_lifecycleevent_ObjectCreatedEvent","body":"ObjectCreatedEvent Subclass of AbstractLifecycleEvent, broadcast when an object is first instantiated using the DomainObjectContainer's #newTransientInstance(…) method. ObjectCreatedEvent.Default is the concrete implementation that is used. ","description":" Subclass of AbstractLifecycleEvent, broadcast when an object is first instantiated using the DomainObjectContainer's #newTransientInstance(…) method. ","id":17000573},"17618894":{"title":"New Feature","url":"releas
e-notes/release-notes.html#_new_feature_20","body":"New Feature ","description":"","id":17618894},"18445041":{"title":"Verifying Releases","url":"downloads.html#_verifying_releases","body":"Verifying Releases ","description":"","id":18445041},"19254915":{"title":"API & Implementation","url":"guides/rgsvc/rgsvc.html#_api_implementation_7","body":"API & Implementation The CommandContext request-scoped service defines the following very simple API: This class (o.a.i.applib.services.CommandContext) is also the default implementation. Under normal circumstances there shouldn’t be any need to replace this implementation with another. But if you do need to for some reason, then subclass and use @DomainServiceLayout#menuOrder() (as explained in the introduction to this guide). The Command type referenced above is in fact an interface, defined as: ","description":" The CommandContext request-scoped service defines the following very simple API: ","id":19254915},"21190750":{"title":"Run
the archetype","url":"pages/tg/tg.html#_run_the_archetype","body":"Run the archetype ","description":"","id":21190750},"21212015":{"title":"Key features","url":"pages/powered-by/powered-by.html#_key_features","body":"Key features ","description":"","id":21212015},"21857601":{"title":"Other Guides","url":"guides/cgcom/cgcom.html#_other_guides","body":"Other Guides Apache Isis documentation is broken out into a number of user, reference and \"supporting procedures\" guides. The user guides available are: The reference guides are: The remaining guides are: This guide provides guidance for Apache Isis' own committers. ","description":" Apache Isis documentation is broken out into a number of user, reference and \"supporting procedures\" guides. ","id":21857601},"22342496":{"title":"Deploy","url":"guides/cgcom/cgcom.html#__cgcom_cutting-a-release_releasing-core_deploy","body":"Deploy Previously the release procedures used mvn release:prepare and mvn release:perform. These are howe
ver not compatible with ${revision} that we now use for CI/CD. We therefore just use mvn deploy directly, activating the (inherited) apache-release profile that, amongst other things, brings in the gpg plugin for code signing. To build and deploy and tag, we use: using your own GPG passphrase, of course. ","description":" Previously the release procedures used mvn release:prepare and mvn release:perform. These are however not compatible with ${revision} that we now use for CI/CD. ","id":22342496},"23125949":{"title":"Editing","url":"guides/dg/dg.html#__dg_ide_intellij_hints-and-tips_editing","body":"Editing ","description":"","id":23125949},"23524101":{"title":"Collections","url":"guides/ugvw/ugvw.html#_collections","body":"Collections In the final row the collections are placed in tabs, simply one collection per tab. This corresponds to the following XML: As with properties, actions can be associated with collections; this indicates that they should be rendered in the collecti
on’s header. ","description":" In the final row the collections are placed in tabs, simply one collection per tab. This corresponds to the following XML: ","id":23524101},"26509816":{"title":"Commit changes","url":"guides/cgcom/cgcom.html#__cgcom_cutting-a-release_releasing-core_commit-changes","body":"Commit changes Commit any changes from the preceding steps: ","description":" Commit any changes from the preceding steps: ","id":26509816},"27806498":{"title":"renderedAsDayBefore()","url":"guides/rgant/rgant.html#_rgant-ParameterLayout_renderedAsDayBefore","body":"renderedAsDayBefore() The renderedAsDayBefore() attribute applies only to date parameters whereby the date will be rendered as the day before the value actually held in the domain object. It is ignored for parameters of other types. This attribute is also supported for properties. This behaviour might at first glance appear odd, but the rationale is to support the use case of a sequence of instances that represent adj
acent intervals of time. In such cases there would typically be startDate and endDate properties, eg for all of Q2. Storing this as a half-closed interval — eg [1-Apr-2015, 1-July-2015) — can substantially simplify internal algorithms; the endDate of one interval will correspond to the startDate of the next. However, from an end-user perspective the requirement may be to render the interval as a fully closed interval; eg the end date should be shown as 30-Jun-2015. This attribute therefore bridges the gap; it presents the information in a way that makes sense to an end-user, but also stores the domain object in a way that is easy work with internally. For example: ","description":" The renderedAsDayBefore() attribute applies only to date parameters whereby the date will be rendered as the day before the value actually held in the domain object. It is ignored for parameters of other types. This attribute is also supported for properties. ","id":27806498},"31312523":{"title":"D
eclarative style","url":"guides/htg.html#_declarative_style_3","body":"Declarative style To render an object with a particular CSS, use @DomainObjectLayout#cssClass(). When the domain object is rendered on its own page, this CSS class will appear on a top-level <div>. Or, when the domain object is rendered as a row in a collection, then the CSS class will appear in a <div> wrapped by the <tr> of the row. One possible use case would be to render the most important object types with a subtle background colour: Customers shown in light green, or Orders shown in a light pink, for example. ","description":" To render an object with a particular CSS, use @DomainObjectLayout#cssClass(). ","id":31312523},"31857620":{"title":"Interacting with the services","url":"guides/rgsvc/rgsvc.html#_interacting_with_the_services","body":"Interacting with the services Typically domain objects will have little need to interact with the CommandContext and Command directly; what is more useful is that t
hese are persisted in support of the various use cases identified above. One case however where a domain object might want to obtain the Command is to determine whether it has been invoked in the foreground, or in the background. It can do this using the getExecutedIn() method: Although not often needed, this then allows the domain object to access the Command object through the CommandContext service. To expand th above example: If run in the background, it might then notify the user (eg by email) if all work is done. This leads us onto a related point, distinguishing the current effective user vs the originating \"real\" user. When running in the foreground, the current user can be obtained from the UserService, using: If running in the background, however, then the current user will be the credentials of the background process, for example as run by a Quartz scheduler job. The domain object can still obtain the original (\"effective\") user that caused the job to be created
, using: ","description":" Typically domain objects will have little need to interact with the CommandContext and Command directly; what is more useful is that these are persisted in support of the various use cases identified above. ","id":31857620},"31966407":{"title":"Icons","url":"guides/htg.html#_icons","body":"Icons Action icons can be specified in several ways. One option is to use the @ActionLayout#cssClassFa(). For example: Alternatively, you can specify these hints dynamically in the Xxx.layout.xml for the entity: Rather than annotating every action with @ActionLayout#cssClassFa() and @ActionLayout#cssClass() you can instead specify the UI hint globally using regular expressions. Not only does this save a lot of boilerplate/editing, it helps ensure consistency across all actions. To declare fa classes globally, use the configuration property isis.reflector.facet.cssClassFa.patterns (a comma separated list of key:value pairs). For example: Here: For example, \"fa-pl
us\" is applied to all action members called \"newXxx\" ","description":" Action icons can be specified in several ways. ","id":31966407},"36571775":{"title":"runtime-legacy","url":"migration-notes/migration-notes.html#_runtime_legacy","body":"runtime-legacy ","description":"","id":36571775},"36734123":{"title":"Bug","url":"release-notes/release-notes.html#_bug_8","body":"Bug ","description":"","id":36734123},"39248326":{"title":"Runtime vs Noop implementation","url":"guides/rgfis/rgfis.html#_runtime_vs_noop_implementation","body":"Runtime vs Noop implementation The framework provides two implementations: The …Default implementation takes priority over the …Noop implementation. ","description":" The framework provides two implementations: ","id":39248326},"39290887":{"title":"Implementation","url":"guides/rgsvc/rgsvc.html#_implementation_22","body":"Implementation The core framework provides a default implementation of this service (o.a.i.core.metamodel.services.contain
er.DomainObjectContainerDefault). ","description":" The core framework provides a default implementation of this service (o.a.i.core.metamodel.services.container.DomainObjectContainerDefault). ","id":39290887},"42240053":{"title":"Screenshots","url":"guides/ugvw/ugvw.html#_screenshots_9","body":"Screenshots With 'password reset' not suppressed (the default): and with the link suppressed: ","description":" With 'password reset' not suppressed (the default): ","id":42240053},"44483327":{"title":"New Feature","url":"release-notes/release-notes.html#_new_feature_17","body":"New Feature ","description":"","id":44483327},"45128293":{"title":"getConfigurationProperties()","url":"guides/rgcms/rgcms.html#__rgcms_classes_AppManifest-bootstrapping_api_getConfigurationProperties","body":"getConfigurationProperties() This method allow arbitrary other configuration properties to be overridden. One common use case is in conjunction with the getFixtures() method, discussed above: ","description"
:" This method allow arbitrary other configuration properties to be overridden. One common use case is in conjunction with the getFixtures() method, discussed above: ","id":45128293},"45847666":{"title":"Recreate the archetype","url":"guides/cgcom/cgcom.html#__cgcom_cutting-a-release_releasing-the-helloworld-archetype_create-the-archetype","body":"Recreate the archetype Make sure you are in the correct directory and environment variables are correct. To recreate the helloworld archetype: Then, run the script (which also builds the archetype once generated) and then switch to the archetype’s directory: The script automatically commits its changes. If you wish use git log and git diff (or a tool such as SourceTree) to review changes made. ","description":" Make sure you are in the correct directory and environment variables are correct. ","id":45847666},"57327287":{"title":"cssClassFa()","url":"guides/rgant/rgant.html#_rgant-ViewModelLayout_cssClassFa","body":"cssClassFa() The
cssClassFa() attribute is used to specify the name of a Font Awesome icon name, to be rendered as the domain object’s icon. These attribute can also be applied to domain objects to specify the object’s icon, and to actions to specify an icon for the action’s representation as a button or menu item. If necessary the icon specified can be overridden by a particular object instance using the iconName() method. For example: There can be multiple \"fa-\" classes, eg to mirror or rotate the icon. There is no need to include the mandatory fa \"marker\" CSS class; it will be automatically added to the list. The fa- prefix can also be omitted from the class names; it will be prepended to each if required. The related cssClassFaPosition() attribute is currently unused for domain objects; the icon is always rendered to the left. ","description":" The cssClassFa() attribute is used to specify the name of a Font Awesome icon name, to be rendered as the domain object’s icon. ","id":5
7327287},"62314289":{"title":"Menu Bars Layout","url":"guides/ugvw/ugvw.html#_ugvw_menubars-layout","body":"Menu Bars Layout ","description":"","id":62314289},"64932464":{"title":"Other Guides","url":"guides/ugtst/ugtst.html#_other_guides","body":"Other Guides Apache Isis documentation is broken out into a number of user, reference and \"supporting procedures\" guides. The user guides available are: The reference guides are: The remaining guides are: ","description":" Apache Isis documentation is broken out into a number of user, reference and \"supporting procedures\" guides. ","id":64932464},"66604001":{"title":"@Programmatic","url":"guides/rgant/rgant.html#_rgant-Programmatic","body":"@Programmatic ","description":"","id":66604001},"68441589":{"title":"License headers","url":"guides/cgcom/cgcom.html#__cgcom_cutting-a-release_releasing-core_license-headers","body":"License headers The Apache Release Audit Tool RAT (from the Apache Creadur project) checks for missing license h
eader files. The parent pom.xml of each releasable module specifies the RAT Maven plugin, with a number of custom exclusions. To run the RAT tool, use: where rat.numUnapprovedLicenses property is set to a high figure, temporarily overriding the default value of 0. This will allow the command to run over all submodules, rather than failing after the first one. The command writes out a target\\rat.txt for each submodule. missing license notes are indicated using the key !???. The for command collates all the errors. Investigate and fix any reported violations, typically by either: To add missing headers, use the groovy script addmissinglicenses.groovy (in the scripts directory) to automatically insert missing headers for certain file types. The actual files checked are those with extensions specified in the line def fileEndings = [\".java\", \".htm\"]: (If the -x is omitted then the script is run in \"dry run\" mode). Once you’ve fixed all issues, confirm once more that apache-
rat-plugin no longer reports any license violations, this time leaving the rat.numUnapprovedLicenses property to its default, 0: ","description":" The Apache Release Audit Tool RAT (from the Apache Creadur project) checks for missing license header files. The parent pom.xml of each releasable module specifies the RAT Maven plugin, with a number of custom exclusions. ","id":68441589},"73703450":{"title":"New Feature","url":"release-notes/release-notes.html#_new_feature_29","body":"New Feature ","description":"","id":73703450},"74705826":{"title":"How to implement a spellchecker?","url":"guides/htg.html#_ugbtb_hints-and-tips_how-to-implement-a-spellchecker","body":"How to implement a spellchecker? From this thread on the Apache Isis users mailing list: One way to implement is to use the event bus: if if the change is made through an edit, you can use @Property#domainEvent(). You’ll need some way to know which fields should be spell checked. Two ways spring to mind: And you’ll
(obviously) also need some sort of spell checker implementation to call. ","description":" From this thread on the Apache Isis users mailing list: ","id":74705826},"75054401":{"title":"Supporting Method Prefixes","url":"guides/rgcms/rgcms.html#_rgcms_methods_prefixes","body":"Supporting Method Prefixes Supporting methods are those that are associated with properties, collections and actions, providing additional imperative business rule checking and behaviour to be performed when the user interacts with those object members. This association is performed by name matching. Thus, a property called \"firstName\", derived from a method getFirstName() may have supporting methods hideFirstName(), disableFirstName() and validateFirstName(). Supporting methods are, therefore, each characterized by their own particular prefix. The table below lists the method prefixes that are recognized as part of Apache Isis' default programming model. ","description":" Supporting methods are those tha
t are associated with properties, collections and actions, providing additional imperative business rule checking and behaviour to be performed when the user interacts with those object members. ","id":75054401},"77231561":{"title":"Interaction Execution","url":"guides/rgcms/rgcms.html#_rgcms_schema-ixn","body":"Interaction Execution The interaction (\"ixn\") schema defines the serialized form of an action invocation or a property edit. In fact, it actually defines a call-graph of such executions for those cases where the WrapperFactory is used to execute sub-actions/property edits. Each execution identifies the target object, the member to invoke, and the arguments. It also captures metrics about the execution, and the result of the execution (eg return value of an action invocation). ","description":" The interaction (\"ixn\") schema defines the serialized form of an action invocation or a property edit. In fact, it actually defines a call-graph of such executions for those case
s where the WrapperFactory is used to execute sub-actions/property edits. ","id":77231561},"78112488":{"title":"Screencast","url":"guides/ugvw/ugvw.html#_screencast","body":"Screencast This screencast describes the feature. ","description":" This screencast describes the feature. ","id":78112488},"78624086":{"title":"Other Guides","url":"guides/ugsec/ugsec.html#_other_guides","body":"Other Guides Apache Isis documentation is broken out into a number of user, reference and \"supporting procedures\" guides. The user guides available are: The reference guides are: The remaining guides are: ","description":" Apache Isis documentation is broken out into a number of user, reference and \"supporting procedures\" guides. ","id":78624086},"80534397":{"title":"ContentMappingService","url":"guides/rgsvc/rgsvc.html#_rgsvc_presentation-layer-spi_ContentMappingService","body":"ContentMappingService The ContentMappingService supports the (default implementation of the) ContentNegotiationServ
ice enabling the RestfulObjects viewer to represent domain objects in some other format as specified by the HTTP Accept header. See ContentNegotiationService for further discussion. ","description":" The ContentMappingService supports the (default implementation of the) ContentNegotiationService enabling the RestfulObjects viewer to represent domain objects in some other format as specified by the HTTP Accept header. ","id":80534397},"83803344":{"title":"MessageService","url":"guides/rgsvc/rgsvc.html#_rgsvc_application-layer-api_MessageService","body":"MessageService The MessageService allows domain objects to raise information, warning or error messages. These messages can either be simple strings, or can be translated. ","description":" The MessageService allows domain objects to raise information, warning or error messages. These messages can either be simple strings, or can be translated. ","id":83803344},"83933647":{"title":"Persistence Concerns","url":"guides/ugbtb/ugbtb.htm
l#_persistence_concerns","body":"Persistence Concerns ","description":"","id":83933647},"85931482":{"title":"Task","url":"release-notes/release-notes.html#_task_24","body":"Task ","description":"","id":85931482},"87271564":{"title":"2004:","url":"pages/articles-and-presentations/articles-and-presentations.html#_2004","body":"2004: ","description":"","id":87271564},"90561824":{"title":"Wicket Viewer","url":"release-notes/release-notes.html#_wicket_viewer_8","body":"Wicket Viewer ","description":"","id":90561824},"90935214":{"title":"Wicket Viewer","url":"release-notes/release-notes.html#_wicket_viewer_10","body":"Wicket Viewer ","description":"","id":90935214},"91902412":{"title":"The issue in more detail","url":"guides/ugodn/ugodn.html#_the_issue_in_more_detail","body":"The issue in more detail Consider these entities (yuml.me/b8681268): In the course of a transaction, the Agreement entity is loaded into memory (not necessarily modified), and then new AgreementRoles are associated
to it. All these entities implement Comparable using ObjectContracts, and the implementation of AgreementRole's (simplified) is: while Agreement's is implemented as: and Party's is similarly implemented as: DataNucleus’s persistence-by-reachability algorithm adds the AgreementRole instances into a SortedSet, which causes AgreementRole#compareTo() to fire: In other words, in figuring out whether AgreementRole requires the persistence-by-reachability algorithm to run, it causes the adjacent associated entity Party to also be retrieved. ","description":" Consider these entities (yuml.me/b8681268): ","id":91902412},"92467660":{"title":"API and Usage","url":"guides/ugtst/ugtst.html#_ugtst_fixture-scripts_api-and-usage","body":"API and Usage There are two main parts to using fixture scripts: the FixtureScripts domain service class, and the FixtureScript view model class: Let’s look at FixtureScripts domain service in more detail first. ","description":" There are two main part
s to using fixture scripts: the FixtureScripts domain service class, and the FixtureScript view model class: ","id":92467660},"96583162":{"title":"Configure toolchains plugin","url":"guides/cgcom/cgcom.html#_configure_toolchains_plugin","body":"Configure toolchains plugin Apache Isis releases are built using Java 7, enforced using the maven toolchains plugin. Ensure that Java 7 is installed and the toolchains plugin is configured, as described in the contributors' guide. ","description":" Apache Isis releases are built using Java 7, enforced using the maven toolchains plugin. Ensure that Java 7 is installed and the toolchains plugin is configured, as described in the contributors' guide. ","id":96583162},"99090360":{"title":"Running the App","url":"guides/ugfun/ugfun.html#__ugfun_getting-started_simpleapp-archetype_running-the-app","body":"Running the App The simpleapp archetype generates a single WAR file, configured to run both the Wicket viewer and the Restful Objects viewer. T
he archetype also configures the DataNucleus/JDO Objectstore to use an in-memory HSQLDB connection. Once you’ve built the app, you can run the WAR in a variety of ways. ","description":" The simpleapp archetype generates a single WAR file, configured to run both the Wicket viewer and the Restful Objects viewer. The archetype also configures the DataNucleus/JDO Objectstore to use an in-memory HSQLDB connection. ","id":99090360},"100682258":{"title":"Update dependencies","url":"guides/cgcom/cgcom.html#_update_dependencies","body":"Update dependencies With the release complete, now is a good time to bump versions of dependencies (so that there is a full release cycle to identify any possible issues). You will probably want to create a new JIRA ticket for these updates (or if minor then use the \"catch-all\" JIRA ticket raised earlier for the next release). ","description":" With the release complete, now is a good time to bump versions of dependencies (so that there is a full rele
ase cycle to identify any possible issues). ","id":100682258},"102347041":{"title":"Bug","url":"release-notes/release-notes.html#_bug_10","body":"Bug ","description":"","id":102347041},"104167755":{"title":"How to implement a spellchecker?","url":"guides/ugbtb/ugbtb.html#_ugbtb_hints-and-tips_how-to-implement-a-spellchecker","body":"How to implement a spellchecker? From this thread on the Apache Isis users mailing list: One way to implement is to use the event bus: if if the change is made through an edit, you can use @Property#domainEvent(). You’ll need some way to know which fields should be spell checked. Two ways spring to mind: And you’ll (obviously) also need some sort of spell checker implementation to call. ","description":" From this thread on the Apache Isis users mailing list: ","id":104167755},"105480253":{"title":"Visitor","url":"guides/ugbtb/ugbtb.html#__code_visitor_code","body":"Visitor More often than not, you’ll want to visit every element in the metamo
del, and so for this you can instead subclass from MetaModelValidatorVisiting.Visitor: You can then create your custom validator by subclassing MetaModelValidatorComposite and adding the visiting validator: If you have more than one rule then each can live in its own visitor. ","description":" More often than not, you’ll want to visit every element in the metamodel, and so for this you can instead subclass from MetaModelValidatorVisiting.Visitor: ","id":105480253},"106558909":{"title":"contributedAs()","url":"guides/rgant/rgant.html#_rgant-ActionLayout_contributedAs","body":"contributedAs() For a domain service action that can be contributed, the contributedAs() attribute determines how it is contributed: as an action or as an association (ie a property or collection). The distinction between property or collection is automatic: if the action returns a java.util.Collection (or subtype) then the action is contributed as a collection; otherwise it is contributed as a property.
For a domain service action to be contributed, the domain services must have a nature nature of either VIEW or VIEW_CONTRIBUTIONS_ONLY, and the action must have safe action semantics, and takes a single argument, namely the contributee domain object. For example: It’s also possible to use the attribute to suppress the action completely: In such cases, though, it would probably make more sense to annotate the action as either hidden or indeed @Programmatic. ","description":" For a domain service action that can be contributed, the contributedAs() attribute determines how it is contributed: as an action or as an association (ie a property or collection). ","id":106558909},"106606865":{"title":"Using the Wicket Viewer","url":"guides/rgcfg/rgcfg.html#_using_the_wicket_viewer","body":"Using the Wicket Viewer Most of the you’re likely to run Apache Isis using the Wicket viewer. In this case Apache Isis' \"deployment type\" concept maps to Wicket’s \"configuration\" concept: Wic
ket’s mechanism for specifying the \"configuration\" is to use a context parameter in web.xml; Apache Isis automatically infers its own deployment type from this. In other words: ","description":" Most of the you’re likely to run Apache Isis using the Wicket viewer. In this case Apache Isis' \"deployment type\" concept maps to Wicket’s \"configuration\" concept: ","id":106606865},"108815435":{"title":"unchanging()","url":"guides/rgant/rgant.html#_rgant-PropertyLayout_unchanging","body":"unchanging() The unchanging() attribute is used to indicate that the value held by the property never changes over time, even when other properties of the object do change. Setting this attribute to true is used as a hint to the viewer to not redraw the property after an AJAX update of some other property/ies of the object have changed. This is primarily for performance, eg can improve the user experience when rendering PDFs/blobs. Note that for this to work, the viewer will also ensure that
none of the property’s parent component (such as a tab group panel) are re-rendered. For example: ","description":" The unchanging() attribute is used to indicate that the value held by the property never changes over time, even when other properties of the object do change. ","id":108815435},"109833874":{"title":"Persistable","url":"guides/rgcms/rgcms.html#_rgcms_classes_mixins_Persistable","body":"Persistable All domain entities automatically implement the DataNucleus Persistable role interface as a result of the enhancer process (the fully qualified class name is org.datanucleus.enhancement.Persistable). So as a developer you do not need to write any code to obtain the mixins that contribute to this interface. These mixin properties/actions are all associated with the \"Metadata\" fieldset. A number of other mixins also contribute properties or actions to the \"Metadata\" fieldset. ","description":" All domain entities automatically implement the DataNucleus Persistable rol
e interface as a result of the enhancer process (the fully qualified class name is org.datanucleus.enhancement.Persistable). So as a developer you do not need to write any code to obtain the mixins that contribute to this interface. ","id":109833874},"112375674":{"title":"Auditing","url":"migration-notes/migration-notes.html#_auditing","body":"Auditing The AuditingService SPI service has been deprecated, instead replaced by the AuditerService. There can be more than one implementation of this new SPI, and a framework-provided implementation (AuditerServiceLogging) will log to a file. The (non-ASF) Incode Platform's audit module also implements the new SPI. ","description":" The AuditingService SPI service has been deprecated, instead replaced by the AuditerService. ","id":112375674},"113098816":{"title":"DataNucleus Object Store","url":"guides/htg.html#_datanucleus_object_store","body":"DataNucleus Object Store ","description":"","id":113098816},"115229271":{"title":"Domain Entiti
es","url":"guides/ugfun/ugfun.html#_ugfun_programming-model_domain-entities","body":"Domain Entities Entities are persistent domain objects, with their persistence handled by JDO/DataNucleus. As such, they are mapped to a persistent object store, typically an RDBMS, with DataNucleus taking care of both lazy loading and also the persisting of modified (\"dirty\") objects. Domain entities are generally decorated with both DataNucleus and Apache Isis annotations. Let’s look at some of the most commonly-used annotations. To start with, entities are flagged as being \"persistence capable\", indicating how JDO/DataNucleus should manage their identity: All domain entities will have some sort of mandatory key properties. The example below is a very simple case, where the entity is identified by a name property: It’s also common for domain entities to have queries annotated on them. These are used by repository domain services to query for instances of the entity: DataNucleus provi
des several APIs for defining queries, including entirely programmatic and type-safe APIs; but JDOQL is very similar to SQL and so easily learnt. The corresponding repository method for the above query is: ","description":" Entities are persistent domain objects, with their persistence handled by JDO/DataNucleus. As such, they are mapped to a persistent object store, typically an RDBMS, with DataNucleus taking care of both lazy loading and also the persisting of modified (\"dirty\") objects. ","id":115229271},"121574190":{"title":"Related Services","url":"guides/rgsvc/rgsvc.html#_related_services_18","body":"Related Services The ActionInteractionContext service allows bulk actions to co-ordinate with each other. The QueryResultsCache is useful for caching the results of expensive method calls. ","description":" The ActionInteractionContext service allows bulk actions to co-ordinate with each other. ","id":121574190},"121879267":{"title":"Wicket Viewer","url":"release-notes/releas
e-notes.html#_wicket_viewer_2","body":"Wicket Viewer ","description":"","id":121879267},"122762699":{"title":"Contributee","url":"guides/rgcms/rgcms.html#_rgcms_classes_contributee","body":"Contributee The interfaces listed in this chapter act as contributees; they allow domain services to contribute actions/properties/collections to any domain objects that implement these interfaces. ","description":" The interfaces listed in this chapter act as contributees; they allow domain services to contribute actions/properties/collections to any domain objects that implement these interfaces. ","id":122762699},"125299345":{"title":"Example","url":"guides/rgant/rgant.html#_example_2","body":"Example This example is taken from the (non-ASF) Isis addons' todoapp: ","description":" This example is taken from the (non-ASF) Isis addons' todoapp: ","id":125299345},"125961908":{"title":"Do it!","url":"pages/tg/tg.html#_do_it","body":"Do it! ","description":"","id":125961908},"134804772":{"title":
"How to handle void/null results","url":"guides/ugbtb/ugbtb.html#_ugbtb_hints-and-tips_how-to-handle-void-and-null-results","body":"How to handle void/null results From this thread on the Apache Isis users mailing list: One way to implement this idea is to provide a custom implementation of the RoutingService SPI domain service. The default implementation will either return the current object (if not null), else the home page (as defined by @HomePage) if one exists. The following custom implementation refines this to use the breadcrumbs (available in the Wicket viewer) to return the first non-deleted domain object found in the list of breadcrumbs: Note that the above implementation uses Java 8, so if you are using Java 7 then you’ll need to backport accordingly. ","description":" From this thread on the Apache Isis users mailing list: ","id":134804772},"144529895":{"title":"Improvement","url":"release-notes/release-notes.html#_improvement_44","body":"Improvement ","description
":"","id":144529895},"153666205":{"title":"Implementation","url":"guides/rgsvc/rgsvc.html#_implementation_17","body":"Implementation The core framework provides a default implementation of this service (o.a.i.core.metamodel.services.title.TitleServiceDefault). ","description":" The core framework provides a default implementation of this service (o.a.i.core.metamodel.services.title.TitleServiceDefault). ","id":153666205},"155655500":{"title":"@PrimaryKey (javax.jdo)","url":"guides/rgant/rgant.html#_rgant-PrimaryKey","body":"@PrimaryKey (javax.jdo) ","description":"","id":155655500},"158069558":{"title":"Usability: Defaults","url":"pages/tg/tg.html#_usability_defaults","body":"Usability: Defaults ","description":"","id":158069558},"158897592":{"title":"Refactoring","url":"guides/dg/dg.html#__dg_ide_intellij_hints-and-tips_refactoring","body":"Refactoring Loads of good stuff on the Refactor menu; most used are: If you can’t remember all those shortcuts, just use ctrl-shift-alt-T
(might want to rebind that to something else!) and get a context-sensitive list of refactorings available for the currently selected object ","description":" Loads of good stuff on the Refactor menu; most used are: ","id":158897592},"159072030":{"title":"(non-ASF) Incode Platform","url":"migration-notes/migration-notes.html#_migration-notes_1.14.0-to-1.15.0_incode-platform","body":"(non-ASF) Incode Platform The various (non-ASF) Isis Addons and Incode Catalog have also been combined into a single \"Incode Platform\". While each module can still be consumed individually, the new platform versions consistently (a change in any one module will result in a re-release of all). This should make these modules easier to consume, and easier to maintain/develop. All the modules remain open source, still licensed under the ASF v2.0 license. As of this release, none of the groupIds or artifactIds have changed. They will be rationalized/made consistent in a future release; most probably to c
oincide with v2.0.0 of the framework. ","description":" The various (non-ASF) Isis Addons and Incode Catalog have also been combined into a single \"Incode Platform\". ","id":159072030},"160872749":{"title":"Related Services","url":"guides/rgfis/rgfis.html#_related_services","body":"Related Services The default implementation of ContentNegotiationService delegates to ContentMappingService (if present) to convert domain entities into a stable form (eg DTO). The ContentNegotiationService is itself called by the (default implementation of) RepresentationService. ","description":" The default implementation of ContentNegotiationService delegates to ContentMappingService (if present) to convert domain entities into a stable form (eg DTO). ","id":160872749},"163456888":{"title":"Dependency upgrade","url":"release-notes/release-notes.html#_dependency_upgrade_9","body":"Dependency upgrade ","description":"","id":163456888},"163915714":{"title":"web.xml","url":"migration-notes/migration-no
tes.html#_web_xml","body":"web.xml In the web.xml, the \"isis.viewers\" context-param is now ignored. Instead the viewer_wicket.properties and viewer_restfulobjects.properties will both be loaded if present (but neither need be present). ","description":" In the web.xml, the \"isis.viewers\" context-param is now ignored. Instead the viewer_wicket.properties and viewer_restfulobjects.properties will both be loaded if present (but neither need be present). ","id":163915714},"165602306":{"title":"GridLoaderService","url":"guides/rgsvc/rgsvc.html#_rgsvc_presentation-layer-spi_GridLoaderService","body":"GridLoaderService The GridLoaderService provides the ability to load the XML layout (grid) for a domain class. ","description":" The GridLoaderService provides the ability to load the XML layout (grid) for a domain class. ","id":165602306},"165750333":{"title":"loaded()","url":"guides/rgcms/rgcms.html#_rgcms_methods_lifecycle_loaded","body":"loaded() The loaded() lifecycle callback met
hod is called when a (persistent) object has just been loaded from the object store. ","description":" The loaded() lifecycle callback method is called when a (persistent) object has just been loaded from the object store. ","id":165750333},"166045728":{"title":"Sanity Check","url":"guides/cgcom/cgcom.html#_sanity_check_2","body":"Sanity Check Ensure that the framework builds ok using the same command that your CI server is set up to execute (see section above). ","description":" Ensure that the framework builds ok using the same command that your CI server is set up to execute (see section above). ","id":166045728},"166899251":{"title":"Installing and Setting up","url":"guides/dg/dg.html#__dg_ide_intellij_installing","body":"Installing and Setting up This section covers installation and setup. These notes/screenshots were prepared using IntelliJ Community Edition 14.1.x, but are believed to be compatible with more recent versions/other editions of the IDE. ","description":" This
section covers installation and setup. These notes/screenshots were prepared using IntelliJ Community Edition 14.1.x, but are believed to be compatible with more recent versions/other editions of the IDE. ","id":166899251},"167039338":{"title":"Task","url":"release-notes/release-notes.html#_task_14","body":"Task ","description":"","id":167039338},"169081251":{"title":"Interaction","url":"guides/rgsvc/rgsvc.html#__code_interaction_code","body":"Interaction The public API of the Interaction class consists of: This class is concrete (is also the implementation). ","description":" The public API of the Interaction class consists of: ","id":169081251},"174738887":{"title":"Related functionality","url":"guides/ugvw/ugvw.html#_related_functionality_2","body":"Related functionality The Recent Pages also lists recently visited pages, selected from a drop-down. ","description":" The Recent Pages also lists recently visited pages, selected from a drop-down. ","id":174738887},"175028546":{"t
itle":"Implementation","url":"guides/rgsvc/rgsvc.html#_implementation_5","body":"Implementation The framework provides a default implementation of this service, namely GridServiceDefault. ","description":" The framework provides a default implementation of this service, namely GridServiceDefault. ","id":175028546},"175197970":{"title":"Performance tuning","url":"pages/tg/tg.html#_performance_tuning","body":"Performance tuning ","description":"","id":175197970},"175636232":{"title":"RepositoryService","url":"guides/rgsvc/rgsvc.html#_rgsvc_persistence-layer-api_RepositoryService","body":"RepositoryService The RepositoryService collects together methods for creating, persisting and searching for entities from the underlying persistence store. It acts as an abstraction over the JDO/DataNucleus objectstore. You can use it during prototyping to write naive queries (find all rows, then filter using the Guava Predicate API, or you can use it to call JDO named queries using JDOQL. As an
alternative, you could also use JDO typesafe queries through the IsisJdoSupport service. ","description":" The RepositoryService collects together methods for creating, persisting and searching for entities from the underlying persistence store. It acts as an abstraction over the JDO/DataNucleus objectstore. ","id":175636232},"176767338":{"title":"Command and Events","url":"guides/rgsvc/rgsvc.html#__rgsvc_intro_commands-and-events","body":"Command and Events A good number of the domain services manage the execution of action invocations/property edits, along with the state of domain objects that are modified as a result of these. These services capture information which can then be used for various purposes, most notably for auditing or for publishing events, or for deferring execution such that the execution be performed in the background at some later date. The diagram below shows how these services fit together. The outline boxes are services while the coloured boxes represent
data structures - defined in the applib and therefore accessible to domain applications - which hold various information about the executions. To explain: Implementations of CommandService can use the Command#getMemento() method to obtain a XML equivalent of that Command, reified using the cmd.xsd schema. This can be converted back into a CommandDto using the CommandDtoUtils utility class (part of the applib). Similarly, implementations of PublisherService can use the InteractionDtoUtils utility class to obtain a InteractionDto representing the interaction, either just for a single execution or for the entire call-graph. This can be converted into XML in a similar fashion. Likewise, the PublishedObjects class passed to the PublisherService at the end of the interaction provides the PublishedObjects#getDto() method which returns a ChangesDto instance. This can be converted into XML using the ChangesDtoUtils utility class. One final point: multiple PublisherService implementation
s are supported because different implementations may have different responsibilities. For example, the (non-ASF) Incode Platform's publishmq module is responsible for publishing messages onto an ActiveMQ event bus, for inter-system communication. However, the SPI can also be used for profiling; each execution within the call-graph contains metrics of the number of objects loaded or modified as a result of that execution, and thus could be used for application profiling. The framework provides a default PublisherServiceLogging implementation that logs this using SLF4J. ","description":" A good number of the domain services manage the execution of action invocations/property edits, along with the state of domain objects that are modified as a result of these. These services capture information which can then be used for various purposes, most notably for auditing or for publishing events","id":176767338},"178125062":{"title":"domainEvent()","url":"guides/rgant/rgant.html#_rgant-Actio
n_domainEvent","body":"domainEvent() Whenever a domain object (or list of domain objects) is to be rendered, the framework fires off multiple domain events for every property, collection and action of the domain object. In the cases of the domain object’s actions, the events that are fired are: Subscribers subscribe through the EventBusService using either Guava or Axon Framework annotations and can influence each of these phases. By default the event raised is ActionDomainEvent.Default. For example: The domainEvent() attribute allows a custom subclass to be emitted allowing more precise subscriptions (to those subclasses) to be defined instead. This attribute is also supported for collections and properties. For example: The benefit is that subscribers can be more targeted as to the events that they subscribe to. ","description":" Whenever a domain object (or list of domain objects) is to be rendered, the framework fires off multiple domain events for every property, collec
tion and action of the domain object. In the cases of the domain object’s actions, the events that are fired are: ","id":178125062},"180783343":{"title":"TranslatableException","url":"guides/ugbtb/ugbtb.html#__code_translatableexception_code","body":"TranslatableException Another mechanism by which messages can be rendered to the user are as the result of exception messages thrown and recognized by an ExceptionRecognizer. In this case, if the exception implements TranslatableException, then the message will automatically be translated before being rendered. The TranslatableException itself takes the form: ","description":" Another mechanism by which messages can be rendered to the user are as the result of exception messages thrown and recognized by an ExceptionRecognizer. ","id":180783343},"183226640":{"title":"updatedLifecycleEvent()","url":"guides/rgant/rgant.html#_rgant-DomainObject_updatedLifecycleEvent","body":"updatedLifecycleEvent() Whenever a (persistent) domain object
has been modified and has been updated in the database, an \"updated\" lifecycle event is fired. Subscribers subscribe through the EventBusService and can use the event to obtain a reference to the domain object. By default the event raised is ObjectUpdatedEvent.Default. For example: The purpose of the updatedLifecycleEvent() attribute is to allows a custom subclass to be emitted instead. A similar attribute is available for other lifecycle events. For example: The benefit is that subscribers can be more targeted as to the events that they subscribe to. ","description":" Whenever a (persistent) domain object has been modified and has been updated in the database, an \"updated\" lifecycle event is fired. ","id":183226640},"188123644":{"title":"2013","url":"pages/articles-and-presentations/articles-and-presentations.html#_2013","body":"2013 ","description":"","id":188123644},"189180810":{"title":"HoldsUpdatedAt","url":"guides/rgcms/rgcms.html#_rgcms_classes_roles_HoldsUpdatedAt"
,"body":"HoldsUpdatedAt The HoldsUpdatedAt role interface allows the (framework-provided) TimestampService to update each object with the current timestamp whenever it is modified in a transaction. The interface is defined as: The current time is obtained from the ClockService. Entities that implement this interface often also implement HoldsUpdatedBy role interface; as a convenience the Timestampable interface combines the two roles. ","description":" The HoldsUpdatedAt role interface allows the (framework-provided) TimestampService to update each object with the current timestamp whenever it is modified in a transaction. ","id":189180810},"191180113":{"title":"persistence.xml","url":"guides/ugodn/ugodn.html#_ugodn_configuring_persistence-xml","body":"persistence.xml DataNucleus will for itself also and read the META-INF/persistence.xml. In theory it can hold mappings and even connection strings. However, with Apache Isis we tend to use annotations instead and externalize conn
ection strings. so its definition is extremely simply, specifying just the name of the \"persistence unit\". Here’s the one provided by the SimpleApp archetype: Normally all one needs to do is to change the persistence-unit name. See DataNucleus' documentation on persistence.xml to learn more. ","description":" DataNucleus will for itself also and read the META-INF/persistence.xml. In theory it can hold mappings and even connection strings. However, with Apache Isis we tend to use annotations instead and externalize connection strings. so its definition is extremely simply, specifying just the name of the \"persistence unit","id":191180113},"193219460":{"title":"API","url":"guides/rgsvc/rgsvc.html#_rgsvc_metadata-api_MetamodelService_api","body":"API The API defined by the service is: ","description":" The API defined by the service is: ","id":193219460},"193237835":{"title":"Core","url":"release-notes/release-notes.html#_core_8","body":"Core ","description":"","id":193237835}
,"194608562":{"title":"SPI","url":"guides/rgsvc/rgsvc.html#_spi_19","body":"SPI It is also possible to define use some other underlying event bus implementation, by implementing the EventBusImplementation SPI: As is probably obvious, the EventBusService just delegates down to these method calls when its own similarly named methods are called. If you do provide your own implementation of this SPI, be aware that your subscribers will need to use whatever convention is required (eg different annotations) such that the events are correctly routed through to your subscribers. If you have written your own implementation of the EventBusServiceImplementation SPI, then specify instead its fully-qualified class name: ","description":" It is also possible to define use some other underlying event bus implementation, by implementing the EventBusImplementation SPI: ","id":194608562},"195374240":{"title":"Update the LDAP committee (if a PMC member)","url":"guides/cgcom/cgcom.html#_update_the_
ldap_committee_if_a_pmc_member","body":"Update the LDAP committee (if a PMC member) (Assuming that the new committer is a PMC member), also add them as to the PMC committee. This takes two steps: The new committer does not officially become a member of the PMC until the ASF records have been updated. ","description":" (Assuming that the new committer is a PMC member), also add them as to the PMC committee. This takes two steps: ","id":195374240},"195848147":{"title":"ICLA, obtain new account","url":"guides/cgcom/cgcom.html#_icla_obtain_new_account","body":"ICLA, obtain new account If required (that is, if the committer is not already a committer for a different ASF project), then ask them to complete an ICLA. As a result of this, they should also get an @apache.org user name. More info can be found in the ASF new committers guide. ","description":" If required (that is, if the committer is not already a committer for a different ASF project), then ask them to complete an ICLA. A
s a result of this, they should also get an @apache.org user name. ","id":195848147},"196560907":{"title":"XJC profile","url":"guides/rgmvn/rgmvn.html#__rgmvn_xsd_xsd-submodule_xjc-profile","body":"XJC profile The xjc profile reads the XSD generated by the xsd goal, and from it generates Java DTOs. Note that this isn’t round-tripping: the original view model is only for use within the Isis app, whereas the DTO generated from the XSDs is for use in a standalone context, eg in a Java subscriber on an event bus. The xjc profile is defined as: The referenced catalog.xml file instructs the xjc plugin how to resolve referenced schema locations. Only a reference for the Apache Isis common schema is likely to be needed: ","description":" The xjc profile reads the XSD generated by the xsd goal, and from it generates Java DTOs. Note that this isn’t round-tripping: the original view model is only for use within the Isis app, whereas the DTO generated from the XSDs is for use in a standa
lone context","id":196560907},"198329644":{"title":"Strings (Length)","url":"guides/ugfun/ugfun.html#__ugfun_programming-model_properties_datatypes_strings","body":"Strings (Length) By default JDO/DataNucleus will map string properties to a VARCHAR(255). To limit the length, use the @Column(length=…) annotation. For example: This is a good example of a case where Apache Isis infers domain semantics from the JDO annotation. ","description":" By default JDO/DataNucleus will map string properties to a VARCHAR(255). To limit the length, use the @Column(length=…) annotation. ","id":198329644},"198382465":{"title":"Actions","url":"pages/tg/tg.html#_actions","body":"Actions ","description":"","id":198382465},"201216196":{"title":"GitLab","url":"guides/ugfun/ugfun.html#_gitlab","body":"GitLab Create a git repository \"myapp\" in GitLab. Using Settings > CI/CD, specify the following Secret Variables: Finally, push a copy of the generated application to this repository using t
he instructions provided by GitLab. This will kick off a pipeline that will build the image and push to DockerHub. The tag name is based on a combination of the date, the branch and the git shaId. ","description":" Create a git repository \"myapp\" in GitLab. ","id":201216196},"203208629":{"title":"New Feature","url":"release-notes/release-notes.html#_new_feature_18","body":"New Feature ","description":"","id":203208629},"203740710":{"title":"RoutingService","url":"guides/rgsvc/rgsvc.html#_rgsvc_presentation-layer-spi_RoutingService","body":"RoutingService The RoutingService provides the ability to return (and therefore render) an alternative object from an action invocation. There are two primary use cases: Currently the routing service is used only by the Wicket viewer; it is ignored by the Restful Objects viewer. ","description":" The RoutingService provides the ability to return (and therefore render) an alternative object from an action invocation. ","id":203740710},"20445
2611":{"title":"Related services","url":"guides/rgsvc/rgsvc.html#_related_services_15","body":"Related services The ConfigurationServiceMenu exposes the allConfigurationProperties action in the user interface. ","description":" The ConfigurationServiceMenu exposes the allConfigurationProperties action in the user interface. ","id":204452611},"207811701":{"title":"API","url":"guides/rgsvc/rgsvc.html#_api_2","body":"API The API of TitleService is: ","description":" The API of TitleService is: ","id":207811701},"209853740":{"title":"To run","url":"guides/rgmvn/rgmvn.html#_to_run","body":"To run The plugin is activated by default, so is run simply using: This will run any tests, and then also - because the plugin is activated by the isis-validate property and bound to the test phase, will run the plugin’s validate goal. If for any reason you want to disable the validation, use: ","description":" The plugin is activated by default, so is run simply using: ","id":209853740},"213642
269":{"title":"Moving on","url":"guides/ugfun/ugfun.html#__ugfun_getting-started_helloworld-archetype_moving-on","body":"Moving on When you are ready to start working on your own app, we don’t recommend building on top of the helloworld app. Instead, we suggest that you start with the simpleapp archetype instead. Although a little more complex, it provides more structure and tests, all of which will help you as your application grows. ","description":" When you are ready to start working on your own app, we don’t recommend building on top of the helloworld app. ","id":213642269},"216231183":{"title":"Raising a pull request","url":"guides/dg/dg.html#_raising_a_pull_request","body":"Raising a pull request If you have your own fork, you can now simply push the changes you’ve made locally to your fork: This will create a corresponding branch in the remote github repo. If you use gitk --all, you’ll also see a remotes/origin/ISIS-123-blobs branch. Then, use github to raise a
pull request. Pull requests sent to the Apache GitHub repositories will forward a pull request e-mail to the dev mailing list. You’ll probably want to sign up to the dev mailing list first before issuing your first pull request (though that isn’t mandatory). The process to raise the pull request, broadly speaking: ","description":" If you have your own fork, you can now simply push the changes you’ve made locally to your fork: ","id":216231183},"220685197":{"title":"AbstractSubscriber","url":"guides/rgcms/rgcms.html#_rgcms_classes_super_AbstractSubscriber","body":"AbstractSubscriber This is a convenience superclass for creating subscriber domain services on the EventBusService. It uses @PostConstruct and @PreDestroy callbacks to automatically register/unregister itself with the EventBusService. It’s important that subscribers register before any domain services that might emit events on the EventBusService. For example, the (non-ASF) Incode Platform security module provid
es a domain service that automatically seeds certain domain entities; these will generate lifecycle events and so any subscribers must be registered before such seed services. The easiest way to do this is to use the @DomainServiceLayout#menuOrder() attribute. As a convenience, the AbstractSubscriber specifies this attribute. ","description":" This is a convenience superclass for creating subscriber domain services on the EventBusService. It uses @PostConstruct and @PreDestroy callbacks to automatically register/unregister itself with the EventBusService. ","id":220685197},"222371586":{"title":"Nullability","url":"guides/rgant/rgant.html#_rgant-Column_allowsNull","body":"Nullability The allowsNull() attribute is used to specify if a property is mandatory or is optional. For example: Isis also provides @Property#optionality() attribute. If both are specified, Apache Isis will check when it initializes for any contradictions, and will fail-fast with an appropriate error message in
the log if there are. You should also be aware that in the lack of either the @Column#allowsNull() or the @Property#optionality() attributes, that the JDO and Apache Isis defaults differ. Apache Isis rule is straight-forward: properties are assumed to be required. JDO on the other hand specifies that only primitive types are mandatory; everything else is assumed to be optional. Therefore a lack of either annotation can also trigger the fail-fast validation check. In the vast majority of cases you should be fine just to add the @Column#allowsNull() attribute to the getter. But see the documentation for @Property#optionality() attribute for discussion on one or two minor edge cases. ","description":" The allowsNull() attribute is used to specify if a property is mandatory or is optional. ","id":222371586},"224301547":{"title":"IsisWebAppBootstrapper","url":"guides/ugbtb/ugbtb.html#__code_isiswebappbootstrapper_code","body":"IsisWebAppBootstrapper The IsisWebAppBootstrapper servlet
context listener bootstraps the shared (global) metadata for the Apache Isis framework. This listener is not required (indeed must not be configured) if the Wicket viewer is in use. Its definition is: Its context parameters are: ","description":" The IsisWebAppBootstrapper servlet context listener bootstraps the shared (global) metadata for the Apache Isis framework. This listener is not required (indeed must not be configured) if the Wicket viewer is in use. ","id":224301547},"227377078":{"title":"Initialization","url":"guides/ugfun/ugfun.html#_ugfun_programming-model_domain-services_initialization","body":"Initialization Services can optionally declare lifecycle callbacks to initialize them (when the app is deployed) and to shut them down (when the app is undeployed). An Apache Isis session is available when initialization occurs (so services can interact with the object store, for example). The framework will call any public method annotated with @PostConstruct with either
no arguments of an argument of type Map<String,String>. In the latter case, the framework passes in the configuration (isis.properties and any other component-specific configuration files). Shutdown is similar; the framework will call any method annotated with @PreDestroy. ","description":" Services can optionally declare lifecycle callbacks to initialize them (when the app is deployed) and to shut them down (when the app is undeployed). ","id":227377078},"228550183":{"title":"Policies","url":"guides/cgcom/cgcom.html#_cgcom_policies","body":"Policies ","description":"","id":228550183},"229025509":{"title":"Remove references to isis-viewer-wicket parent pom.","url":"migration-notes/migration-notes.html#_remove_references_to_code_isis_viewer_wicket_code_parent_pom","body":"Remove references to isis-viewer-wicket parent pom. In earlier releases the Wicket viewer defined its own parent pom.xml for dependency management and its dependencies and to declare the various submodules that ma
ke up the viewer. This pom.xml has now been incorporated into the parent pom.xml for the Core framework. Therefore, in the parent pom.xml of your own domain applications, remove: ","description":" In earlier releases the Wicket viewer defined its own parent pom.xml for dependency management and its dependencies and to declare the various submodules that make up the viewer. This pom.xml has now been incorporated into the parent pom.xml for the Core framework. ","id":229025509},"230599582":{"title":"AuditingServiceInternal","url":"guides/rgfis/rgfis.html#_rgfis_persistence-layer_AuditingServiceInternal","body":"AuditingServiceInternal The (internal) AuditingServiceInternal domain service acts as an internal facade to any registered AuditerService service(s). It is responsible for obtaining the details of all changes to domain objects within an interaction, and then to call the configured AuditerService(s) to actually create audit entries of those changes. ","description":" The (inte
rnal) AuditingServiceInternal domain service acts as an internal facade to any registered AuditerService service(s). It is responsible for obtaining the details of all changes to domain objects within an interaction, and then to call the configured AuditerService(s) to actually create audit entries of those changes. ","id":230599582},"232471644":{"title":"Registering Subscribers","url":"guides/rgsvc/rgsvc.html#_registering_subscribers","body":"Registering Subscribers The register() method should be called in the @PostConstruct lifecycle method. It is valid and probably the least confusing to readers to also \"unregister\" in the @PreDestroy lifecycle method (though as noted above, unregistering is actually a no-op). For example: This works for both singleton (application-scoped) and also @RequestScoped domain services. ","description":" The register() method should be called in the @PostConstruct lifecycle method. It is valid and probably the least confusing to readers to also \"
unregister\" in the @PreDestroy lifecycle method (though as noted above, unregistering is actually a no-op). ","id":232471644},"238546442":{"title":"rebuildMetamodel()","url":"guides/rgcms/rgcms.html#__rgcms_classes_mixins_Object_rebuildMetamodel","body":"rebuildMetamodel() The Object_rebuildMetamodel mixin provides the ability to discard the current internal metamodel data (an instance of ObjectSpecification) for the domain class of the rendered object, and recreate from code and other sources (most notably, layout XML data). It has the following signature: ","description":" The Object_rebuildMetamodel mixin provides the ability to discard the current internal metamodel data (an instance of ObjectSpecification) for the domain class of the rendered object, and recreate from code and other sources (most notably, layout XML data). It has the following signature: ","id":238546442},"238979657":{"title":"New Feature","url":"release-notes/release-notes.html#_new_feature_22","body":"New F
eature ","description":"","id":238979657},"240026998":{"title":"Improvement","url":"release-notes/release-notes.html#_improvement_14","body":"Improvement ","description":"","id":240026998},"242030985":{"title":"1.4.0","url":"release-notes/release-notes.html#_release-notes_1.4.0","body":"1.4.0 ","description":"","id":242030985},"243439147":{"title":"hidden()","url":"guides/rgant/rgant.html#_rgant-Property_hidden","body":"hidden() Properties can be hidden at the domain-level, indicating that they are not visible to the end-user. This attribute can also be applied to actions and collections. For example: The acceptable values for the where parameter are: For example, if a property is annotated with @Title, then normally this should be hidden from all tables. Annotating with @Property(where=Where.NOWHERE) overrides this. ","description":" Properties can be hidden at the domain-level, indicating that they are not visible to the end-user. This attribute can also be applied to actions
and collections. ","id":243439147},"243876171":{"title":"Task","url":"release-notes/release-notes.html#_task_28","body":"Task ","description":"","id":243876171},"244520152":{"title":"SessionLoggingService","url":"guides/rgsvc/rgsvc.html#_rgsvc_presentation-layer-spi_SessionLoggingService","body":"SessionLoggingService The SessionLoggingService defines an SPI to keep track of (typically: to log) the current sessions that are using the application. ","description":" The SessionLoggingService defines an SPI to keep track of (typically: to log) the current sessions that are using the application. ","id":244520152},"246409050":{"title":"Using system properties","url":"guides/ugbtb/ugbtb.html#_using_system_properties","body":"Using system properties The servlet context initializer will search for any system properties called isis.xxx and if present will use them as overrides. Thus, an alternative option for a Docker image is to bootstrap the servlet container (Tomcat, Jetty) with appro
priate system properties set up. For example, with Tomcat this can be done by writing into the conf/catalina.properties file (see for example this stackoverflow post). The Docker’s ENTRYPOINT therefore just needs to parse the Docker container’s own command line arguments and use to create this file. ","description":" The servlet context initializer will search for any system properties called isis.xxx and if present will use them as overrides. ","id":246409050},"251015067":{"title":"myapp-dom Module","url":"migration-notes/migration-notes.html#__code_myapp_dom_code_module","body":"myapp-dom Module In your myapp-dom module (containing definitions of your persistent entities and domain services), create an empty class to represent the module. This should be at the root package for the domain, eg: Since there is no requirement to actually instantiate this class (it merely provides the location of the myapp.dom package), we give it a private constructor. If you have any other mo
dules where you have either domain services or entities, similarly create an empty \"module\" class. ","description":" In your myapp-dom module (containing definitions of your persistent entities and domain services), create an empty class to represent the module. This should be at the root package for the domain, eg: ","id":251015067},"255768608":{"title":"Multi-tenancy support","url":"pages/isis-in-pictures/isis-in-pictures.html#_multi_tenancy_support","body":"Multi-tenancy support One significant feature of the (non-ASF) Incode Platform's security module is the ability to associate users and objects with a \"tenancy\". The todoapp uses this feature so that different users' list of todo items are kept separate from one another. A user with administrator is able to switch their own \"tenancy\" to the tenancy of some other user, in order to access the objects in that tenancy: For more details, see the (non-ASF) Incode Platform's security module README. ","description":" One signif
icant feature of the (non-ASF) Incode Platform's security module is the ability to associate users and objects with a \"tenancy\". The todoapp uses this feature so that different users' list of todo items are kept separate from one another. A user with administrator is able to switch","id":255768608},"257661017":{"title":"AppManifest (bootstrapping)","url":"guides/rgcms/rgcms.html#_rgcms_classes_AppManifest-bootstrapping","body":"AppManifest (bootstrapping) This section describes how to implement the AppManifest interface to bootstrap both an Apache Isis web application, and also its integration tests. ","description":" This section describes how to implement the AppManifest interface to bootstrap both an Apache Isis web application, and also its integration tests. ","id":257661017},"259202548":{"title":"Run-as","url":"guides/htg.html#_ugsec_hints-and-tips_run-as","body":"Run-as This hint shows how to temporarily change the current user as reported by Shiro. This can be useful to
support \"Run As\", for example. The heavy lifting is done in ShiroService: This could be exposed in the UI using a simple RunAsService, for example: Credits: adapted from this gist. ","description":" This hint shows how to temporarily change the current user as reported by Shiro. This can be useful to support \"Run As\", for example. ","id":259202548},"259358868":{"title":"Hints and Tips","url":"guides/ugodn/ugodn.html#_ugodn_hints-and-tips","body":"Hints and Tips ","description":"","id":259358868},"266250802":{"title":"Implementation","url":"guides/rgsvc/rgsvc.html#_implementation_2","body":"Implementation There is no default implementation of this service. The (non-ASF) Isis addons' kitchensink app provides an example implementation: which is rendered as: ","description":" There is no default implementation of this service. ","id":266250802},"267695496":{"title":"Building Apache Isis","url":"guides/dg/dg.html#_dg_building-isis","body":"Building Apache Isis ","description":"
","id":267695496},"273843820":{"title":"Simulated UI (WrapperFactory)","url":"guides/ugtst/ugtst.html#_simulated_ui_code_wrapperfactory_code","body":"Simulated UI (WrapperFactory) When we talk about integration tests/specs here, we mean tests that exercise the domain object logic, through to the actual database. But we also want the tests to exercise the app from the users’s perspective, which means including the user interface. For most other frameworks that would require having to test the application in a very heavy weight/fragile fashion using a tool such as Selenium, driving a web browser to navigate . In this regard though, Apache Isis has a significant trick up its sleeve. Because Apache Isis implements the naked objects pattern, it means that the UI is generated automatically from declared domain-objects, -views and -services. This therefore allows for other implementations of the UI. The WrapperFactory domain service allows a test to wrap domain objects and thus to int
eract with said objects \"as if\" through the UI: If the test invokes an action that is disabled, then the wrapper will throw an appropriate exception. If the action is ok to invoke, it delegates through. What this means is that an Isis application can be tested end-to-end without having to deploy it onto a webserver; the whole app can be tested while running in-memory. Although integration tests re (necessarily) slower than unit tests, they are not any harder to write (in fact, in some respects they are easier). ","description":" When we talk about integration tests/specs here, we mean tests that exercise the domain object logic, through to the actual database. But we also want the tests to exercise the app from the users’s perspective, which means including the user interface. ","id":273843820},"273985863":{"title":"addTo…() (deprecated)","url":"guides/rgcms/rgcms.html#_rgcms_methods_prefixes_addTo","body":"addTo…() (deprecated) The addTo…() supporting method i
s called whenever an object is added to a collection. Its purpose is to allow additional business logic to be performed. For example: See also removeFrom…()` ","description":" The addTo…() supporting method is called whenever an object is added to a collection. Its purpose is to allow additional business logic to be performed. ","id":273985863},"278859977":{"title":"promptStyle()","url":"guides/rgant/rgant.html#_rgant-PropertyLayout_promptStyle","body":"promptStyle() The promptStyle() attribute is used to specify whether, when editing a domain object property, the new value for the property is prompted by way of a dialog box, or is prompted using an inline panel (replacing the property on the page). If the attribute is not set, then the value of the configuration property isis.viewer.wicket.promptStyle is used. If this is itself not set, then an inline prompt is used. For example: Alternatively, the promptStyle() can be specified using file-based layouts. ","descript
ion":" The promptStyle() attribute is used to specify whether, when editing a domain object property, the new value for the property is prompted by way of a dialog box, or is prompted using an inline panel (replacing the property on the page). ","id":278859977},"278890330":{"title":"Build a domain app","url":"pages/tg/tg.html#_build_a_domain_app","body":"Build a domain app ","description":"","id":278890330},"278999912":{"title":"Integration API","url":"guides/rgsvc/rgsvc.html#_rgsvc_integration-api","body":"Integration API ","description":"","id":278999912},"285898371":{"title":"ObjectUpdatedEvent","url":"guides/rgcms/rgcms.html#_rgcms_classes_lifecycleevent_ObjectUpdatedEvent","body":"ObjectUpdatedEvent Subclass of AbstractLifecycleEvent, broadcast when an object has just been updated in the database. This is done either explicitly when the current transaction is flushed using the DomainObjectContainer's #flush(…) method, else is done implicitly when the transaction commits a
t the end of the user request. ObjectUpdatedEvent.Default is the concrete implementation that is used. ","description":" Subclass of AbstractLifecycleEvent, broadcast when an object has just been updated in the database. This is done either explicitly when the current transaction is flushed using the DomainObjectContainer's #flush(…) method, else is done implicitly when the transaction commits at the end of the user request. ","id":285898371},"286919998":{"title":"Install Project Lombok","url":"guides/dg/dg.html#__dg_ide_eclipse_configure-lombok","body":"Install Project Lombok The SimpleApp archetype uses Project Lombok annotations (@Getter and @Setter and so on) to reduce the boilerplate. For Eclipse IDE this requires an installation step: Then restart Eclipse. ","description":" The SimpleApp archetype uses Project Lombok annotations (@Getter and @Setter and so on) to reduce the boilerplate. For Eclipse IDE this requires an installation step: ","id":286919998},"288377989":{
"title":"Philosophy and Architecture","url":"guides/ugfun/ugfun.html#_ugfun_core-concepts_philosophy","body":"Philosophy and Architecture This section describes some of the core ideas and architectural patterns upon which Apache Isis builds. ","description":" This section describes some of the core ideas and architectural patterns upon which Apache Isis builds. ","id":288377989},"288392697":{"title":"User Experience","url":"guides/ugvw/ugvw.html#_user_experience_3","body":"User Experience The copy URL dialog is typically obtained by clicking on the icon. Alternatively, alt+] will also open the dialog. It can be closed with either OK or the Esc key. ","description":" The copy URL dialog is typically obtained by clicking on the icon. ","id":288392697},"291813215":{"title":"Raising events programmatically","url":"guides/rgant/rgant.html#_raising_events_programmatically","body":"Raising events programmatically Normally events are only raised for interactions through the UI. However,
events can be raised programmatically either by calling the EventBusService API directly, or by emulating the UI by wrapping the target object using the WrapperFactory domain service. ","description":" Normally events are only raised for interactions through the UI. However, events can be raised programmatically either by calling the EventBusService API directly, or by emulating the UI by wrapping the target object using the WrapperFactory domain service. ","id":291813215},"292881794":{"title":"FixtureScript","url":"guides/ugtst/ugtst.html#_ugtst_fixture-scripts_api-and-usage_FixtureScript","body":"FixtureScript A fixture script is ultimately just a block of code that can be executed, so it’s up to you how you implement it to set up the system. However, we strongly recommend that you use it to invoke actions on business objects, in essence to replay what a real-life user would have done. That way, the fixture script will remain valid even if the underlying implementation of the
system changes in the future. For example, here’s a fixture script called RecreateSimpleObjects. (This used to be part of the SimpleApp archetype, though the archetype now ships with a more sophisticated design, discussed below): Because this script has exposed a \"number\" property, it’s possible to set this from within the UI. For example: When this is executed, the framework will parse the text and attempt to reflectively set the corresponding properties on the fixture result. So, in this case, when the fixture script is executed we actually get 6 objects created. ","description":" A fixture script is ultimately just a block of code that can be executed, so it’s up to you how you implement it to set up the system. However, we strongly recommend that you use it to invoke actions on business objects, in essence to replay what a real","id":292881794},"293860175":{"title":"Usage","url":"guides/rgsvc/rgsvc.html#_usage_10","body":"Usage The most common use-case is for bulk ac
tions that act upon multiple objects in a list. The (same) Scratchpad service is injected into each of these objects, and so they can use pass information. For example, the Isis addons example todoapp (not ASF) demonstrates how the Scratchpad service can be used to calculate the total cost of the selected `ToDoItem`s: A more complex example could use a view model to enable bulk updates to a set of objects. The view model’s job is to gather track of the items to be updated: The bulk action in the objects simply adds the selected item to the view model: If using the Wicket viewer, the ToDoItemBulkUpdate view model returned from the last action invoked will be displayed. Thereafter this view model can be used to perform a bulk update of the \"enlisted\" items. ","description":" The most common use-case is for bulk actions that act upon multiple objects in a list. The (same) Scratchpad service is injected into each of these objects, and so they can use pass information. ","id":293
860175},"295225295":{"title":"updatingLifecycleEvent()","url":"guides/rgant/rgant.html#_rgant-DomainObject_updatingLifecycleEvent","body":"updatingLifecycleEvent() Whenever a (persistent) domain object has been modified and is about to be updated to the database, an \"updating\" lifecycle event is fired. Subscribers subscribe through the EventBusService and can use the event to obtain a reference to the domain object. The subscriber could then, for example, update the object, or it could use it maintain an external datastore. One possible application is to maintain a full-text search database using Apache Lucene or similar. By default the event raised is ObjectUpdatingEvent.Default. For example: The purpose of the updatingLifecycleEvent() attribute is to allows a custom subclass to be emitted instead. A similar attribute is available for other lifecycle events. For example: The benefit is that subscribers can be more targeted as to the events that they subscribe to. ","descrip
tion":" Whenever a (persistent) domain object has been modified and is about to be updated to the database, an \"updating\" lifecycle event is fired. ","id":295225295},"295564393":{"title":"FactoryService","url":"guides/rgsvc/rgsvc.html#_rgsvc_core-domain-api_FactoryService","body":"FactoryService The FactoryService collects together methods for instantiating domain objects. ","description":" The FactoryService collects together methods for instantiating domain objects. ","id":295564393},"296009132":{"title":"Underlying Technology","url":"pages/powered-by/powered-by.html#_underlying_technology","body":"Underlying Technology With regard to the underlying technology, CQNZ™ is a mobile application served by a web application using RESTful web services. The core, the CQNZ application server, is built on Apache Isis framework, which is hosted on a cloud service provider, configured for high availability, load balancing and fail-over with highly elastic scalability, prepared to scale
from 1 server to tens, hundreds or even thousands of application servers running on Apache Isis. The client is a cross-platform mobile application now available on Apple Store and Google Play in the US, Mexico and Europe. ","description":" With regard to the underlying technology, CQNZ™ is a mobile application served by a web application using RESTful web services. The core, the CQNZ application server, is built on Apache Isis framework, which is hosted on a cloud service provider, configured for high availability, load balancing and fail-over with","id":296009132},"297314780":{"title":"Bug","url":"release-notes/release-notes.html#_bug_11","body":"Bug ","description":"","id":297314780},"298365005":{"title":"Command","url":"guides/rgcms/rgcms.html#_rgcms_schema-cmd","body":"Command The command (\"cmd\") schema defines the serialized form of the intention to invoke an action or to edit a property. It can be supplemented with optional timings capturing the actual invocation of a com
mand (introduced to support the replication of commands in a master/slave arrangement). ","description":" The command (\"cmd\") schema defines the serialized form of the intention to invoke an action or to edit a property. It can be supplemented with optional timings capturing the actual invocation of a command (introduced to support the replication of commands in a master/slave arrangement). ","id":298365005},"299154153":{"title":"Screenshots","url":"guides/ugvw/ugvw.html#_screenshots_5","body":"Screen
<TRUNCATED>
[05/39] isis-site git commit: ISIS-1810: updates docs for 2.0.0-M1
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/274edd1d/content/versions/SNAPSHOT/guides/ugvw/ugvw.pdf
----------------------------------------------------------------------
diff --git a/content/versions/SNAPSHOT/guides/ugvw/ugvw.pdf b/content/versions/SNAPSHOT/guides/ugvw/ugvw.pdf
index 0fea105..10ebf1c 100644
--- a/content/versions/SNAPSHOT/guides/ugvw/ugvw.pdf
+++ b/content/versions/SNAPSHOT/guides/ugvw/ugvw.pdf
@@ -4,8 +4,8 @@
<< /Title (Wicket Viewer)
/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:20180812182738+01'00')
-/ModDate (D:20180812182738+01'00')
+/CreationDate (D:20180814004122+02'00')
+/ModDate (D:20180814004122+02'00')
>>
endobj
2 0 obj
@@ -23,7 +23,7 @@ endobj
3 0 obj
<< /Type /Pages
/Count 94
-/Kids [7 0 R 10 0 R 12 0 R 14 0 R 38 0 R 50 0 R 63 0 R 71 0 R 79 0 R 88 0 R 94 0 R 100 0 R 109 0 R 113 0 R 116 0 R 127 0 R 131 0 R 144 0 R 151 0 R 160 0 R 167 0 R 170 0 R 181 0 R 187 0 R 193 0 R 203 0 R 217 0 R 220 0 R 233 0 R 240 0 R 245 0 R 250 0 R 264 0 R 276 0 R 285 0 R 288 0 R 293 0 R 298 0 R 305 0 R 309 0 R 313 0 R 321 0 R 337 0 R 339 0 R 347 0 R 356 0 R 358 0 R 362 0 R 369 0 R 375 0 R 378 0 R 380 0 R 387 0 R 397 0 R 403 0 R 411 0 R 416 0 R 423 0 R 430 0 R 436 0 R 445 0 R 451 0 R 462 0 R 467 0 R 471 0 R 480 0 R 484 0 R 493 0 R 501 0 R 507 0 R 509 0 R 516 0 R 520 0 R 525 0 R 528 0 R 532 0 R 536 0 R 543 0 R 546 0 R 553 0 R 557 0 R 575 0 R 584 0 R 587 0 R 592 0 R 599 0 R 603 0 R 606 0 R 621 0 R 623 0 R 631 0 R 633 0 R 638 0 R 641 0 R]
+/Kids [7 0 R 10 0 R 12 0 R 14 0 R 38 0 R 50 0 R 63 0 R 71 0 R 79 0 R 88 0 R 94 0 R 100 0 R 109 0 R 113 0 R 116 0 R 127 0 R 131 0 R 144 0 R 151 0 R 160 0 R 167 0 R 170 0 R 181 0 R 187 0 R 193 0 R 203 0 R 217 0 R 220 0 R 233 0 R 240 0 R 245 0 R 250 0 R 263 0 R 274 0 R 285 0 R 288 0 R 293 0 R 298 0 R 305 0 R 309 0 R 313 0 R 321 0 R 337 0 R 339 0 R 347 0 R 356 0 R 358 0 R 362 0 R 369 0 R 375 0 R 378 0 R 380 0 R 387 0 R 397 0 R 403 0 R 411 0 R 416 0 R 423 0 R 430 0 R 436 0 R 445 0 R 451 0 R 462 0 R 467 0 R 471 0 R 480 0 R 484 0 R 493 0 R 501 0 R 507 0 R 509 0 R 516 0 R 520 0 R 525 0 R 528 0 R 532 0 R 536 0 R 543 0 R 546 0 R 553 0 R 557 0 R 575 0 R 584 0 R 587 0 R 592 0 R 599 0 R 603 0 R 606 0 R 621 0 R 623 0 R 631 0 R 633 0 R 638 0 R 641 0 R]
>>
endobj
4 0 obj
@@ -33347,7 +33347,7 @@ stream
endstream
endobj
249 0 obj
-<< /Length 9442
+<< /Length 7623
>>
stream
q
@@ -33372,220 +33372,165 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-1.715 Tw
-
BT
48.24 335.524231292517 Td
/F1.0 10.5 Tf
-[<416c6c20746865206c61> 20.01953125 <796f757420616e6e6f746174696f6e732028656720>] TJ
+[<4c61> 20.01953125 <796f75742073656d616e746963732063616e20616c736f20626520737065636966696564207573696e672074686520766172696f757320>] 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
-1.715 Tw
-
BT
-206.18829854910712 335.524231292517 Td
+332.45379492187504 335.524231292517 Td
/F4.0 10.5 Tf
-<405265676578> Tj
+<5878784c61796f7574> 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
-1.715 Tw
-
BT
-237.68829854910712 335.524231292517 Td
+379.70379492187504 335.524231292517 Td
/F1.0 10.5 Tf
-<20616e6420> Tj
+<20616e6e6f746174696f6e733a> 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
-
-1.715 Tw
-
-BT
-265.66749999999996 335.524231292517 Td
-/F4.0 10.5 Tf
-<404e616d6564> Tj
-ET
-
-0.000 Tw
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
+-0.500 Tc
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-1.715 Tw
-
BT
-297.16749999999996 335.524231292517 Td
+56.88050000000001 307.744231292517 Td
/F1.0 10.5 Tf
-[<292068617665206265656e20646570726563617465642c20696e7374656164207265706c616365642062> 20.01953125 <7920746865>] TJ
+<a5> Tj
ET
-
-0.000 Tw
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
+
+0.000 Tc
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-12.048 Tw
-
BT
-48.24 319.74423129251704 Td
+66.24000000000001 307.744231292517 Td
/F1.0 10.5 Tf
-<766172696f757320> Tj
+<666f7220646f6d61696e2073657276696365733a20> 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
-12.048 Tw
-
BT
-100.73433333333332 319.74423129251704 Td
+170.9565 307.744231292517 Td
/F4.0 10.5 Tf
-<5878784c61796f7574> Tj
+<40446f6d61696e536572766963654c61796f7574> Tj
ET
-
-0.000 Tw
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
+
+-0.500 Tc
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-12.048 Tw
-
BT
-147.98433333333332 319.74423129251704 Td
+56.88050000000001 285.964231292517 Td
/F1.0 10.5 Tf
-<20616e6e6f746174696f6e733a20> Tj
+<a5> 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
-12.048 Tw
-
-BT
-240.23649999999998 319.74423129251704 Td
-/F4.0 10.5 Tf
-<40416374696f6e4c61796f7574> Tj
-ET
-
-
-0.000 Tw
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
+0.000 Tc
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-12.048 Tw
-
BT
-308.4865 319.74423129251704 Td
+66.24000000000001 285.964231292517 Td
/F1.0 10.5 Tf
-<20> Tj
+<666f7220646f6d61696e206f626a656374733a20> 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
-12.048 Tw
-
BT
-323.2543333333333 319.74423129251704 Td
+165.5595 285.964231292517 Td
/F4.0 10.5 Tf
-<40436f6c6c656374696f6e4c61796f7574> Tj
+<40446f6d61696e4f626a6563744c61796f7574> 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
-12.048 Tw
-
BT
-412.5043333333333 319.74423129251704 Td
+265.3095 285.964231292517 Td
/F1.0 10.5 Tf
-<2c2020> Tj
+<20616e6420> 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
-12.048 Tw
-
BT
-444.66499999999996 319.74423129251704 Td
+289.85850000000005 285.964231292517 Td
/F4.0 10.5 Tf
-<40446f6d61696e4f626a6563744c61796f7574> Tj
+<40566965774d6f64656c4c61796f7574> Tj
ET
-
-0.000 Tw
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
+
+-0.500 Tc
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-12.048 Tw
-
BT
-544.415 319.74423129251704 Td
+56.88050000000001 264.18423129251704 Td
/F1.0 10.5 Tf
-<2c> Tj
+<a5> Tj
ET
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+
+0.000 Tc
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+66.24000000000001 264.18423129251704 Td
+/F1.0 10.5 Tf
+<666f7220616374696f6e733a20> 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
BT
-48.24 303.964231292517 Td
+125.23950000000002 264.18423129251704 Td
/F4.0 10.5 Tf
-<40446f6d61696e536572766963654c61796f7574> Tj
+<40416374696f6e4c61796f7574> Tj
ET
0.000 0.000 0.000 SCN
@@ -33594,9 +33539,9 @@ ET
0.200 0.200 0.200 SCN
BT
-153.24 303.964231292517 Td
+193.48950000000002 264.18423129251704 Td
/F1.0 10.5 Tf
-<2c2020> Tj
+<20616e6420> Tj
ET
0.000 0.000 0.000 SCN
@@ -33605,20 +33550,35 @@ ET
0.694 0.129 0.275 SCN
BT
-161.304 303.964231292517 Td
+218.03850000000003 264.18423129251704 Td
/F4.0 10.5 Tf
<40506172616d657465724c61796f7574> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
+
+-0.500 Tc
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
BT
-245.304 303.964231292517 Td
+56.88050000000001 242.40423129251707 Td
/F1.0 10.5 Tf
-<2c20> Tj
+<a5> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+
+0.000 Tc
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+66.24000000000001 242.40423129251707 Td
+/F1.0 10.5 Tf
+<666f722070726f706572746965733a20> Tj
ET
0.000 0.000 0.000 SCN
@@ -33627,20 +33587,35 @@ ET
0.694 0.129 0.275 SCN
BT
-250.6485 303.964231292517 Td
+141.399 242.40423129251707 Td
/F4.0 10.5 Tf
<4050726f70657274794c61796f7574> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
+
+-0.500 Tc
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
BT
-329.3985 303.964231292517 Td
+56.88050000000001 220.62423129251707 Td
/F1.0 10.5 Tf
-<2c20616e6420> Tj
+<a5> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+
+0.000 Tc
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+66.24000000000001 220.62423129251707 Td
+/F1.0 10.5 Tf
+<666f7220636f6c6c656374696f6e733a20> Tj
ET
0.000 0.000 0.000 SCN
@@ -33649,9 +33624,9 @@ ET
0.694 0.129 0.275 SCN
BT
-356.5725 303.964231292517 Td
+142.69050000000001 220.62423129251707 Td
/F4.0 10.5 Tf
-<40566965774d6f64656c4c61796f7574> Tj
+<40436f6c6c656374696f6e4c61796f7574> Tj
ET
0.000 0.000 0.000 SCN
@@ -33660,7 +33635,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24 264.12423129251704 Td
+48.24000000000001 180.78423129251706 Td
/F2.0 18 Tf
[<332e322e2046696c652d6261736564204c61> 20.01953125 <796f757473>] TJ
ET
@@ -33673,7 +33648,7 @@ ET
0.969 Tw
BT
-48.24 236.104231292517 Td
+48.24000000000001 152.76423129251705 Td
/F1.0 10.5 Tf
<4d657461646174612070726f766964696e672055492068696e74732063616e206265207370656369666965642065697468657220> Tj
ET
@@ -33688,7 +33663,7 @@ ET
0.969 Tw
BT
-314.7543076923077 236.104231292517 Td
+314.7543076923077 152.76423129251705 Td
/F1.0 10.5 Tf
<7573696e6720616e6e6f746174696f6e73> Tj
ET
@@ -33703,7 +33678,7 @@ ET
0.969 Tw
BT
-405.31984615384613 236.104231292517 Td
+405.31984615384613 152.76423129251705 Td
/F1.0 10.5 Tf
<2c206f72207573696e6720616e20> Tj
ET
@@ -33718,7 +33693,7 @@ ET
0.969 Tw
BT
-473.53999999999996 236.104231292517 Td
+473.53999999999996 152.76423129251705 Td
/F4.0 10.5 Tf
<5878782e6c61796f75742e786d6c> Tj
ET
@@ -33733,7 +33708,7 @@ ET
0.969 Tw
BT
-547.04 236.104231292517 Td
+547.04 152.76423129251705 Td
ET
@@ -33744,7 +33719,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24 220.324231292517 Td
+48.24000000000001 136.98423129251705 Td
/F1.0 10.5 Tf
<66696c652028776865726520> Tj
ET
@@ -33755,7 +33730,7 @@ ET
0.694 0.129 0.275 SCN
BT
-105.2865 220.324231292517 Td
+105.28650000000002 136.98423129251705 Td
/F4.0 10.5 Tf
<587878> Tj
ET
@@ -33766,7 +33741,7 @@ ET
0.200 0.200 0.200 SCN
BT
-121.03650000000002 220.324231292517 Td
+121.03650000000002 136.98423129251705 Td
/F1.0 10.5 Tf
<2069732074686520656e74697479206f722076696577206d6f64656c206f626a65637420746f2062652072656e6465726564292e> Tj
ET
@@ -33777,7 +33752,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24 192.544231292517 Td
+48.24000000000001 109.20423129251705 Td
/F1.0 10.5 Tf
[<46696c652d6261736564206c61> 20.01953125 <796f757473206f666665722061206e756d626572206f662062656e65666974733a>] TJ
ET
@@ -33790,7 +33765,7 @@ ET
0.200 0.200 0.200 SCN
BT
-56.88050000000001 164.764231292517 Td
+56.88050000000001 81.42423129251705 Td
/F1.0 10.5 Tf
<a5> Tj
ET
@@ -33805,7 +33780,7 @@ ET
1.916 Tw
BT
-66.24000000000001 164.764231292517 Td
+66.24000000000001 81.42423129251705 Td
/F1.0 10.5 Tf
[<50726f6261626c79206d6f7374207369676e69666963616e746c79> 89.84375 <2c20746865206c61> 20.01953125 <796f75742063616e206265207570646174656420776974686f757420726571756972696e672061207265636f6d70696c65206f6620746865>] TJ
ET
@@ -33818,125 +33793,13 @@ ET
0.200 0.200 0.200 SCN
BT
-66.24000000000001 148.984231292517 Td
+66.24000000000001 65.64423129251705 Td
/F1.0 10.5 Tf
[<636f646520616e642072656465706c6f> 20.01953125 <79206f6620746865206170703b2066696e652d74756e696e6720746865206c61> 20.01953125 <796f7574207769746820796f757220656e64207573657273206973206561737920746f20646f>] TJ
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-
--0.500 Tc
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-BT
-56.88050000000001 127.204231292517 Td
-/F1.0 10.5 Tf
-<a5> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-
-0.000 Tc
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-1.205 Tw
-
-BT
-66.24000000000001 127.204231292517 Td
-/F1.0 10.5 Tf
-[<4d616e> 20.01953125 <7920646576656c6f7065727320616c736f2066696e642069742065617369657220746f2072> 20.01953125 <6174696f6e616c697a652061626f7574206c61> 20.01953125 <796f7574207768656e20616c6c207468652068696e74732061726520636f6c6c61746564>] 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
-
-BT
-66.24000000000001 111.42423129251699 Td
-/F1.0 10.5 Tf
-[<746f67657468657220696e20612073696e676c6520706c616365202872> 20.01953125 <6174686572207468616e20736361747465726564206163726f73732074686520636c617373206d656d6265727320617320616e6e6f746174696f6e73292e>] TJ
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-
--0.500 Tc
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-BT
-56.88050000000001 89.64423129251699 Td
-/F1.0 10.5 Tf
-<a5> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-
-0.000 Tc
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-3.105 Tw
-
-BT
-66.24000000000001 89.64423129251699 Td
-/F1.0 10.5 Tf
-<55492068696e74732063616e2062652070726f766964656420666f7220> Tj
-ET
-
-
-0.000 Tw
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-
-3.105 Tw
-
-BT
-227.90192307692308 89.64423129251699 Td
-/F1.0 10.5 Tf
-<636f6e7472696275746564206173736f63696174696f6e7320616e6420616374696f6e73> 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.105 Tw
-
-BT
-419.4553846153846 89.64423129251699 Td
-/F1.0 10.5 Tf
-<2074686174206172652073796e7468657369736564206174> 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
-
-BT
-66.24000000000001 73.86423129251699 Td
-/F1.0 10.5 Tf
-<72756e74696d652e> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
q
0.000 0.000 0.000 scn
0.000 0.000 0.000 SCN
@@ -33975,7 +33838,7 @@ endobj
/F4.0 53 0 R
>>
>>
-/Annots [251 0 R 253 0 R 254 0 R 255 0 R 256 0 R 257 0 R 258 0 R 259 0 R 261 0 R 262 0 R]
+/Annots [251 0 R 253 0 R 254 0 R 255 0 R 256 0 R 257 0 R 258 0 R 259 0 R 261 0 R]
>>
endobj
251 0 obj
@@ -33996,10 +33859,10 @@ endobj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
-/URI (../rgant/rgant.pdf#_rgant-ActionLayout, )
+/URI (../rgant/rgant.pdf#_rgant-DomainServiceLayout)
>>
/Subtype /Link
-/Rect [240.23649999999998 318.274231292517 308.4865 328.774231292517]
+/Rect [170.9565 306.27423129251696 275.9565 316.77423129251696]
/Type /Annot
>>
endobj
@@ -34007,10 +33870,10 @@ endobj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
-/URI (../rgant/rgant.pdf#_rgant-CollectionLayout)
+/URI (../rgant/rgant.pdf#_rgant-DomainObjectLayout)
>>
/Subtype /Link
-/Rect [323.2543333333333 318.274231292517 412.5043333333333 328.774231292517]
+/Rect [165.5595 284.49423129251704 265.3095 294.99423129251704]
/Type /Annot
>>
endobj
@@ -34018,10 +33881,10 @@ endobj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
-/URI (../rgant/rgant.pdf#_rgant-DomainObjectLayout)
+/URI (../rgant/rgant.pdf#_rgant-ViewModelLayout)
>>
/Subtype /Link
-/Rect [444.66499999999996 318.274231292517 544.415 328.774231292517]
+/Rect [289.85850000000005 284.49423129251704 373.85850000000005 294.99423129251704]
/Type /Annot
>>
endobj
@@ -34029,10 +33892,10 @@ endobj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
-/URI (../rgant/rgant.pdf#_rgant-DomainServiceLayout)
+/URI (../rgant/rgant.pdf#_rgant-ActionLayout, )
>>
/Subtype /Link
-/Rect [48.24 302.49423129251704 153.24 312.994231292517]
+/Rect [125.23950000000002 262.71423129251707 193.48950000000002 273.21423129251707]
/Type /Annot
>>
endobj
@@ -34043,7 +33906,7 @@ endobj
/URI (../rgant/rgant.pdf#_rgant-ParameterLayout)
>>
/Subtype /Link
-/Rect [161.304 302.49423129251704 245.304 312.994231292517]
+/Rect [218.03850000000003 262.71423129251707 302.0385 273.21423129251707]
/Type /Annot
>>
endobj
@@ -34054,7 +33917,7 @@ endobj
/URI (../rgant/rgant.pdf#_rgant-PropertyLayout)
>>
/Subtype /Link
-/Rect [250.6485 302.49423129251704 329.3985 312.994231292517]
+/Rect [141.399 240.93423129251707 220.149 251.43423129251707]
/Type /Annot
>>
endobj
@@ -34062,15 +33925,15 @@ endobj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
-/URI (../rgant/rgant.pdf#_rgant-ViewModelLayout)
+/URI (../rgant/rgant.pdf#_rgant-CollectionLayout)
>>
/Subtype /Link
-/Rect [356.5725 302.49423129251704 440.5725 312.994231292517]
+/Rect [142.69050000000001 219.15423129251707 231.94050000000001 229.65423129251707]
/Type /Annot
>>
endobj
260 0 obj
-[250 0 R /XYZ 0 288.14823129251704 null]
+[250 0 R /XYZ 0 204.80823129251706 null]
endobj
261 0 obj
<< /Border [0 0 0]
@@ -34079,35 +33942,136 @@ endobj
/URI (../ugvw/ugvw.pdf#_ugvw_layout_annotation-based)
>>
/Subtype /Link
-/Rect [314.7543076923077 233.038231292517 405.31984615384613 247.318231292517]
+/Rect [314.7543076923077 149.69823129251705 405.31984615384613 163.97823129251705]
/Type /Annot
>>
endobj
262 0 obj
-<< /Border [0 0 0]
-/A << /Type /Action
-/S /URI
-/URI (../ugfun/ugfun.pdf#_ugfun_how-tos_contributed-members)
->>
-/Subtype /Link
-/Rect [227.90192307692308 86.57823129251699 419.4553846153846 100.85823129251699]
-/Type /Annot
->>
-endobj
-263 0 obj
-<< /Length 15870
+<< /Length 16837
>>
stream
q
+
+-0.500 Tc
/DeviceRGB cs
0.200 0.200 0.200 scn
/DeviceRGB CS
0.200 0.200 0.200 SCN
+BT
+56.88050000000001 793.9259999999999 Td
+/F1.0 10.5 Tf
+<a5> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+
+0.000 Tc
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+1.205 Tw
+
+BT
+66.24000000000001 793.9259999999999 Td
+/F1.0 10.5 Tf
+[<4d616e> 20.01953125 <7920646576656c6f7065727320616c736f2066696e642069742065617369657220746f2072> 20.01953125 <6174696f6e616c697a652061626f7574206c61> 20.01953125 <796f7574207768656e20616c6c207468652068696e74732061726520636f6c6c61746564>] 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
+
+BT
+66.24000000000001 778.146 Td
+/F1.0 10.5 Tf
+[<746f67657468657220696e20612073696e676c6520706c616365202872> 20.01953125 <6174686572207468616e20736361747465726564206163726f73732074686520636c617373206d656d6265727320617320616e6e6f746174696f6e73292e>] TJ
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+
+-0.500 Tc
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+56.88050000000001 756.366 Td
+/F1.0 10.5 Tf
+<a5> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+
+0.000 Tc
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+3.105 Tw
+
+BT
+66.24000000000001 756.366 Td
+/F1.0 10.5 Tf
+<55492068696e74732063616e2062652070726f766964656420666f7220> Tj
+ET
+
+
+0.000 Tw
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+
+3.105 Tw
+
+BT
+227.90192307692308 756.366 Td
+/F1.0 10.5 Tf
+<636f6e7472696275746564206173736f63696174696f6e7320616e6420616374696f6e73> 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.105 Tw
+
+BT
+419.4553846153846 756.366 Td
+/F1.0 10.5 Tf
+<2074686174206172652073796e7468657369736564206174> 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
+
+BT
+66.24000000000001 740.586 Td
+/F1.0 10.5 Tf
+<72756e74696d652e> Tj
+ET
+
+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
+
0.066 Tw
BT
-48.24 794.6759999999999 Td
+48.24000000000001 712.806 Td
/F1.0 10.5 Tf
<497420697320616c736f20706f737369626c6520746f20646f776e6c6f616420616e20696e697469616c20> Tj
ET
@@ -34122,7 +34086,7 @@ ET
0.066 Tw
BT
-248.79420507812497 794.6759999999999 Td
+248.79420507812497 712.806 Td
/F4.0 10.5 Tf
<2e6c61796f75742e786d6c> Tj
ET
@@ -34137,7 +34101,7 @@ ET
0.066 Tw
BT
-306.544205078125 794.6759999999999 Td
+306.544205078125 712.806 Td
/F1.0 10.5 Tf
[<202d20636170747572696e6720616e> 20.01953125 <79206578697374696e67206c61> 20.01953125 <796f7574206d65746164617461202d207573696e67>] TJ
ET
@@ -34152,7 +34116,7 @@ ET
0.733 Tw
BT
-48.24 778.896 Td
+48.24000000000001 697.0260000000001 Td
/F1.0 10.5 Tf
<74686520> Tj
ET
@@ -34167,7 +34131,7 @@ ET
0.733 Tw
BT
-67.66257142857143 778.896 Td
+67.66257142857144 697.0260000000001 Td
/F4.0 10.5 Tf
<4c61796f757453657276696365> Tj
ET
@@ -34182,7 +34146,7 @@ ET
0.733 Tw
BT
-135.91257142857143 778.896 Td
+135.91257142857143 697.0260000000001 Td
/F1.0 10.5 Tf
<20286578706f736564206f6e207468652070726f746f747970696e67206d656e7529206f72207573696e67206120> Tj
ET
@@ -34197,7 +34161,7 @@ ET
0.733 Tw
BT
-376.0677142857143 778.896 Td
+376.0677142857143 697.0260000000001 Td
/F1.0 10.5 Tf
<6d6978696e20616374696f6e> Tj
ET
@@ -34212,7 +34176,7 @@ ET
0.733 Tw
BT
-439.91578571428573 778.896 Td
+439.91578571428573 697.0260000000001 Td
/F1.0 10.5 Tf
<20636f6e747269627574656420746f206576657279> Tj
ET
@@ -34225,7 +34189,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24 763.116 Td
+48.24000000000001 681.2460000000001 Td
/F1.0 10.5 Tf
<646f6d61696e206f626a6563742e> Tj
ET
@@ -34236,7 +34200,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24 735.3359999999999 Td
+48.24000000000001 653.466 Td
/F1.0 10.5 Tf
<54686572652061726520736f6d6520646f776e73696465732c2074686f7567683a> Tj
ET
@@ -34249,7 +34213,7 @@ ET
0.200 0.200 0.200 SCN
BT
-56.88050000000001 707.5559999999999 Td
+56.88050000000001 625.686 Td
/F1.0 10.5 Tf
<a5> Tj
ET
@@ -34264,7 +34228,7 @@ ET
0.123 Tw
BT
-66.24000000000001 707.5559999999999 Td
+66.24000000000001 625.686 Td
/F1.0 10.5 Tf
[<66696c652d6261736564206c61> 20.01953125 <796f75747320617265206e6f742074797065736166653a2061207479706f2077696c6c20726573756c7420696e20746865206d65746164617461206e6f74206265696e67207069636b> 20.01953125 <656420757020666f7220746865>] TJ
ET
@@ -34277,7 +34241,7 @@ ET
0.200 0.200 0.200 SCN
BT
-66.24000000000001 691.776 Td
+66.24000000000001 609.9060000000001 Td
/F1.0 10.5 Tf
<656c656d656e742e> Tj
ET
@@ -34290,7 +34254,7 @@ ET
0.200 0.200 0.200 SCN
BT
-56.88050000000001 669.996 Td
+56.88050000000001 588.1260000000001 Td
/F1.0 10.5 Tf
<a5> Tj
ET
@@ -34305,7 +34269,7 @@ ET
0.425 Tw
BT
-66.24000000000001 669.996 Td
+66.24000000000001 588.1260000000001 Td
/F1.0 10.5 Tf
[<74686579207375666665722066726f6d2073796e746163746963206672> 20.01953125 <6167696c6974793a20616e20696e76616c696420584d4c20646f63756d656e742077696c6c20726573756c7420696e206e6f206d6574616461746120666f7220746865>] TJ
ET
@@ -34318,7 +34282,7 @@ ET
0.200 0.200 0.200 SCN
BT
-66.24000000000001 654.216 Td
+66.24000000000001 572.3460000000001 Td
/F1.0 10.5 Tf
<656e7469726520636c6173732e> Tj
ET
@@ -34331,7 +34295,7 @@ ET
0.200 0.200 0.200 SCN
BT
-56.88050000000001 632.436 Td
+56.88050000000001 550.5660000000001 Td
/F1.0 10.5 Tf
<a5> Tj
ET
@@ -34346,7 +34310,7 @@ ET
1.041 Tw
BT
-66.24000000000001 632.436 Td
+66.24000000000001 550.5660000000003 Td
/F1.0 10.5 Tf
<7468657265206973206e6f206e6f74696f6e206f6620696e6865726974616e63652c20736f206120> Tj
ET
@@ -34361,7 +34325,7 @@ ET
1.041 Tw
BT
-263.57949999999994 632.436 Td
+263.57949999999994 550.5660000000003 Td
/F4.0 10.5 Tf
<2e6c61796f75742e786d6c> Tj
ET
@@ -34376,7 +34340,7 @@ ET
1.041 Tw
BT
-321.32949999999994 632.436 Td
+321.32949999999994 550.5660000000003 Td
/F1.0 10.5 Tf
<20697320726571756972656420666f7220616c6c20636f6e637265746520636c617373657320616e6420616c736f> Tj
ET
@@ -34391,7 +34355,7 @@ ET
1.999 Tw
BT
-66.24000000000001 616.6560000000001 Td
+66.24000000000001 534.7860000000002 Td
/F1.0 10.5 Tf
[<666f7220616e> 20.01953125 <79206162737472> 20.01953125 <61637420636c6173736573202869662075736564206173206120636f6c6c656374696f6e2074797065292e20496e20636f6e7472> 20.01953125 <6173742c207468652064657765792d646563696d616c20666f726d6174>] TJ
ET
@@ -34406,7 +34370,7 @@ ET
2.538 Tw
BT
-66.24000000000001 600.8760000000001 Td
+66.24000000000001 519.0060000000002 Td
/F4.0 10.5 Tf
<404d656d6265724f72646572> Tj
ET
@@ -34421,7 +34385,7 @@ ET
2.538 Tw
BT
-129.24 600.8760000000001 Td
+129.24 519.0060000000002 Td
/F1.0 10.5 Tf
<20616e6e6f746174696f6e20616c6c6f777320746865206d65746164617461206f662074686520737562636c61737320697473207375706572636c617373657320746f2066697420746f676574686572> Tj
ET
@@ -34434,7 +34398,7 @@ ET
0.200 0.200 0.200 SCN
BT
-66.24000000000001 585.0960000000001 Td
+66.24000000000001 503.2260000000002 Td
/F1.0 10.5 Tf
[<72656c61746976656c79207365616d6c6573736c79> 89.84375 <2e>] TJ
ET
@@ -34447,7 +34411,7 @@ ET
0.769 Tw
BT
-48.24000000000001 557.316 Td
+48.24000000000001 475.4460000000002 Td
/F1.0 10.5 Tf
<54686520> Tj
ET
@@ -34462,7 +34426,7 @@ ET
0.769 Tw
BT
-70.42898156738282 557.316 Td
+70.42898156738282 475.4460000000002 Td
/F4.0 10.5 Tf
<5878782e6c61796f75742e786d6c> Tj
ET
@@ -34477,7 +34441,7 @@ ET
0.769 Tw
BT
-143.92898156738283 557.316 Td
+143.92898156738283 475.4460000000002 Td
/F1.0 10.5 Tf
<2066696c65206973206a757374207468652073657269616c697a656420666f726d206f66206120> Tj
ET
@@ -34492,7 +34456,7 @@ ET
0.769 Tw
BT
-322.9028156738281 557.316 Td
+322.9028156738281 475.4460000000002 Td
/F4.0 10.5 Tf
<47726964> Tj
ET
@@ -34507,7 +34471,7 @@ ET
0.769 Tw
BT
-343.9028156738281 557.316 Td
+343.9028156738281 475.4460000000002 Td
/F1.0 10.5 Tf
[<206c61> 20.01953125 <796f757420636c61737320646566696e65642077697468696e20417061636865204973697327>] TJ
ET
@@ -34522,7 +34486,7 @@ ET
1.581 Tw
BT
-48.24000000000001 541.5360000000001 Td
+48.24000000000001 459.66600000000017 Td
/F1.0 10.5 Tf
[<6170706c69622e20546865736520617265204a4158422d616e6e6f746174656420636c6173736573207769746820636f72726573706f6e64696e672058> 9.765625 <534420736368656d61733b2074686520757073686f74206f662074686174206973>] TJ
ET
@@ -34537,7 +34501,7 @@ ET
0.257 Tw
BT
-48.24000000000001 525.7560000000001 Td
+48.24000000000001 443.8860000000002 Td
/F1.0 10.5 Tf
[<746861742049444573207375636820617320496e74656c6c694a20616e642045636c697073652063616e2070726f766964652022696e74656c6c6973656e7365222c206d616b696e672069746561737920746f20617574686f722073756368206c61> 20.01953125 <796f7574>] TJ
ET
@@ -34550,7 +34514,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24000000000001 509.9760000000001 Td
+48.24000000000001 428.1060000000002 Td
/F1.0 10.5 Tf
<66696c65732e> Tj
ET
@@ -34561,7 +34525,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24000000000001 475.47600000000006 Td
+48.24000000000001 393.60600000000017 Td
/F2.0 13 Tf
[<332e322e312e2053656172636820416c676f726974686d20284c696272> 20.01953125 <61727920537570706f727429>] TJ
ET
@@ -34574,7 +34538,7 @@ ET
1.087 Tw
BT
-48.24000000000001 448.91600000000005 Td
+48.24000000000001 367.04600000000016 Td
/F1.0 10.5 Tf
[<46> 40.0390625 <6f72206120676976656e20646f6d61696e206f626a65637420>] TJ
ET
@@ -34589,7 +34553,7 @@ ET
1.087 Tw
BT
-185.9517508544922 448.91600000000005 Td
+185.9517508544922 367.04600000000016 Td
/F4.0 10.5 Tf
<587878> Tj
ET
@@ -34604,7 +34568,7 @@ ET
1.087 Tw
BT
-201.7017508544922 448.91600000000005 Td
+201.7017508544922 367.04600000000016 Td
/F1.0 10.5 Tf
[<20746865206672> 20.01953125 <616d65776f726b20696e697469616c6c7920736561726368657320666f7220612066696c6520286f6e2074686520636c61737370617468292063616c6c6564>] TJ
ET
@@ -34617,7 +34581,7 @@ ET
0.694 0.129 0.275 SCN
BT
-48.24000000000001 433.1360000000001 Td
+48.24000000000001 351.2660000000002 Td
/F4.0 10.5 Tf
<5878782e6c61796f75742e786d6c> Tj
ET
@@ -34628,7 +34592,7 @@ ET
0.200 0.200 0.200 SCN
BT
-121.74000000000001 433.1360000000001 Td
+121.74000000000001 351.2660000000002 Td
/F1.0 10.5 Tf
<2e> Tj
ET
@@ -34641,7 +34605,7 @@ ET
0.915 Tw
BT
-48.24000000000001 405.35600000000005 Td
+48.24000000000001 323.48600000000016 Td
/F1.0 10.5 Tf
[<496620746869732063616ed57420626520666f756e642c207468656e20746865206672> 20.01953125 <616d65776f726b2077696c6c2073656172636820666f7220612066696c65206e616d656420>] TJ
ET
@@ -34656,7 +34620,7 @@ ET
0.915 Tw
BT
-412.30205299479167 405.35600000000005 Td
+412.30205299479167 323.48600000000016 Td
/F4.0 10.5 Tf
<5878782e6c61796f75742e66616c6c6261636b2e786d6c> Tj
ET
@@ -34671,7 +34635,7 @@ ET
0.915 Tw
BT
-533.0520529947917 405.35600000000005 Td
+533.0520529947917 323.48600000000016 Td
/F1.0 10.5 Tf
<2e204966> Tj
ET
@@ -34684,7 +34648,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24000000000001 389.576 Td
+48.24000000000001 307.70600000000013 Td
/F1.0 10.5 Tf
<70726573656e742c20746869732077696c6c206265207573656420696e73746561642e> Tj
ET
@@ -34697,7 +34661,7 @@ ET
0.854 Tw
BT
-48.24000000000001 361.79600000000005 Td
+48.24000000000001 279.92600000000016 Td
/F1.0 10.5 Tf
[<54686973207468657265666f726520616c6c6f7773206c696272> 20.01953125 <617269657320746861742070726f76696465206120646f6d61696e20656e7469746965732f76696577206d6f64656c732028666f72206578616d706c652c2074686520286e6f6e2d>] TJ
ET
@@ -34712,7 +34676,7 @@ ET
2.439 Tw
BT
-48.24000000000001 346.0160000000001 Td
+48.24000000000001 264.1460000000002 Td
/F1.0 10.5 Tf
<4153462920> Tj
ET
@@ -34727,7 +34691,7 @@ ET
2.439 Tw
BT
-76.32013781738281 346.0160000000001 Td
+76.32013781738281 264.1460000000002 Td
/F1.0 10.5 Tf
<496e636f646520506c6174666f726d> Tj
ET
@@ -34742,7 +34706,7 @@ ET
2.439 Tw
BT
-159.36777563476562 346.0160000000001 Td
+159.36777563476562 264.1460000000002 Td
/F1.0 10.5 Tf
[<206d6f64756c65732920746f20646566696e6520746865205549206f66207468657365206f626a65637473207573696e672061206c61> 20.01953125 <796f75742066696c652c207768696c65207374696c6c>] TJ
ET
@@ -34755,7 +34719,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24000000000001 330.23600000000005 Td
+48.24000000000001 248.36600000000016 Td
/F1.0 10.5 Tf
[<616c6c6f77696e672074686520636f6e73756d696e67206170706c69636174696f6e20746f206f766572726964652074686174206c61> 20.01953125 <796f757420696620697420736f2072657175697265732e>] TJ
ET
@@ -34766,7 +34730,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24000000000001 295.73600000000005 Td
+48.24000000000001 213.86600000000016 Td
/F2.0 13 Tf
<332e322e322e20477269647320767320436f6d706f6e656e7473> Tj
ET
@@ -34777,7 +34741,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24000000000001 269.17600000000004 Td
+48.24000000000001 187.30600000000013 Td
/F1.0 10.5 Tf
[<546865206c61> 20.01953125 <796f75742066696c652064697374696e67756973686573206265747765656e2074776f207479706573206f6620656c656d656e743a>] TJ
ET
@@ -34790,7 +34754,7 @@ ET
0.200 0.200 0.200 SCN
BT
-56.88050000000001 241.39600000000002 Td
+56.88050000000001 159.52600000000012 Td
/F1.0 10.5 Tf
<a5> Tj
ET
@@ -34803,7 +34767,7 @@ ET
0.200 0.200 0.200 SCN
BT
-66.24000000000001 241.39600000000002 Td
+66.24000000000001 159.52600000000012 Td
/F1.0 10.5 Tf
<74686f7365207468617420646566696e6520612067726964207374727563747572652c206f663a20726f77732c20636f6c756d6e732c207461622067726f75707320616e6420746162732e> Tj
ET
@@ -34816,7 +34780,7 @@ ET
0.767 Tw
BT
-66.24000000000001 213.616 Td
+66.24000000000001 131.74600000000012 Td
/F1.0 10.5 Tf
<54686520726f777320616e6420636f6c756d6e732061726520636c6f73656c79206d6f64656c6c6564206f6e20> Tj
ET
@@ -34831,7 +34795,7 @@ ET
0.767 Tw
BT
-309.1707760416666 213.616 Td
+309.1707760416666 131.74600000000012 Td
/F1.0 10.5 Tf
[<426f6f74737472> 20.01953125 <61702033>] TJ
ET
@@ -34846,7 +34810,7 @@ ET
0.767 Tw
BT
-366.70041796875 213.616 Td
+366.70041796875 131.74600000000012 Td
/F1.0 10.5 Tf
<20287573656420696e2074686520696d706c656d656e746174696f6e206f6620746865> Tj
ET
@@ -34859,7 +34823,7 @@ ET
0.259 0.545 0.792 SCN
BT
-66.24000000000001 197.836 Td
+66.24000000000001 115.96600000000012 Td
/F1.0 10.5 Tf
[<5769636b> 20.01953125 <657420766965776572>] TJ
ET
@@ -34870,7 +34834,7 @@ ET
0.200 0.200 0.200 SCN
BT
-138.343294921875 197.836 Td
+138.343294921875 115.96600000000012 Td
/F1.0 10.5 Tf
<292e> Tj
ET
@@ -34883,7 +34847,7 @@ ET
0.200 0.200 0.200 SCN
BT
-56.88050000000001 170.056 Td
+56.88050000000001 88.18600000000012 Td
/F1.0 10.5 Tf
<a5> Tj
ET
@@ -34898,7 +34862,7 @@ ET
2.867 Tw
BT
-66.24000000000001 170.056 Td
+66.24000000000001 88.18600000000012 Td
/F1.0 10.5 Tf
<74686f7365207468617420646566696e657320636f6d6d6f6e20636f6d706f6e656e74732c206f663a206669656c6473657473202870726576696f75736c792063616c6c6564206d656d6265722067726f757073206f72> Tj
ET
@@ -34913,7 +34877,7 @@ ET
2.001 Tw
BT
-66.24000000000001 154.276 Td
+66.24000000000001 72.40600000000012 Td
/F1.0 10.5 Tf
<70726f70657274792067726f757073292c2070726f706572746965732c20636f6c6c656374696f6e732c20616374696f6e7320616e6420616c736f20746865207469746c652f69636f6e206f662074686520646f6d61696e206f626a656374> Tj
ET
@@ -34926,91 +34890,13 @@ ET
0.200 0.200 0.200 SCN
BT
-66.24000000000001 138.496 Td
+66.24000000000001 56.62600000000012 Td
/F1.0 10.5 Tf
<697473656c662e> Tj
ET
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
-
-1.158 Tw
-
-BT
-48.24000000000001 110.71600000000001 Td
-/F1.0 10.5 Tf
-<4d6f726520696e666f726d6174696f6e2061626f757420746865736520636c61737365732063616e20626520666f756e6420696e20> Tj
-ET
-
-
-0.000 Tw
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-
-1.158 Tw
-
-BT
-329.31719999999996 110.71600000000001 Td
-/F1.0 10.5 Tf
-<746865207265666572656e6365206775696465> 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
-
-1.158 Tw
-
-BT
-428.92546666666664 110.71600000000001 Td
-/F1.0 10.5 Tf
-<2e20204d6f726520696e666f726d6174696f6e206f6e> 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
-
-BT
-48.24000000000001 94.936 Td
-/F1.0 10.5 Tf
-[<426f6f74737472> 20.01953125 <61702033d57320677269642073797374656d2063616e20626520666f756e6420>] TJ
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-
-BT
-243.37179492187502 94.936 Td
-/F1.0 10.5 Tf
-<68657265> Tj
-ET
-
-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
-
-BT
-266.209294921875 94.936 Td
-/F1.0 10.5 Tf
-<2e> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
q
0.000 0.000 0.000 scn
0.000 0.000 0.000 SCN
@@ -35035,11 +34921,11 @@ Q
endstream
endobj
-264 0 obj
+263 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 263 0 R
+/Contents 262 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/Font << /F1.0 8 0 R
/F4.0 53 0 R
@@ -35048,7 +34934,18 @@ endobj
/XObject << /Stamp1 738 0 R
>>
>>
-/Annots [265 0 R 266 0 R 267 0 R 269 0 R 271 0 R 272 0 R 273 0 R 274 0 R]
+/Annots [264 0 R 265 0 R 266 0 R 267 0 R 269 0 R 271 0 R 272 0 R]
+>>
+endobj
+264 0 obj
+<< /Border [0 0 0]
+/A << /Type /Action
+/S /URI
+/URI (../ugfun/ugfun.pdf#_ugfun_how-tos_contributed-members)
+>>
+/Subtype /Link
+/Rect [227.90192307692308 753.3 419.4553846153846 767.58]
+/Type /Annot
>>
endobj
265 0 obj
@@ -35058,7 +34955,7 @@ endobj
/URI (../rgsvc/rgsvc.pdf#_rgsvc_metadata-api_LayoutService)
>>
/Subtype /Link
-/Rect [67.66257142857143 777.4259999999999 135.91257142857143 787.9259999999999]
+/Rect [67.66257142857144 695.556 135.91257142857143 706.056]
/Type /Annot
>>
endobj
@@ -35069,7 +34966,7 @@ endobj
/URI (../rgcms/rgcms.pdf#_rgcms_classes_mixins_Object)
>>
/Subtype /Link
-/Rect [376.0677142857143 775.8299999999999 439.91578571428573 790.11]
+/Rect [376.0677142857143 693.96 439.91578571428573 708.2400000000001]
/Type /Annot
>>
endobj
@@ -35080,12 +34977,12 @@ endobj
/URI (../rgcms/rgcms.pdf#_rgcms_classes_layout)
>>
/Subtype /Link
-/Rect [322.9028156738281 555.846 343.9028156738281 566.3460000000001]
+/Rect [322.9028156738281 473.97600000000017 343.9028156738281 484.47600000000017]
/Type /Annot
>>
endobj
268 0 obj
-[264 0 R /XYZ 0 494.1600000000001 null]
+[263 0 R /XYZ 0 412.2900000000002 null]
endobj
269 0 obj
<< /Border [0 0 0]
@@ -35094,12 +34991,12 @@ endobj
/URI (http://platform.incode.org)
>>
/Subtype /Link
-/Rect [76.32013781738281 342.9500000000001 159.36777563476562 357.2300000000001]
+/Rect [76.32013781738281 261.08000000000015 159.36777563476562 275.3600000000001]
/Type /Annot
>>
endobj
270 0 obj
-[264 0 R /XYZ 0 314.4200000000001 null]
+[263 0 R /XYZ 0 232.55000000000015 null]
endobj
271 0 obj
<< /Border [0 0 0]
@@ -35108,7 +35005,7 @@ endobj
/URI (http://getbootstrap.com)
>>
/Subtype /Link
-/Rect [309.1707760416666 210.55 366.70041796875 224.83]
+/Rect [309.1707760416666 128.68000000000012 366.70041796875 142.96000000000012]
/Type /Annot
>>
endobj
@@ -35119,34 +35016,12 @@ endobj
/URI (../ugvw/ugvw.pdf)
>>
/Subtype /Link
-/Rect [66.24000000000001 194.77 138.343294921875 209.05]
+/Rect [66.24000000000001 112.90000000000012 138.343294921875 127.18000000000012]
/Type /Annot
>>
endobj
273 0 obj
-<< /Border [0 0 0]
-/A << /Type /Action
-/S /URI
-/URI (../rgcms/rgcms.pdf#_rgcms_classes_layout)
->>
-/Subtype /Link
-/Rect [329.31719999999996 107.65 428.92546666666664 121.93]
-/Type /Annot
->>
-endobj
-274 0 obj
-<< /Border [0 0 0]
-/A << /Type /Action
-/S /URI
-/URI (http://getbootstrap.com/css/#grid)
->>
-/Subtype /Link
-/Rect [243.37179492187502 91.87 266.209294921875 106.15]
-/Type /Annot
->>
-endobj
-275 0 obj
-<< /Length 3422
+<< /Length 4834
>>
stream
q
@@ -35155,8 +35030,86 @@ q
/DeviceRGB CS
0.200 0.200 0.200 SCN
+1.158 Tw
+
BT
-48.24 792.006 Td
+48.24000000000001 793.9259999999999 Td
+/F1.0 10.5 Tf
+<4d6f726520696e666f726d6174696f6e2061626f757420746865736520636c61737365732063616e20626520666f756e6420696e20> Tj
+ET
+
+
+0.000 Tw
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+
+1.158 Tw
+
+BT
+329.31719999999996 793.9259999999999 Td
+/F1.0 10.5 Tf
+<746865207265666572656e6365206775696465> 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
+
+1.158 Tw
+
+BT
+428.92546666666664 793.9259999999999 Td
+/F1.0 10.5 Tf
+<2e20204d6f726520696e666f726d6174696f6e206f6e> 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
+
+BT
+48.24000000000001 778.146 Td
+/F1.0 10.5 Tf
+[<426f6f74737472> 20.01953125 <61702033d57320677269642073797374656d2063616e20626520666f756e6420>] TJ
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+
+BT
+243.37179492187502 778.146 Td
+/F1.0 10.5 Tf
+<68657265> Tj
+ET
+
+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
+
+BT
+266.209294921875 778.146 Td
+/F1.0 10.5 Tf
+<2e> Tj
+ET
+
+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
+
+BT
+48.24000000000001 743.6460000000001 Td
/F2.0 13 Tf
<332e322e332e2053637265656e63617374> Tj
ET
@@ -35167,7 +35120,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24 765.446 Td
+48.24000000000001 717.0860000000001 Td
/F1.0 10.5 Tf
<5468697320> Tj
ET
@@ -35178,7 +35131,7 @@ ET
0.259 0.545 0.792 SCN
BT
-72.1275 765.446 Td
+72.12750000000001 717.0860000000001 Td
/F1.0 10.5 Tf
<73637265656e63617374> Tj
ET
@@ -35189,7 +35142,7 @@ ET
0.200 0.200 0.200 SCN
BT
-124.4805 765.446 Td
+124.4805 717.0860000000001 Td
/F1.0 10.5 Tf
<206465736372696265732074686520666561747572652e> Tj
ET
@@ -35200,7 +35153,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24 730.9460000000001 Td
+48.24000000000001 682.5860000000002 Td
/F2.0 13 Tf
<332e322e342e204578616d706c6573> Tj
ET
@@ -35213,7 +35166,7 @@ ET
0.722 Tw
BT
-48.24 704.3860000000002 Td
+48.24000000000001 656.0260000000003 Td
/F1.0 10.5 Tf
[<50726f6261626c79207468652065617369657374207761> 20.01953125 <7920746f20756e6465727374616e642064796e616d696320584d4c206c61> 20.01953125 <796f7574732069732062> 20.01953125 <79206578616d706c652e2046> 40.0390625 <6f722074686973207765d56c6c2075736520746865>] TJ
ET
@@ -35226,7 +35179,7 @@ ET
0.694 0.129 0.275 SCN
BT
-48.24 688.6060000000002 Td
+48.24000000000001 640.2460000000003 Td
/F4.0 10.5 Tf
<546f446f4974656d> Tj
ET
@@ -35237,7 +35190,7 @@ ET
0.200 0.200 0.200 SCN
BT
-90.24000000000001 688.6060000000002 Td
+90.24000000000001 640.2460000000003 Td
/F1.0 10.5 Tf
<2066726f6d2074686520286e6f6e2d4153462920> Tj
ET
@@ -35248,7 +35201,7 @@ ET
0.259 0.545 0.792 SCN
BT
-191.29200000000003 688.6060000000002 Td
+191.29200000000003 640.2460000000003 Td
/F1.0 10.5 Tf
<49736973206164646f6e732720746f646f617070> Tj
ET
@@ -35259,7 +35212,7 @@ ET
0.200 0.200 0.200 SCN
BT
-293.079 688.6060000000002 Td
+293.07900000000006 640.2460000000003 Td
/F1.0 10.5 Tf
<3a> Tj
ET
@@ -35268,14 +35221,14 @@ ET
0.000 0.000 0.000 scn
q
-498.800 0 0 409.757 48.240 263.033 cm
+498.800 0 0 409.757 48.240 214.673 cm
/I27 Do
Q
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
BT
-48.24 235.01928593996877 Td
+48.24000000000001 186.65928593996887 Td
/F2.0 10.5 Tf
<4e616d65737061636573> Tj
ET
@@ -35288,7 +35241,7 @@ ET
1.315 Tw
BT
-48.24 209.18928593996876 Td
+48.24000000000001 160.82928593996886 Td
/F1.0 10.5 Tf
<4669727374207468696e67732066697273743b20657665727920> Tj
ET
@@ -35303,7 +35256,7 @@ ET
1.315 Tw
BT
-169.93589663461537 209.18928593996876 Td
+169.93589663461537 160.82928593996886 Td
/F4.0 10.5 Tf
<2e6c61796f75742e786d6c> Tj
ET
@@ -35318,7 +35271,7 @@ ET
1.315 Tw
BT
-227.68589663461537 209.18928593996876 Td
+227.68589663461537 160.82928593996886 Td
/F1.0 10.5 Tf
[<2066696c65206d7573742070726f7065726c79206465636c617265207468652058> 9.765625 <5344206e616d6573706163657320616e6420736368656d61732e>] TJ
ET
@@ -35331,7 +35284,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24 193.40928593996875 Td
+48.24000000000001 145.04928593996885 Td
/F1.0 10.5 Tf
<5468657265206172652074776f3a206f6e6520666f7220746865206772696420636c61737365732c20616e64206f6e6520666f722074686520636f6d6d6f6e20636f6d706f6e656e7420636c61737365733a> Tj
ET
@@ -35362,25 +35315,47 @@ Q
endstream
endobj
-276 0 obj
+274 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 275 0 R
+/Contents 273 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F2.0 18 0 R
-/F1.0 8 0 R
+/Font << /F1.0 8 0 R
+/F2.0 18 0 R
/F4.0 53 0 R
>>
/XObject << /I27 281 0 R
/Stamp1 738 0 R
>>
>>
-/Annots [278 0 R 280 0 R 282 0 R]
+/Annots [275 0 R 276 0 R 278 0 R 280 0 R 282 0 R]
+>>
+endobj
+275 0 obj
+<< /Border [0 0 0]
+/A << /Type /Action
+/S /URI
+/URI (../rgcms/rgcms.pdf#_rgcms_classes_layout)
+>>
+/Subtype /Link
+/Rect [329.31719999999996 790.8599999999999 428.92546666666664 805.14]
+/Type /Annot
+>>
+endobj
+276 0 obj
+<< /Border [0 0 0]
+/A << /Type /Action
+/S /URI
+/URI (http://getbootstrap.com/css/#grid)
+>>
+/Subtype /Link
+/Rect [243.37179492187502 775.0799999999999 266.209294921875 789.36]
+/Type /Annot
>>
endobj
277 0 obj
-[276 0 R /XYZ 0 841.89 null]
+[274 0 R /XYZ 0 762.33 null]
endobj
278 0 obj
<< /Border [0 0 0]
@@ -35389,12 +35364,12 @@ endobj
/URI (https://www.youtube.com/watch?v=MxewC5Pve5k)
>>
/Subtype /Link
-/Rect [72.1275 762.38 124.4805 776.6600000000001]
+/Rect [72.12750000000001 714.0200000000001 124.4805 728.3000000000002]
/Type /Annot
>>
endobj
279 0 obj
-[276 0 R /XYZ 0 749.6300000000001 null]
+[274 0 R /XYZ 0 701.2700000000002 null]
endobj
280 0 obj
<< /Border [0 0 0]
@@ -35403,7 +35378,7 @@ endobj
/URI (http://github.com/isisaddons/isis-app-todoapp)
>>
/Subtype /Link
-/Rect [191.29200000000003 685.5400000000002 293.079 699.8200000000003]
+/Rect [191.29200000000003 637.1800000000003 293.07900000000006 651.4600000000004]
/Type /Annot
>>
endobj
@@ -35608,12 +35583,12 @@ endobj
/URI (images/layout-dynamic-xml/ToDoItem.png)
>>
/Subtype /Link
-/Rect [48.24 263.0332859399688 547.04 672.7900000000003]
+/Rect [48.24000000000001 214.67328593996888 547.04 624.4300000000004]
/Type /Annot
>>
endobj
283 0 obj
-[276 0 R /XYZ 0 251.03328593996878 null]
+[274 0 R /XYZ 0 202.67328593996888 null]
endobj
284 0 obj
<< /Length 30874
@@ -122565,7 +122540,7 @@ endobj
/Count 0
/Next 755 0 R
/Prev 753 0 R
-/Dest [250 0 R /XYZ 0 288.14823129251704 null]
+/Dest [250 0 R /XYZ 0 204.80823129251706 null]
>>
endobj
755 0 obj
@@ -123652,590 +123627,590 @@ xref
0002419862 00000 n
0002436410 00000 n
0002437231 00000 n
-0002446727 00000 n
-0002447071 00000 n
-0002447259 00000 n
-0002447317 00000 n
-0002447533 00000 n
-0002447759 00000 n
-0002447978 00000 n
-0002448186 00000 n
-0002448393 00000 n
-0002448601 00000 n
-0002448810 00000 n
-0002448868 00000 n
-0002449099 00000 n
-0002449340 00000 n
-0002465265 00000 n
-0002465580 00000 n
-0002465819 00000 n
-0002466042 00000 n
-0002466258 00000 n
-0002466315 00000 n
-0002466528 00000 n
-0002466585 00000 n
-0002466770 00000 n
-0002466949 00000 n
-0002467155 00000 n
-0002467351 00000 n
-0002470827 00000 n
-0002471115 00000 n
-0002471161 00000 n
-0002471360 00000 n
-0002471417 00000 n
-0002471639 00000 n
-0002554642 00000 n
-0002554843 00000 n
-0002554901 00000 n
-0002585830 00000 n
-0002586071 00000 n
-0002586117 00000 n
-0002620869 00000 n
-0002621136 00000 n
-0002621344 00000 n
-0002621390 00000 n
-0002621610 00000 n
-0002646641 00000 n
-0002646923 00000 n
-0002647103 00000 n
-0002647160 00000 n
-0002647217 00000 n
-0002654795 00000 n
-0002655102 00000 n
-0002655159 00000 n
-0002655216 00000 n
-0002655449 00000 n
-0002766250 00000 n
-0002766473 00000 n
-0002793264 00000 n
-0002793519 00000 n
-0002793695 00000 n
-0002793741 00000 n
-0002823055 00000 n
-0002823328 00000 n
-0002823386 00000 n
-0002823624 00000 n
-0002848410 00000 n
-0002848723 00000 n
-0002848913 00000 n
-0002849132 00000 n
-0002849345 00000 n
-0002849553 00000 n
-0002849763 00000 n
-0002849992 00000 n
-0002862470 00000 n
-0002862793 00000 n
-0002862839 00000 n
-0002863457 00000 n
-0002863664 00000 n
-0002863866 00000 n
-0002864113 00000 n
-0002864347 00000 n
-0002864581 00000 n
-0002864808 00000 n
-0002864865 00000 n
-0002865115 00000 n
-0002865364 00000 n
-0002865421 00000 n
-0002865683 00000 n
-0002871872 00000 n
-0002900162 00000 n
-0002900417 00000 n
-0002909185 00000 n
-0002909473 00000 n
-0002909519 00000 n
-0002909721 00000 n
-0002909941 00000 n
-0002956382 00000 n
-0002956597 00000 n
-0002978429 00000 n
-0002983831 00000 n
-0002984140 00000 n
-0002984328 00000 n
-0002995112 00000 n
-0002995311 00000 n
-0002995368 00000 n
-0002995570 00000 n
-0002995794 00000 n
-0002995852 00000 n
-0003025656 00000 n
-0003025884 00000 n
-0003060536 00000 n
-0003060804 00000 n
-0003060861 00000 n
-0003060918 00000 n
-0003086862 00000 n
-0003087151 00000 n
-0003087197 00000 n
-0003087353 00000 n
-0003087583 00000 n
-0003087641 00000 n
-0003087885 00000 n
-0003089790 00000 n
-0003090057 00000 n
-0003109303 00000 n
-0003109489 00000 n
-0003124587 00000 n
-0003124784 00000 n
-0003153555 00000 n
-0003153796 00000 n
-0003153854 00000 n
-0003156679 00000 n
-0003156907 00000 n
-0003186886 00000 n
-0003187202 00000 n
-0003187248 00000 n
-0003187423 00000 n
-0003187679 00000 n
-0003187936 00000 n
-0003188170 00000 n
-0003219671 00000 n
-0003220014 00000 n
-0003220267 00000 n
-0003220508 00000 n
-0003220733 00000 n
-0003220955 00000 n
-0003221155 00000 n
-0003221397 00000 n
-0003221629 00000 n
-0003221850 00000 n
-0003243878 00000 n
-0003244189 00000 n
-0003244429 00000 n
-0003244633 00000 n
-0003244873 00000 n
-0003245099 00000 n
-0003276344 00000 n
-0003276671 00000 n
-0003276880 00000 n
-0003277122 00000 n
-0003277371 00000 n
-0003277614 00000 n
-0003277859 00000 n
-0003278102 00000 n
-0003305014 00000 n
-0003305330 00000 n
-0003305538 00000 n
-0003305768 00000 n
-0003305998 00000 n
-0003312766 00000 n
-0003313033 00000 n
-0003313079 00000 n
-0003313292 00000 n
-0003313492 00000 n
-0003313550 00000 n
-0003313596 00000 n
-0003315511 00000 n
-0003315804 00000 n
-0003315997 00000 n
-0003326670 00000 n
-0003326877 00000 n
-0003326924 00000 n
-0003327447 00000 n
-0003329554 00000 n
-0003329813 00000 n
-0003329859 00000 n
-0003329916 00000 n
-0003330126 00000 n
-0003340162 00000 n
-0003344228 00000 n
-0003344508 00000 n
-0003344706 00000 n
-0003344754 00000 n
-0003344811 00000 n
-0003345050 00000 n
-0003345108 00000 n
-0003345166 00000 n
-0003345588 00000 n
-0003347495 00000 n
-0003347788 00000 n
-0003347984 00000 n
-0003358345 00000 n
-0003358558 00000 n
-0003358605 00000 n
-0003369601 00000 n
-0003369905 00000 n
-0003369951 00000 n
-0003370182 00000 n
-0003370239 00000 n
-0003370296 00000 n
-0003370509 00000 n
-0003370732 00000 n
-0003370969 00000 n
-0003371177 00000 n
-0003449986 00000 n
-0003451113 00000 n
-0003451394 00000 n
-0003451580 00000 n
-0003518916 00000 n
-0003519115 00000 n
-0003522361 00000 n
-0003522628 00000 n
-0003522816 00000 n
-0003523046 00000 n
-0003525803 00000 n
-0003526070 00000 n
-0003526116 00000 n
-0003526173 00000 n
-0003526230 00000 n
-0003526464 00000 n
-0003597514 00000 n
-0003597709 00000 n
-0003636212 00000 n
-0003639013 00000 n
-0003639285 00000 n
-0003639475 00000 n
-0003639531 00000 n
-0003676865 00000 n
-0003677156 00000 n
-0003677406 00000 n
-0003677463 00000 n
-0003678041 00000 n
-0003678252 00000 n
-0003678485 00000 n
-0003678704 00000 n
-0003678902 00000 n
-0003713476 00000 n
-0003713757 00000 n
-0003713987 00000 n
-0003714210 00000 n
-0003714256 00000 n
-0003714302 00000 n
-0003714347 00000 n
-0003760411 00000 n
-0003765548 00000 n
-0003765841 00000 n
-0003766025 00000 n
-0003766227 00000 n
-0003766285 00000 n
-0003766343 00000 n
-0003788447 00000 n
-0003788675 00000 n
-0003814179 00000 n
-0003814446 00000 n
-0003814492 00000 n
-0003814549 00000 n
-0003814779 00000 n
-0003814825 00000 n
-0003815062 00000 n
-0003842629 00000 n
-0003842901 00000 n
-0003843150 00000 n
-0003843207 00000 n
-0003857620 00000 n
-0003857892 00000 n
-0003858107 00000 n
-0003858153 00000 n
-0003858210 00000 n
-0003877627 00000 n
-0003877868 00000 n
-0003877925 00000 n
-0003901323 00000 n
-0003901596 00000 n
-0003901857 00000 n
-0003901915 00000 n
-0003930540 00000 n
-0003930813 00000 n
-0003931075 00000 n
-0003931132 00000 n
-0003959248 00000 n
-0003959536 00000 n
-0003959767 00000 n
-0003959960 00000 n
-0003960006 00000 n
-0003960064 00000 n
-0003960249 00000 n
-0003982340 00000 n
-0003982581 00000 n
-0003982627 00000 n
-0003984840 00000 n
-0003985099 00000 n
-0003985145 00000 n
-0003985202 00000 n
-0004058347 00000 n
-0004058555 00000 n
-0004123190 00000 n
-0004127315 00000 n
-0004127587 00000 n
-0004127782 00000 n
-0004127838 00000 n
-0004152605 00000 n
-0004152960 00000 n
-0004153006 00000 n
-0004153237 00000 n
-0004153478 00000 n
-0004153718 00000 n
-0004153961 00000 n
-0004154192 00000 n
-0004154396 00000 n
-0004154453 00000 n
-0004155347 00000 n
-0004155557 00000 n
-0004155778 00000 n
-0004156011 00000 n
-0004156269 00000 n
-0004156477 00000 n
-0004156714 00000 n
-0004156939 00000 n
-0004178303 00000 n
-0004178599 00000 n
-0004178645 00000 n
-0004178836 00000 n
-0004178882 00000 n
-0004179129 00000 n
-0004179388 00000 n
-0004179446 00000 n
-0004179696 00000 n
-0004216195 00000 n
-0004216454 00000 n
-0004216688 00000 n
-0004243938 00000 n
-0004244205 00000 n
-0004244251 00000 n
-0004244444 00000 n
-0004244647 00000 n
-0004272323 00000 n
-0004272612 00000 n
-0004272658 00000 n
-0004272715 00000 n
-0004272948 00000 n
-0004273197 00000 n
-0004273448 00000 n
-0004308474 00000 n
-0004308733 00000 n
-0004308791 00000 n
-0004309003 00000 n
-0004318551 00000 n
-0004318797 00000 n
-0004319013 00000 n
-0004354247 00000 n
-0004354600 00000 n
-0004354646 00000 n
-0004354852 00000 n
-0004355062 00000 n
-0004355277 00000 n
-0004355492 00000 n
-0004355707 00000 n
-0004355911 00000 n
-0004355968 00000 n
-0004356180 00000 n
-0004356411 00000 n
-0004356681 00000 n
-0004356912 00000 n
-0004357165 00000 n
-0004399407 00000 n
-0004399635 00000 n
-0004418516 00000 n
-0004418827 00000 n
-0004418873 00000 n
-0004419074 00000 n
-0004419316 00000 n
-0004419547 00000 n
-0004419743 00000 n
-0004419800 00000 n
-0004459869 00000 n
-0004460125 00000 n
-0004478288 00000 n
-0004478583 00000 n
-0004478640 00000 n
-0004478865 00000 n
-0004479082 00000 n
-0004489889 00000 n
-0004490148 00000 n
-0004490438 00000 n
-0004499754 00000 n
-0004500042 00000 n
-0004500088 00000 n
-0004500290 00000 n
-0004500498 00000 n
-0004500691 00000 n
-0004500820 00000 n
-0004500940 00000 n
-0004501065 00000 n
-0004501191 00000 n
-0004501339 00000 n
-0004501478 00000 n
-0004501639 00000 n
-0004501791 00000 n
-0004501954 00000 n
-0004502110 00000 n
-0004502275 00000 n
-0004502433 00000 n
-0004502593 00000 n
-0004502754 00000 n
-0004502928 00000 n
-0004503104 00000 n
-0004503280 00000 n
-0004503456 00000 n
-0004503633 00000 n
-0004503810 00000 n
-0004503964 00000 n
-0004504121 00000 n
-0004504295 00000 n
-0004504469 00000 n
-0004504637 00000 n
-0004504805 00000 n
-0004504975 00000 n
-0004505147 00000 n
-0004505311 00000 n
-0004505477 00000 n
-0004505649 00000 n
-0004505832 00000 n
-0004505997 00000 n
-0004506175 00000 n
-0004506352 00000 n
-0004506529 00000 n
-0004506713 00000 n
-0004506920 00000 n
-0004507120 00000 n
-0004507320 00000 n
-0004507504 00000 n
-0004507699 00000 n
-0004507892 00000 n
-0004508095 00000 n
-0004508290 00000 n
-0004508487 00000 n
-0004508686 00000 n
-0004508885 00000 n
-0004509039 00000 n
-0004509204 00000 n
-0004509377 00000 n
-0004509552 00000 n
-0004509730 00000 n
-0004509908 00000 n
-0004510087 00000 n
-0004510266 00000 n
-0004510433 00000 n
-0004510610 00000 n
-0004510786 00000 n
-0004510973 00000 n
-0004511160 00000 n
-0004511347 00000 n
-0004511525 00000 n
-0004511714 00000 n
-0004511885 00000 n
-0004512067 00000 n
-0004512244 00000 n
-0004512423 00000 n
-0004512598 00000 n
-0004512783 00000 n
-0004512945 00000 n
-0004513107 00000 n
-0004513290 00000 n
-0004513473 00000 n
-0004513657 00000 n
-0004513841 00000 n
-0004514003 00000 n
-0004514165 00000 n
-0004514336 00000 n
-0004514518 00000 n
-0004514660 00000 n
-0004514814 00000 n
-0004514984 00000 n
-0004515165 00000 n
-0004515358 00000 n
-0004515551 00000 n
-0004515738 00000 n
-0004515925 00000 n
-0004516102 00000 n
-0004516279 00000 n
-0004516445 00000 n
-0004516611 00000 n
-0004516898 00000 n
-0004516976 00000 n
-0004517137 00000 n
-0004517329 00000 n
-0004517578 00000 n
-0004517753 00000 n
-0004518042 00000 n
-0004518279 00000 n
-0004518498 00000 n
-0004518725 00000 n
-0004518922 00000 n
-0004519143 00000 n
-0004519368 00000 n
-0004519579 00000 n
-0004519801 00000 n
-0004520035 00000 n
-0004520264 00000 n
-0004520458 00000 n
-0004520720 00000 n
-0004520966 00000 n
-0004521177 00000 n
-0004521471 00000 n
-0004521766 00000 n
-0004522023 00000 n
-0004522252 00000 n
-0004522521 00000 n
-0004522757 00000 n
-0004522991 00000 n
-0004523242 00000 n
-0004523424 00000 n
-0004523684 00000 n
-0004523877 00000 n
-0004524062 00000 n
-0004524298 00000 n
-0004524542 00000 n
-0004524791 00000 n
-0004525016 00000 n
-0004525229 00000 n
-0004525416 00000 n
-0004525694 00000 n
-0004525924 00000 n
-0004526161 00000 n
-0004526365 00000 n
-0004526660 00000 n
-0004526914 00000 n
-0004527116 00000 n
-0004527369 00000 n
-0004527609 00000 n
-0004527795 00000 n
-0004528090 00000 n
-0004528755 00000 n
-0004538449 00000 n
-0004538665 00000 n
-0004540028 00000 n
-0004541075 00000 n
-0004549416 00000 n
-0004549637 00000 n
-0004551000 00000 n
-0004552071 00000 n
-0004553434 00000 n
-0004553645 00000 n
-0004553960 00000 n
-0004554876 00000 n
-0004560904 00000 n
-0004561118 00000 n
-0004562481 00000 n
-0004563530 00000 n
-0004564926 00000 n
-0004565144 00000 n
-0004566507 00000 n
-0004567646 00000 n
-0004573095 00000 n
-0004573321 00000 n
-0004574684 00000 n
-0004575772 00000 n
-0004576935 00000 n
-0004577151 00000 n
-0004577454 00000 n
-0004578591 00000 n
-0004580238 00000 n
-0004580468 00000 n
-0004581831 00000 n
-0004582967 00000 n
-0004584642 00000 n
-0004584856 00000 n
-0004585168 00000 n
-0004586306 00000 n
-0004589012 00000 n
-0004589225 00000 n
-0004590588 00000 n
+0002444908 00000 n
+0002445244 00000 n
+0002445432 00000 n
+0002445490 00000 n
+0002445705 00000 n
+0002445919 00000 n
+0002446150 00000 n
+0002446380 00000 n
+0002446601 00000 n
+0002446809 00000 n
+0002447041 00000 n
+0002447099 00000 n
+0002447334 00000 n
+0002464226 00000 n
+0002464533 00000 n
+0002464750 00000 n
+0002464969 00000 n
+0002465192 00000 n
+0002465420 00000 n
+0002465477 00000 n
+0002465691 00000 n
+0002465749 00000 n
+0002465958 00000 n
+0002466161 00000 n
+0002471049 00000 n
+0002471353 00000 n
+0002471570 00000 n
+0002471778 00000 n
+0002471824 00000 n
+0002472044 00000 n
+0002472101 00000 n
+0002472334 00000 n
+0002555337 00000 n
+0002555551 00000 n
+0002555609 00000 n
+0002586538 00000 n
+0002586779 00000 n
+0002586825 00000 n
+0002621577 00000 n
+0002621844 00000 n
+0002622052 00000 n
+0002622098 00000 n
+0002622318 00000 n
+0002647349 00000 n
+0002647631 00000 n
+0002647811 00000 n
+0002647868 00000 n
+0002647925 00000 n
+0002655503 00000 n
+0002655810 00000 n
+0002655867 00000 n
+0002655924 00000 n
+0002656157 00000 n
+0002766958 00000 n
+0002767181 00000 n
+0002793972 00000 n
+0002794227 00000 n
+0002794403 00000 n
+0002794449 00000 n
+0002823763 00000 n
+0002824036 00000 n
+0002824094 00000 n
+0002824332 00000 n
+0002849118 00000 n
+0002849431 00000 n
+0002849621 00000 n
+0002849840 00000 n
+0002850053 00000 n
+0002850261 00000 n
+0002850471 00000 n
+0002850700 00000 n
+0002863178 00000 n
+0002863501 00000 n
+0002863547 00000 n
+0002864165 00000 n
+0002864372 00000 n
+0002864574 00000 n
+0002864821 00000 n
+0002865055 00000 n
+0002865289 00000 n
+0002865516 00000 n
+0002865573 00000 n
+0002865823 00000 n
+0002866072 00000 n
+0002866129 00000 n
+0002866391 00000 n
+0002872580 00000 n
+0002900870 00000 n
+0002901125 00000 n
+0002909893 00000 n
+0002910181 00000 n
+0002910227 00000 n
+0002910429 00000 n
+0002910649 00000 n
+0002957090 00000 n
+0002957305 00000 n
+0002979137 00000 n
+0002984539 00000 n
+0002984848 00000 n
+0002985036 00000 n
+0002995820 00000 n
+0002996019 00000 n
+0002996076 00000 n
+0002996278 00000 n
+0002996502 00000 n
+0002996560 00000 n
+0003026364 00000 n
+0003026592 00000 n
+0003061244 00000 n
+0003061512 00000 n
+0003061569 00000 n
+0003061626 00000 n
+0003087570 00000 n
+0003087859 00000 n
+0003087905 00000 n
+0003088061 00000 n
+0003088291 00000 n
+0003088349 00000 n
+0003088593 00000 n
+0003090498 00000 n
+0003090765 00000 n
+0003110011 00000 n
+0003110197 00000 n
+0003125295 00000 n
+0003125492 00000 n
+0003154263 00000 n
+0003154504 00000 n
+0003154562 00000 n
+0003157387 00000 n
+0003157615 00000 n
+0003187594 00000 n
+0003187910 00000 n
+0003187956 00000 n
+0003188131 00000 n
+0003188387 00000 n
+0003188644 00000 n
+0003188878 00000 n
+0003220379 00000 n
+0003220722 00000 n
+0003220975 00000 n
+0003221216 00000 n
+0003221441 00000 n
+0003221663 00000 n
+0003221863 00000 n
+0003222105 00000 n
+0003222337 00000 n
+0003222558 00000 n
+0003244586 00000 n
+0003244897 00000 n
+0003245137 00000 n
+0003245341 00000 n
+0003245581 00000 n
+0003245807 00000 n
+0003277052 00000 n
+0003277379 00000 n
+0003277588 00000 n
+0003277830 00000 n
+0003278079 00000 n
+0003278322 00000 n
+0003278567 00000 n
+0003278810 00000 n
+0003305722 00000 n
+0003306038 00000 n
+0003306246 00000 n
+0003306476 00000 n
+0003306706 00000 n
+0003313474 00000 n
+0003313741 00000 n
+0003313787 00000 n
+0003314000 00000 n
+0003314200 00000 n
+0003314258 00000 n
+0003314304 00000 n
+0003316219 00000 n
+0003316512 00000 n
+0003316705 00000 n
+0003327378 00000 n
+0003327585 00000 n
+0003327632 00000 n
+0003328155 00000 n
+0003330262 00000 n
+0003330521 00000 n
+0003330567 00000 n
+0003330624 00000 n
+0003330834 00000 n
+0003340870 00000 n
+0003344936 00000 n
+0003345216 00000 n
+0003345414 00000 n
+0003345462 00000 n
+0003345519 00000 n
+0003345758 00000 n
+0003345816 00000 n
+0003345874 00000 n
+0003346296 00000 n
+0003348203 00000 n
+0003348496 00000 n
+0003348692 00000 n
+0003359053 00000 n
+0003359266 00000 n
+0003359313 00000 n
+0003370309 00000 n
+0003370613 00000 n
+0003370659 00000 n
+0003370890 00000 n
+0003370947 00000 n
+0003371004 00000 n
+0003371217 00000 n
+0003371440 00000 n
+0003371677 00000 n
+0003371885 00000 n
+0003450694 00000 n
+0003451821 00000 n
+0003452102 00000 n
+0003452288 00000 n
+0003519624 00000 n
+0003519823 00000 n
+0003523069 00000 n
+0003523336 00000 n
+0003523524 00000 n
+0003523754 00000 n
+0003526511 00000 n
+0003526778 00000 n
+0003526824 00000 n
+0003526881 00000 n
+0003526938 00000 n
+0003527172 00000 n
+0003598222 00000 n
+0003598417 00000 n
+0003636920 00000 n
+0003639721 00000 n
+0003639993 00000 n
+0003640183 00000 n
+0003640239 00000 n
+0003677573 00000 n
+0003677864 00000 n
+0003678114 00000 n
+0003678171 00000 n
+0003678749 00000 n
+0003678960 00000 n
+0003679193 00000 n
+0003679412 00000 n
+0003679610 00000 n
+0003714184 00000 n
+0003714465 00000 n
+0003714695 00000 n
+0003714918 00000 n
+0003714964 00000 n
+0003715010 00000 n
+0003715055 00000 n
+0003761119 00000 n
+0003766256 00000 n
+0003766549 00000 n
+0003766733 00000 n
+0003766935 00000 n
+0003766993 00000 n
+0003767051 00000 n
+0003789155 00000 n
+0003789383 00000 n
+0003814887 00000 n
+0003815154 00000 n
+0003815200 00000 n
+0003815257 00000 n
+0003815487 00000 n
+0003815533 00000 n
+0003815770 00000 n
+0003843337 00000 n
+0003843609 00000 n
+0003843858 00000 n
+0003843915 00000 n
+0003858328 00000 n
+0003858600 00000 n
+0003858815 00000 n
+0003858861 00000 n
+0003858918 00000 n
+0003878335 00000 n
+0003878576 00000 n
+0003878633 00000 n
+0003902031 00000 n
+0003902304 00000 n
+0003902565 00000 n
+0003902623 00000 n
+0003931248 00000 n
+0003931521 00000 n
+0003931783 00000 n
+0003931840 00000 n
+0003959956 00000 n
+0003960244 00000 n
+0003960475 00000 n
+0003960668 00000 n
+0003960714 00000 n
+0003960772 00000 n
+0003960957 00000 n
+0003983048 00000 n
+0003983289 00000 n
+0003983335 00000 n
+0003985548 00000 n
+0003985807 00000 n
+0003985853 00000 n
+0003985910 00000 n
+0004059055 00000 n
+0004059263 00000 n
+0004123898 00000 n
+0004128023 00000 n
+0004128295 00000 n
+0004128490 00000 n
+0004128546 00000 n
+0004153313 00000 n
+0004153668 00000 n
+0004153714 00000 n
+0004153945 00000 n
+0004154186 00000 n
+0004154426 00000 n
+0004154669 00000 n
+0004154900 00000 n
+0004155104 00000 n
+0004155161 00000 n
+0004156055 00000 n
+0004156265 00000 n
+0004156486 00000 n
+0004156719 00000 n
+0004156977 00000 n
+0004157185 00000 n
+0004157422 00000 n
+0004157647 00000 n
+0004179011 00000 n
+0004179307 00000 n
+0004179353 00000 n
+0004179544 00000 n
+0004179590 00000 n
+0004179837 00000 n
+0004180096 00000 n
+0004180154 00000 n
+0004180404 00000 n
+0004216903 00000 n
+0004217162 00000 n
+0004217396 00000 n
+0004244646 00000 n
+0004244913 00000 n
+0004244959 00000 n
+0004245152 00000 n
+0004245355 00000 n
+0004273031 00000 n
+0004273320 00000 n
+0004273366 00000 n
+0004273423 00000 n
+0004273656 00000 n
+0004273905 00000 n
+0004274156 00000 n
+0004309182 00000 n
+0004309441 00000 n
+0004309499 00000 n
+0004309711 00000 n
+0004319259 00000 n
+0004319505 00000 n
+0004319721 00000 n
+0004354955 00000 n
+0004355308 00000 n
+0004355354 00000 n
+0004355560 00000 n
+0004355770 00000 n
+0004355985 00000 n
+0004356200 00000 n
+0004356415 00000 n
+0004356619 00000 n
+0004356676 00000 n
+0004356888 00000 n
+0004357119 00000 n
+0004357389 00000 n
+0004357620 00000 n
+0004357873 00000 n
+0004400115 00000 n
+0004400343 00000 n
+0004419224 00000 n
+0004419535 00000 n
+0004419581 00000 n
+0004419782 00000 n
+0004420024 00000 n
+0004420255 00000 n
+0004420451 00000 n
+0004420508 00000 n
+0004460577 00000 n
+0004460833 00000 n
+0004478996 00000 n
+0004479291 00000 n
+0004479348 00000 n
+0004479573 00000 n
+0004479790 00000 n
+0004490597 00000 n
+0004490856 00000 n
+0004491146 00000 n
+0004500462 00000 n
+0004500750 00000 n
+0004500796 00000 n
+0004500998 00000 n
+0004501206 00000 n
+0004501399 00000 n
+0004501528 00000 n
+0004501648 00000 n
+0004501773 00000 n
+0004501899 00000 n
+0004502047 00000 n
+0004502186 00000 n
+0004502347 00000 n
+0004502499 00000 n
+0004502662 00000 n
+0004502818 00000 n
+0004502983 00000 n
+0004503141 00000 n
+0004503301 00000 n
+0004503462 00000 n
+0004503636 00000 n
+0004503812 00000 n
+0004503988 00000 n
+0004504164 00000 n
+0004504341 00000 n
+0004504518 00000 n
+0004504672 00000 n
+0004504829 00000 n
+0004505003 00000 n
+0004505177 00000 n
+0004505345 00000 n
+0004505513 00000 n
+0004505683 00000 n
+0004505855 00000 n
+0004506019 00000 n
+0004506185 00000 n
+0004506357 00000 n
+0004506540 00000 n
+0004506705 00000 n
+0004506883 00000 n
+0004507060 00000 n
+0004507237 00000 n
+0004507421 00000 n
+0004507628 00000 n
+0004507828 00000 n
+0004508028 00000 n
+0004508212 00000 n
+0004508407 00000 n
+0004508600 00000 n
+0004508803 00000 n
+0004508998 00000 n
+0004509195 00000 n
+0004509394 00000 n
+0004509593 00000 n
+0004509747 00000 n
+0004509912 00000 n
+0004510085 00000 n
+0004510260 00000 n
+0004510438 00000 n
+0004510616 00000 n
+0004510795 00000 n
+0004510974 00000 n
+0004511141 00000 n
+0004511318 00000 n
+0004511494 00000 n
+0004511681 00000 n
+0004511868 00000 n
+0004512055 00000 n
+0004512233 00000 n
+0004512422 00000 n
+0004512593 00000 n
+0004512775 00000 n
+0004512952 00000 n
+0004513131 00000 n
+0004513306 00000 n
+0004513491 00000 n
+0004513653 00000 n
+0004513815 00000 n
+0004513998 00000 n
+0004514181 00000 n
+0004514365 00000 n
+0004514549 00000 n
+0004514711 00000 n
+0004514873 00000 n
+0004515044 00000 n
+0004515226 00000 n
+0004515368 00000 n
+0004515522 00000 n
+0004515692 00000 n
+0004515873 00000 n
+0004516066 00000 n
+0004516259 00000 n
+0004516446 00000 n
+0004516633 00000 n
+0004516810 00000 n
+0004516987 00000 n
+0004517153 00000 n
+0004517319 00000 n
+0004517606 00000 n
+0004517684 00000 n
+0004517845 00000 n
+0004518037 00000 n
+0004518286 00000 n
+0004518461 00000 n
+0004518750 00000 n
+0004518987 00000 n
+0004519206 00000 n
+0004519433 00000 n
+0004519630 00000 n
+0004519851 00000 n
+0004520076 00000 n
+0004520287 00000 n
+0004520509 00000 n
+0004520743 00000 n
+0004520972 00000 n
+0004521166 00000 n
+0004521428 00000 n
+0004521674 00000 n
+0004521885 00000 n
+0004522179 00000 n
+0004522474 00000 n
+0004522731 00000 n
+0004522960 00000 n
+0004523229 00000 n
+0004523465 00000 n
+0004523699 00000 n
+0004523950 00000 n
+0004524132 00000 n
+0004524392 00000 n
+0004524585 00000 n
+0004524770 00000 n
+0004525006 00000 n
+0004525250 00000 n
+0004525499 00000 n
+0004525724 00000 n
+0004525937 00000 n
+0004526124 00000 n
+0004526402 00000 n
+0004526632 00000 n
+0004526869 00000 n
+0004527073 00000 n
+0004527368 00000 n
+0004527622 00000 n
+0004527824 00000 n
+0004528077 00000 n
+0004528317 00000 n
+0004528503 00000 n
+0004528798 00000 n
+0004529463 00000 n
+0004539157 00000 n
+0004539373 00000 n
+0004540736 00000 n
+0004541783 00000 n
+0004550124 00000 n
+0004550345 00000 n
+0004551708 00000 n
+0004552779 00000 n
+0004554142 00000 n
+0004554353 00000 n
+0004554668 00000 n
+0004555584 00000 n
+0004561612 00000 n
+0004561826 00000 n
+0004563189 00000 n
+0004564238 00000 n
+0004565634 00000 n
+0004565852 00000 n
+0004567215 00000 n
+0004568354 00000 n
+0004573803 00000 n
+0004574029 00000 n
+0004575392 00000 n
+0004576480 00000 n
+0004577643 00000 n
+0004577859 00000 n
+0004578162 00000 n
+0004579299 00000 n
+0004580946 00000 n
+0004581176 00000 n
+0004582539 00000 n
+0004583675 00000 n
+0004585350 00000 n
+0004585564 00000 n
+0004585876 00000 n
+0004587014 00000 n
+0004589720 00000 n
+0004589933 00000 n
+0004591296 00000 n
trailer
<< /Size 829
/Root 2 0 R
/Info 1 0 R
>>
startxref
-4591703
+4592411
%%EOF
[04/39] isis-site git commit: ISIS-1810: updates docs for 2.0.0-M1
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/274edd1d/content/versions/SNAPSHOT/migration-notes/migration-notes.html
----------------------------------------------------------------------
diff --git a/content/versions/SNAPSHOT/migration-notes/migration-notes.html b/content/versions/SNAPSHOT/migration-notes/migration-notes.html
index cf8980a..6935dd0 100644
--- a/content/versions/SNAPSHOT/migration-notes/migration-notes.html
+++ b/content/versions/SNAPSHOT/migration-notes/migration-notes.html
@@ -381,13 +381,13 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-DomainService">@DomainService</a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-DomainService">@DomainService</a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-DomainServiceLayout">@DomainServiceLayout</a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-DomainServiceLayout">@DomainServiceLayout</a></p>
</div>
</div></td>
</tr>
@@ -401,13 +401,13 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-DomainObject">@DomainObject</a><br> <a href="../guides/rgant/rgant.html#_rgant-ViewModel">@ViewModel</a><br> <a href="../guides/rgant/rgant.html#_rgant-MemberGroupLayout">@MemberGroupLayout</a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-DomainObject">@DomainObject</a><br> <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-ViewModel">@ViewModel</a><br> <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-MemberGroupLayout">@MemberGroupLayout</a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-DomainObjectLayout">@DomainObjectLayout</a><br> <a href="../guides/rgant/rgant.html#_rgant-ViewModelLayout">@ViewModelLayout</a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-DomainObjectLayout">@DomainObjectLayout</a><br> <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-ViewModelLayout">@ViewModelLayout</a></p>
</div>
</div></td>
</tr>
@@ -421,13 +421,13 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-Action">@Action</a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-Action">@Action</a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-ActionLayout">@ActionLayout</a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-ActionLayout">@ActionLayout</a></p>
</div>
</div></td>
</tr>
@@ -441,13 +441,13 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-Parameter">@Parameter</a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-Parameter">@Parameter</a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-ParameterLayout">@ParameterLayout</a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-ParameterLayout">@ParameterLayout</a></p>
</div>
</div></td>
</tr>
@@ -461,13 +461,13 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-Property">@Property</a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-Property">@Property</a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-PropertyLayout">@PropertyLayout</a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-PropertyLayout">@PropertyLayout</a></p>
</div>
</div></td>
</tr>
@@ -481,13 +481,13 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-Collection">@Collection</a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-Collection">@Collection</a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-CollectionLayout">@CollectionLayout</a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-CollectionLayout">@CollectionLayout</a></p>
</div>
</div></td>
</tr>
@@ -507,7 +507,7 @@ table.CodeRay td.code>pre{padding:0}
</ul>
</div>
<div class="paragraph">
- <p>Prior to v2.0.0, several annotation attributes were defined as booleans. In order to support <a href="#__migration-notes_1.15.0-to-1.16.0_meta-annotations">meta annotations</a>, these have been replaced by enums which also include a <code>NOT_SPECIFIED</code> value. Other enums have been extended (where necessary) to also have a <code>NOT_SPECIFIED</code> value. In all cases <code>NOT_SPECIFIED</code> is the new default.</p>
+ <p>Prior to v2.0.0, several annotation attributes were defined as booleans. In order to support <a href="https://isis.apache.org/versions/2.0.0-M1/migration-notes/migration-notes.html#__migration-notes_1.15.0-to-1.16.0_meta-annotations">meta annotations</a>, these have been replaced by enums which also include a <code>NOT_SPECIFIED</code> value. Other enums have been extended (where necessary) to also have a <code>NOT_SPECIFIED</code> value. In all cases <code>NOT_SPECIFIED</code> is the new default.</p>
</div>
<table class="tableblock frame-all grid-all spread">
<caption class="title">
@@ -530,13 +530,13 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top" rowspan="7">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-Action"><code>@Action</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-Action"><code>@Action</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-Action_command"><code>command</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-Action_command"><code>command</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -550,7 +550,7 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-Action_hidden"><code>hidden</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-Action_hidden"><code>hidden</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -564,7 +564,7 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-Action_invokeOn"><code>invokeOn</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-Action_invokeOn"><code>invokeOn</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -578,7 +578,7 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-Action_publishing"><code>publishing</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-Action_publishing"><code>publishing</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -592,7 +592,7 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-Action_publishing"><code>publishing</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-Action_publishing"><code>publishing</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -606,7 +606,7 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-Action_restrictTo"><code>restrictTo</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-Action_restrictTo"><code>restrictTo</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -620,7 +620,7 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-Action_semantics"><code>semantics</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-Action_semantics"><code>semantics</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -634,13 +634,13 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top" rowspan="3">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-ActionLayout"><code>@ActionLayout</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-ActionLayout"><code>@ActionLayout</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-ActionLayout_bookmarking"><code>bookmarking</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-ActionLayout_bookmarking"><code>bookmarking</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -654,7 +654,7 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-ActionLayout_contributed"><code>contributed</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-ActionLayout_contributed"><code>contributed</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -668,7 +668,7 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-ActionLayout_position"><code>position</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-ActionLayout_position"><code>position</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -682,13 +682,13 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top" rowspan="3">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-Collection"><code>@Collection</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-Collection"><code>@Collection</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-Collection_hidden"><code>hidden</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-Collection_hidden"><code>hidden</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -702,7 +702,7 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-Collection_editing"><code>editing</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-Collection_editing"><code>editing</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -716,7 +716,7 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-Collection_mementoSerialization"><code>mementoSerialization</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-Collection_mementoSerialization"><code>mementoSerialization</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -730,13 +730,13 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top" rowspan="4">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-DomainObject"><code>@DomainObject</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-DomainObject"><code>@DomainObject</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-DomainObject_auditing"><code>auditing</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-DomainObject_auditing"><code>auditing</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -750,7 +750,7 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-DomainObject_bounding"><code>bounding</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-DomainObject_bounding"><code>bounding</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -764,7 +764,7 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-DomainObject_editing"><code>editing</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-DomainObject_editing"><code>editing</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -778,7 +778,7 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-DomainObject_publishing"><code>publishing</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-DomainObject_publishing"><code>publishing</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -792,13 +792,13 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-DomainObjectLayout"><code>@DomainObjectLayout</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-DomainObjectLayout"><code>@DomainObjectLayout</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-DomainObjectLayout_bookmarking"><code>bookmarking</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-DomainObjectLayout_bookmarking"><code>bookmarking</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -812,13 +812,13 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-Parameter"><code>@Parameter</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-Parameter"><code>@Parameter</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-Parameter_optionality"><code>optionality</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-Parameter_optionality"><code>optionality</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -832,13 +832,13 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top" rowspan="2">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-ParameterLayout"><code>@ParameterLayout</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-ParameterLayout"><code>@ParameterLayout</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-ParameterLayout_labelPosition"><code>labelPosition</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-ParameterLayout_labelPosition"><code>labelPosition</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -852,7 +852,7 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-ParameterLayout_renderDay"><code>renderDay</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-ParameterLayout_renderDay"><code>renderDay</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -866,13 +866,13 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top" rowspan="6">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-Property"><code>@Property</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-Property"><code>@Property</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-Property_commandReification"><code>commandReification</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-Property_commandReification"><code>commandReification</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -886,7 +886,7 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-Property_editing"><code>editing</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-Property_editing"><code>editing</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -900,7 +900,7 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-Property_hidden"><code>hidden</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-Property_hidden"><code>hidden</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -914,7 +914,7 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-Property_mementoSerialization"><code>mementoSerialization</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-Property_mementoSerialization"><code>mementoSerialization</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -928,7 +928,7 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-Property_optionality"><code>optionality</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-Property_optionality"><code>optionality</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -942,7 +942,7 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-Property_publishing"><code>publishing</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-Property_publishing"><code>publishing</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -956,13 +956,13 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top" rowspan="5">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-PropertyLayout"><code>@PropertyLayout</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-PropertyLayout"><code>@PropertyLayout</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-PropertyLayout_labelPosition"><code>labelPosition</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-PropertyLayout_labelPosition"><code>labelPosition</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -976,7 +976,7 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-PropertyLayout_promptStyle"><code>promptStyle</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-PropertyLayout_promptStyle"><code>promptStyle</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -990,7 +990,7 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-PropertyLayout_renderDay"><code>renderDay</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-PropertyLayout_renderDay"><code>renderDay</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -1004,7 +1004,7 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-PropertyLayout_repainting"><code>repainting</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-PropertyLayout_repainting"><code>repainting</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
@@ -1018,13 +1018,13 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-ViewModelLayout"><code>@ViewModelLayout</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-ViewModelLayout"><code>@ViewModelLayout</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant-ViewModelLayout_bookmarking"><code>bookmarking</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant-ViewModelLayout_bookmarking"><code>bookmarking</code></a></p>
</div>
</div></td>
</tr>
@@ -1065,61 +1065,65 @@ table.CodeRay td.code>pre{padding:0}
<tbody>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@Action</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@Action</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>publishingPayloadFactory()</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>publishingPayloadFactory()</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p>Removed, use the simpler <a href="../guides/rgsvc/rgsvc.html#PublisherService">PublisherService</a> SPI instead.</p>
+ <p>Removed, use the simpler <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgsvc/rgsvc.html#PublisherService">PublisherService</a> SPI instead.</p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@ActionInteraction</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@ActionInteraction</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant_Action_domainEvent"><code>@Action#domainEvent()</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Action_domainEvent"><code>@Action#domainEvent()</code></a></p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@ActionOrder</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@ActionOrder</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant_MemberOrder"><code>@MemberOrder()</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_MemberOrder"><code>@MemberOrder()</code></a></p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@Aggregated</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@Aggregated</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
@@ -1129,414 +1133,429 @@ table.CodeRay td.code>pre{padding:0}
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@Auditable
-(JDO applib)</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@Auditable</code> (JDO applib)</p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant_DomainObject_audited"><code>@DomainObject#auditing()</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_DomainObject_audited"><code>@DomainObject#auditing()</code></a></p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@Audited</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@Audited</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant_DomainObject_audited"><code>@DomainObject#auditing()</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_DomainObject_audited"><code>@DomainObject#auditing()</code></a></p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@AutoComplete</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@AutoComplete</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant_DomainObject_autoComplete"><code>@DomainObject#autoComplete()</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_DomainObject_autoComplete"><code>@DomainObject#autoComplete()</code></a></p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@ActionSemantics</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@ActionSemantics</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant_Action_semantics"><code>@Action#semantics()</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Action_semantics"><code>@Action#semantics()</code></a></p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@Bookmarkable</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@Bookmarkable</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant_DomainObject_bookmarking"><code>@DomainObject#bookmarking()</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_DomainObject_bookmarking"><code>@DomainObject#bookmarking()</code></a></p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@Bounded</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@Bounded</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant_DomainObject_bounding"><code>@DomainObject#bounding()</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_DomainObject_bounding"><code>@DomainObject#bounding()</code></a></p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@Bulk</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@Bulk</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant_Action_invokeOn"><code>@Action#invokeOn()</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Action_invokeOn"><code>@Action#invokeOn()</code></a></p>
</div>
<div class="paragraph">
- <p>Similarly, the <code>Bulk.InteractionContext</code> domain service is replaced with the <a href="../guides/rgsvc/rgsvc.html#ActionInvocationContext">ActionInvocationContext</a> domain service.</p>
+ <p>Similarly, the <code>Bulk.InteractionContext</code> domain service is replaced with the <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgsvc/rgsvc.html#ActionInvocationContext">ActionInvocationContext</a> domain service.</p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@Collection</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@Collection</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>notPersisted</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>notPersisted</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p>Removed, replaced with <a href="../guides/rgant/rgant.html#_rgant_Collection_mementoSerialization"><code>@Collection#mementoSerialization()</code></a></p>
+ <p>Removed, replaced with <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Collection_mementoSerialization"><code>@Collection#mementoSerialization()</code></a></p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@CollectionInteraction</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@CollectionInteraction</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant_Collection_domainEvent"><code>@Collection #domainEvent()</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Collection_domainEvent"><code>@Collection #domainEvent()</code></a></p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@CollectionLayout</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@CollectionLayout</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>render()</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>render</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant_CollectionLayout_defaultView"><code>@CollectionLayout#defaultView()</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_CollectionLayout_defaultView"><code>@CollectionLayout#defaultView()</code></a></p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@Command</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@Command</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant_Action_command"><code>@Action#command()</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Action_command"><code>@Action#command()</code></a></p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@CssClass</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@CssClass</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p>Either <a href="../guides/rgant/rgant.html#_rgant_ActionLayout_cssClass"><code>@ActionLayout#cssClass()</code></a>, <a href="../guides/rgant/rgant.html#_rgant_PropertyLayout_cssClass"><code>@PropertyLayout#cssClass()</code></a>, <a href="../guides/rgant/rgant.html#_rgant_CollectionLayout_cssClass"><code>@CollectionLayout#cssClass()</code></a>, <a href="../guides/rgant/rgant.html#_rgant_ParameterLayout_cssClass"><code>@ParameterLayout#cssClass()</code></a>, <a href="../guides/rgant/rgant.html#_rgant_DomainObjectLayout_cssClass"><code>@DomainObjectLayout#cssClass()</code></a> or <a href="../guides/rgant/rgant.html#_rgant_ViewModelLayout_cssClass"><code>@ViewModelLayout#cssClass()</code></a>.</p>
+ <p>Either <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_ActionLayout_cssClass"><code>@ActionLayout#cssClass()</code></a>, <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_PropertyLayout_cssClass"><code>@PropertyLayout#cssClass()</code></a>, <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_CollectionLayout_cssClass"><code>@CollectionLayout#cssClass()</code></a>, <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_ParameterLayout_cssClass"><code>@ParameterLayout#cssClass()</code></a>, <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_DomainObjectLayout_cssClass"><code>@DomainObjectLayout#cssClass()</code></a> or <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_ViewModelLayout_cssClass"><code>@ViewModelLayout#cssClass()</code></a>.</p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@CssClassFa</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@CssClassFa</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p>Either <a href="../guides/rgant/rgant.html#_rgant_ActionLayout_cssClassFa"><code>@ActionLayout#cssClassFa()</code></a>, <a href="../guides/rgant/rgant.html#_rgant_DomainObjectLayout_cssClassFa"><code>@DomainObjectLayout#cssClassFa()</code></a> or <a href="../guides/rgant/rgant.html#_rgant_ViewModelLayout_cssClassFa"><code>@ViewModelLayout#cssClassFa()</code></a>.</p>
+ <p>Either <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_ActionLayout_cssClassFa"><code>@ActionLayout#cssClassFa()</code></a>, <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_DomainObjectLayout_cssClassFa"><code>@DomainObjectLayout#cssClassFa()</code></a> or <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_ViewModelLayout_cssClassFa"><code>@ViewModelLayout#cssClassFa()</code></a>.</p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@Debug</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@Debug</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant_Action_restrictTo"><code>@Action#restrictTo()</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Action_restrictTo"><code>@Action#restrictTo()</code></a></p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@DescribedAs</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@DescribedAs</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p>Either <a href="../guides/rgant/rgant.html#_rgant_ActionLayout_describedAs"><code>@ActionLayout#describedAs()</code></a>, <a href="../guides/rgant/rgant.html#_rgant_PropertyLayout_describedAs"><code>@PropertyLayout#describedAs()</code></a>, <a href="../guides/rgant/rgant.html#_rgant_CollectionLayout_describedAs"><code>@CollectionLayout#describedAs()</code></a>, <a href="../guides/rgant/rgant.html#_rgant_ParameterLayout_describedAs"><code>@ParameterLayout#describedAs()</code></a>, <a href="../guides/rgant/rgant.html#_rgant_DomainObjectLayout_describedAs"><code>@DomainObjectLayout#describedAs()</code></a> or <a href="../guides/rgant/rgant.html#_rgant_ViewModelLayout_describedAs"><code>@ViewModelLayout#describedAs()</code></a>.</p>
+ <p>Either <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_ActionLayout_describedAs"><code>@ActionLayout#describedAs()</code></a>, <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_PropertyLayout_describedAs"><code>@PropertyLayout#describedAs()</code></a>, <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_CollectionLayout_describedAs"><code>@CollectionLayout#describedAs()</code></a>, <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_ParameterLayout_describedAs"><code>@ParameterLayout#describedAs()</code></a>, <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_DomainObjectLayout_describedAs"><code>@DomainObjectLayout#describedAs()</code></a> or <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_ViewModelLayout_describedAs"><code>@ViewModelLayout#describedAs()</code></a>.</p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@Disabled</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@Disabled</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant_Property_editingDisabledReason"><code>@Property#editingDisabledReason()</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Property_editingDisabledReason"><code>@Property#editingDisabledReason()</code></a></p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top" rowspan="2">
- <div class="literal">
- <pre>@DomainObject</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@DomainObject</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>bounded</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>bounded</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p>Deleted (was a boolean attribute), replaced by <a href="../guides/rgant/rgant.html#_rgant_DomainObject_bounding"><code>@Property#bounding</code></a></p>
+ <p>Deleted (was a boolean attribute), replaced by <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_DomainObject_bounding"><code>@Property#bounding</code></a></p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>publishingPayloadFactory</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>publishingPayloadFactory</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>Removed, use the simpler <a href="../guides/rgsvc/rgsvc.html#PublisherService">PublisherService</a> SPI instead.</pre>
+ <div>
+ <div class="paragraph">
+ <p>Removed, use the simpler <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgsvc/rgsvc.html#PublisherService">PublisherService</a> SPI instead.</p>
+ </div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@Exploration</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@Exploration</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant_Action_restrictTo"><code>@Action#restrictTo()</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Action_restrictTo"><code>@Action#restrictTo()</code></a></p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@FieldOrder</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@FieldOrder</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant_MemberOrder"><code>@MemberOrder()</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_MemberOrder"><code>@MemberOrder()</code></a></p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@Hidden</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@Hidden</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p>For actions by either <a href="../guides/rgant/rgant.html#_rgant_Action_hidden"><code>@Action#hidden()</code></a> or <a href="../guides/rgant/rgant.html#_rgant_ActionLayout_hidden"><code>@ActionLayout#hidden()</code></a>, for properties by either <a href="../guides/rgant/rgant.html#_rgant_Property_hidden"><code>@Property#hidden()</code></a> or <a href="../guides/rgant/rgant.html#_rgant_PropertyLayout_hidden"><code>@PropertyLayout#hidden()</code></a>, for collections by either <a href="../guides/rgant/rgant.html#_rgant_Collection_hidden"><code>@Collection#hidden()</code></a> or <a href="../guides/rgant/rgant.html#_rgant_CollectionLayout_hidden"><code>@CollectionLayout#hidden()</code></a>.</p>
+ <p>For actions by either <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Action_hidden"><code>@Action#hidden()</code></a> or <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_ActionLayout_hidden"><code>@ActionLayout#hidden()</code></a>, for properties by either <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Property_hidden"><code>@Property#hidden()</code></a> or <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_PropertyLayout_hidden"><code>@PropertyLayout#hidden()</code></a>, for collections by either <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Collection_hidden"><code>@Collection#hidden()</code></a> or <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_CollectionLayout_hidden"><code>@CollectionLayout#hidden()</code></a>.</p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@Idempotent</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@Idempotent</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant_Action_semantics"><code>@Action#semantics()</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Action_semantics"><code>@Action#semantics()</code></a></p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@Ignore</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@Ignore</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant_Programmatic"><code>@Programmatic</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Programmatic"><code>@Programmatic</code></a></p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@Immutable</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@Immutable</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant_DomainObject_editing"><code>@DomainObject#editing()</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_DomainObject_editing"><code>@DomainObject#editing()</code></a></p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@Mandatory</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@Mandatory</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p>Either <a href="../guides/rgant/rgant.html#_rgant_Property_optionality"><code>@Property#optionality()</code></a> or <a href="../guides/rgant/rgant.html#_rgant_Parameter_optionality"><code>@Parameter#optionality()</code></a>.</p>
+ <p>Either <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Property_optionality"><code>@Property#optionality()</code></a> or <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Parameter_optionality"><code>@Parameter#optionality()</code></a>.</p>
</div>
<div class="paragraph">
- <p>For properties, can also use <a href="../guides/rgant/rgant.html#_rgant_Column_allowsNull"><code>@Column#allowsNull()</code></a> Can also use <a href="../guides/rgant/rgant.html#_rgant_Nullable"><code>@Nullable</code></a> for either properties or parameters.</p>
+ <p>For properties, can also use <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Column_allowsNull"><code>@Column#allowsNull()</code></a> Can also use <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Nullable"><code>@Nullable</code></a> for either properties or parameters.</p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@Mask</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@Mask</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
@@ -1546,154 +1565,154 @@ table.CodeRay td.code>pre{padding:0}
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@MaxLength</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@MaxLength</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p>Either <a href="../guides/rgant/rgant.html#_rgant_Property_maxLength"><code>@Property#maxLength()</code></a> or <a href="../guides/rgant/rgant.html#_rgant_Parameter_maxLength"><code>@Parameter#maxLength()</code></a>.</p>
+ <p>Either <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Property_maxLength"><code>@Property#maxLength()</code></a> or <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Parameter_maxLength"><code>@Parameter#maxLength()</code></a>.</p>
</div>
<div class="paragraph">
- <p>For properties, can also use <a href="../guides/rgant/rgant.html#_rgant_Column_length"><code>@Column#length()</code></a></p>
+ <p>For properties, can also use <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Column_length"><code>@Column#length()</code></a></p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@MemberGroups</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@MemberGroups</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/ugvw/ugvw.html#_ugvw_layout_file-based">.layout.xml</a> file instead.</p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/ugvw/ugvw.html#_ugvw_layout_file-based">.layout.xml</a> file instead.</p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@MultiLine</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@MultiLine</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p>Either <a href="../guides/rgant/rgant.html#_rgant_PropertyLayout_multiLine"><code>@PropertyLayout#multiLine()</code></a> or <a href="../guides/rgant/rgant.html#_rgant_ParameterLayout_multiLine"><code>@ParameterLayout#multiLine()</code></a>.</p>
+ <p>Either <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_PropertyLayout_multiLine"><code>@PropertyLayout#multiLine()</code></a> or <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_ParameterLayout_multiLine"><code>@ParameterLayout#multiLine()</code></a>.</p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@MustSatisfy</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@MustSatisfy</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p>Either <a href="../guides/rgant/rgant.html#_rgant_Property_mustSatisfy"><code>@Property#mustSatisfy()</code></a> or <a href="../guides/rgant/rgant.html#_rgant_Parameter_mustSatisfy"><code>@Parameter#mustSatisfy()</code></a>.</p>
+ <p>Either <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Property_mustSatisfy"><code>@Property#mustSatisfy()</code></a> or <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Parameter_mustSatisfy"><code>@Parameter#mustSatisfy()</code></a>.</p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@NotPersisted</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@NotPersisted</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant_Property_notPersisted"><code>@Property#notPersisted()</code></a>.</p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Property_notPersisted"><code>@Property#notPersisted()</code></a>.</p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@Optional</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@Optional</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p>Either <a href="../guides/rgant/rgant.html#_rgant_Property_optionality"><code>@Property#optionality()</code></a> or <a href="../guides/rgant/rgant.html#_rgant_Parameter_optionality"><code>@Parameter#optionality()</code></a>.</p>
+ <p>Either <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Property_optionality"><code>@Property#optionality()</code></a> or <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Parameter_optionality"><code>@Parameter#optionality()</code></a>.</p>
</div>
<div class="paragraph">
- <p>For properties, can also use <a href="../guides/rgant/rgant.html#_rgant_Column_allowsNull"><code>@Column#allowsNull()</code></a> Can also use <a href="../guides/rgant/rgant.html#_rgant_Nullable"><code>@Nullable</code></a> for either properties or parameters.</p>
+ <p>For properties, can also use <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Column_allowsNull"><code>@Column#allowsNull()</code></a> Can also use <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Nullable"><code>@Nullable</code></a> for either properties or parameters.</p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@Named</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@Named</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p>Either <a href="../guides/rgant/rgant.html#_rgant_ActionLayout_named"><code>@ActionLayout#named()</code></a>, <a href="../guides/rgant/rgant.html#_rgant_PropertyLayout_named"><code>@PropertyLayout#named()</code></a>, <a href="../guides/rgant/rgant.html#_rgant_CollectionLayout_named"><code>@CollectionLayout#named()</code></a>, <a href="../guides/rgant/rgant.html#_rgant_ParameterLayout_named"><code>@ParameterLayout#named()</code></a>, <a href="../guides/rgant/rgant.html#_rgant_DomainObjectLayout_named"><code>@DomainObjectLayout#named()</code></a> or <a href="../guides/rgant/rgant.html#_rgant_ViewModelLayout_named"><code>@ViewModelLayout#named()</code></a>.</p>
+ <p>Either <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_ActionLayout_named"><code>@ActionLayout#named()</code></a>, <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_PropertyLayout_named"><code>@PropertyLayout#named()</code></a>, <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_CollectionLayout_named"><code>@CollectionLayout#named()</code></a>, <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_ParameterLayout_named"><code>@ParameterLayout#named()</code></a>, <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_DomainObjectLayout_named"><code>@DomainObjectLayout#named()</code></a> or <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_ViewModelLayout_named"><code>@ViewModelLayout#named()</code></a>.</p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@NotInServiceMenu</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@NotInServiceMenu</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant_DomainService_nature"><code>@DomainService#nature()</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_DomainService_nature"><code>@DomainService#nature()</code></a></p>
</div>
<div class="paragraph">
- <p>Specify nature of <code>VIEW_CONTRIBUTIONS_ONLY</code>. Alternatively, use a <a href="../guides/rgant/rgant.html#_rgant_Mixin">mixin</a>.</p>
+ <p>Specify nature of <code>VIEW_CONTRIBUTIONS_ONLY</code>. Alternatively, use a <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Mixin">mixin</a>.</p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@NotContributed</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@NotContributed</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant_DomainService_nature"><code>@DomainService#nature()</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_DomainService_nature"><code>@DomainService#nature()</code></a></p>
</div>
<div class="paragraph">
<p>Specify nature of <code>VIEW_MENU_ONLY</code>.</p>
@@ -1702,13 +1721,13 @@ table.CodeRay td.code>pre{padding:0}
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@NotPersistable</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@NotPersistable</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
@@ -1718,37 +1737,41 @@ table.CodeRay td.code>pre{padding:0}
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@ObjectType</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@ObjectType</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p>Removed, <a href="../guides/rgant/rgant.html#_rgant_DomainObject_objectType"><code>@DomainObject#objectType()</code></a> or <a href="../guides/rgant/rgant.html#_rgant_DomainService_objectType"><code>@DomainService#objectType()</code></a></p>
+ <p>Removed, <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_DomainObject_objectType"><code>@DomainObject#objectType()</code></a> or <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_DomainService_objectType"><code>@DomainService#objectType()</code></a></p>
</div>
<div class="paragraph">
<p>Alternatively, for domain entities either:</p>
</div>
<div class="ulist">
<ul>
- <li> <p>the <a href="../guides/rgant/rgant.html#_rgant_Discriminator"><code>@Discriminator</code></a> annotation can be specified; the value is used as the object type, or</p> </li>
- <li> <p>the <a href="../guides/rgant/rgant.html#_rgant_PersistenceCapable_schema"><code>@PersistenceCapable#schema()</code></a> can be specified; the value is used as the concatenated with the class name to create a two part object type.</p> </li>
+ <li> <p>the <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Discriminator"><code>@Discriminator</code></a> annotation can be specified; the value is used as the object type, or</p> </li>
+ <li> <p>the <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_PersistenceCapable_schema"><code>@PersistenceCapable#schema()</code></a> can be specified; the value is used as the concatenated with the class name to create a two part object type.</p> </li>
</ul>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@Parameter</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@Parameter</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>minLength()</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>minLength</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
<div>
@@ -1756,311 +1779,321 @@ table.CodeRay td.code>pre{padding:0}
<p>Never implemented internally in Isis 1.x so no replacement.</p>
</div>
<div class="paragraph">
- <p>Note that the <a href="../guides/rgant/rgant.html#_rgant_MinLength"><code>@MinLength</code></a> annotation is for use with autocomplete supporting methods (specifying the minimum number of characters to enter before an auto-complete search is performed).</p>
+ <p>Note that the <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_MinLength"><code>@MinLength</code></a> annotation is for use with autocomplete supporting methods (specifying the minimum number of characters to enter before an auto-complete search is performed).</p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@Paged</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@Paged</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p>Either <a href="../guides/rgant/rgant.html#_rgant_CollectionLayout_paged"><code>@CollectionLayout#paged()</code></a> (for parented collections), or <a href="../guides/rgant/rgant.html#_rgant_DomainObject_paged"><code>@DomainObject#paged()</code></a> (for standalone collections)</p>
+ <p>Either <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_CollectionLayout_paged"><code>@CollectionLayout#paged()</code></a> (for parented collections), or <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_DomainObject_paged"><code>@DomainObject#paged()</code></a> (for standalone collections)</p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@ParameterLayout</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@ParameterLayout</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>renderedAsDayBefore</pre>
+ <div>
+ <div class="paragraph">
+ <p>renderedAsDayBefore</p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p>Deleted (was a boolean attribute), replaced by <a href="../guides/rgant/rgant.html#_rgant_ParameterLayout_renderDay"><code>@ParameterLayout#renderDay</code></a>.</p>
+ <p>Deleted (was a boolean attribute), replaced by <a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_ParameterLayout_renderDay"><code>@ParameterLayout#renderDay</code></a>.</p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@Plural</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@Plural</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant_DomainObjectLayout_plural"><code>@DomainObjectLayout#plural()</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_DomainObjectLayout_plural"><code>@DomainObjectLayout#plural()</code></a></p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@PostsAction
-InvokedEvent</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@PostsAction<br> InvokedEvent</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant_Action_domainEvent"><code>@Action#domainEvent()</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Action_domainEvent"><code>@Action#domainEvent()</code></a></p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@PostsCollection
-AddedToEvent</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@PostsCollection<br> AddedToEvent</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre></pre>
- </div></td>
+ <div></div></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../guides/rgant/rgant.html#_rgant_Collection_domainEvent"><code>@Collection#domainEvent()</code></a></p>
+ <p><a href="https://isis.apache.org/versions/2.0.0-M1/guides/rgant/rgant.html#_rgant_Collection_domainEvent"><code>@Collection#domainEvent()</code></a></p>
</div>
</div></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top">
- <div class="literal">
- <pre>@PostsCollection
-RemovedFromEvent</pre>
+ <div>
+ <div class="paragraph">
+ <p><code>@PostsCollection<br> RemovedFromEvent</code></p>
+ </div>
</div></td>
<td class="tableblock halign-left valign-top">
- <div class="liter
<TRUNCATED>
[06/39] isis-site git commit: ISIS-1810: updates docs for 2.0.0-M1
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/274edd1d/content/versions/SNAPSHOT/guides/ugodn/ugodn.pdf
----------------------------------------------------------------------
diff --git a/content/versions/SNAPSHOT/guides/ugodn/ugodn.pdf b/content/versions/SNAPSHOT/guides/ugodn/ugodn.pdf
index d5c4550..3f0fe06 100644
--- a/content/versions/SNAPSHOT/guides/ugodn/ugodn.pdf
+++ b/content/versions/SNAPSHOT/guides/ugodn/ugodn.pdf
@@ -4,8 +4,8 @@
<< /Title (DataNucleus Object Store)
/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:20180812182701+01'00')
-/ModDate (D:20180812182701+01'00')
+/CreationDate (D:20180814004039+02'00')
+/ModDate (D:20180814004039+02'00')
>>
endobj
2 0 obj
http://git-wip-us.apache.org/repos/asf/isis-site/blob/274edd1d/content/versions/SNAPSHOT/guides/ugsec/ugsec.html
----------------------------------------------------------------------
diff --git a/content/versions/SNAPSHOT/guides/ugsec/ugsec.html b/content/versions/SNAPSHOT/guides/ugsec/ugsec.html
index a11f989..19b0903 100644
--- a/content/versions/SNAPSHOT/guides/ugsec/ugsec.html
+++ b/content/versions/SNAPSHOT/guides/ugsec/ugsec.html
@@ -1549,16 +1549,16 @@ securityManager.cacheManager = $memoryCacheManager</code></pre>
<p>Generally speaking your domain objects (or more generally your application) should be agnostic of the user/roles that are interacting with them; applying security permissions is the responsibility of the framework.</p>
</div>
<div class="paragraph">
- <p>Still, on very rare occasion you may have a need, in which case you can either use Apache Isis' <code>DomainObjectContainer</code> API or you can reach further down the stack and use the JEE Servlet API.</p>
+ <p>Still, on very rare occasion you may have a need, in which case you can either use Apache Isis' <code>UserService</code> API or you can reach further down the stack and use the JEE Servlet API.</p>
</div>
<div class="sect2">
- <h3 id="__code_domainobjectcontainer_code_api">6.1. <code>DomainObjectContainer</code> API</h3>
+ <h3 id="__code_userservice_code_api">6.1. <code>UserService</code> API</h3>
<div class="paragraph">
- <p>The <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_DomainObjectContainer"><code>DomainObjectContainer</code></a> service exposes the following API:</p>
+ <p>The <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_UserService"><code>UserService</code></a> service exposes the following API:</p>
</div>
<div class="listingblock">
<div class="content">
- <pre class="CodeRay highlight"><code data-lang="java"><span class="directive">final</span> UserMemento user = container.getUser();
+ <pre class="CodeRay highlight"><code data-lang="java"><span class="directive">final</span> UserMemento user = userService.getUser();
<span class="directive">final</span> <span class="predefined-type">List</span><RoleMemento> roles = user.getRoles();
<span class="keyword">for</span> (RoleMemento role : roles) {
<span class="predefined-type">String</span> roleName = role.getName();
@@ -1587,7 +1587,7 @@ securityManager.cacheManager = $memoryCacheManager</code></pre>
<div class="sect2">
<h3 id="_servlet_api">6.2. Servlet API</h3>
<div class="paragraph">
- <p>On occasion you may find it necessary to reach below Isis and to the underlying servlet API. For example, the (non-ASF) <a href="http://platform.incode.org" target="_blank">Incode Platform</a>'s togglz module (non-ASF) has a requirement to do this in order to expose its embedded togglz web console. (</p>
+ <p>On occasion you may find it necessary to reach below Apache Isis and to the underlying servlet API. For example, the (non-ASF) <a href="http://platform.incode.org" target="_blank">Incode Platform</a>'s togglz module (non-ASF) has a requirement to do this in order to expose its embedded togglz web console. (</p>
</div>
<div class="admonitionblock tip">
<table>
http://git-wip-us.apache.org/repos/asf/isis-site/blob/274edd1d/content/versions/SNAPSHOT/guides/ugsec/ugsec.pdf
----------------------------------------------------------------------
diff --git a/content/versions/SNAPSHOT/guides/ugsec/ugsec.pdf b/content/versions/SNAPSHOT/guides/ugsec/ugsec.pdf
index 00c91b8..3214832 100644
--- a/content/versions/SNAPSHOT/guides/ugsec/ugsec.pdf
+++ b/content/versions/SNAPSHOT/guides/ugsec/ugsec.pdf
@@ -4,8 +4,8 @@
<< /Title (Security)
/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:20180812182709+01'00')
-/ModDate (D:20180812182709+01'00')
+/CreationDate (D:20180814004048+02'00')
+/ModDate (D:20180814004048+02'00')
>>
endobj
2 0 obj
@@ -88,7 +88,7 @@ endobj
>>
endobj
9 0 obj
-<< /Length 20679
+<< /Length 20699
>>
stream
q
@@ -893,7 +893,7 @@ ET
BT
79.9485 400.7359999999997 Td
/F4.0 10.5 Tf
-<446f6d61696e4f626a656374436f6e7461696e6572> Tj
+<5573657253657276696365> Tj
ET
0.000 0.000 0.000 SCN
@@ -902,7 +902,7 @@ ET
0.200 0.200 0.200 SCN
BT
-190.19850000000002 400.7359999999997 Td
+137.69850000000002 400.7359999999997 Td
/F1.0 10.5 Tf
<20415049> Tj
ET
@@ -913,9 +913,9 @@ ET
0.200 0.200 0.200 SCN
BT
-213.27124999999995 400.7359999999997 Td
+159.82624999999996 400.7359999999997 Td
/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -15539,7 +15539,7 @@ endobj
endobj
159 0 obj
<< /Limits [(caching) (wicket-viewer)]
-/Names [(caching) 184 0 R (code-domainobjectcontainer-code-api) 195 0 R (code-roles-code-section) 84 0 R (code-users-code-section) 83 0 R (code-web-inf-shiro-ini-code) 66 0 R (configuring-shiro-authenticator) 61 0 R (externalized-inirealm) 88 0 R (externalizing-role-perms) 103 0 R (further-reading) 188 0 R (other-guides) 17 0 R (restful-objects-viewer) 219 0 R (servlet-api) 197 0 R (shiro-configuration) 80 0 R (shiro-configuration-2) 96 0 R (telling-apache-isis-to-use-shiro) 55 0 R (terminology) 33 0 R (user-registration) 214 0 R (user-registration-2) 225 0 R (wicket-viewer) 208 0 R]
+/Names [(caching) 184 0 R (code-roles-code-section) 84 0 R (code-users-code-section) 83 0 R (code-userservice-code-api) 195 0 R (code-web-inf-shiro-ini-code) 66 0 R (configuring-shiro-authenticator) 61 0 R (externalized-inirealm) 88 0 R (externalizing-role-perms) 103 0 R (further-reading) 188 0 R (other-guides) 17 0 R (restful-objects-viewer) 219 0 R (servlet-api) 197 0 R (shiro-configuration) 80 0 R (shiro-configuration-2) 96 0 R (telling-apache-isis-to-use-shiro) 55 0 R (terminology) 33 0 R (user-registration) 214 0 R (user-registration-2) 225 0 R (wicket-viewer) 208 0 R]
>>
endobj
160 0 obj
@@ -22512,7 +22512,7 @@ endobj
>>
endobj
192 0 obj
-<< /Length 21260
+<< /Length 21230
>>
stream
q
@@ -22591,7 +22591,7 @@ ET
BT
48.24 678.086 Td
/F4.0 10.5 Tf
-<446f6d61696e4f626a656374436f6e7461696e6572> Tj
+<5573657253657276696365> Tj
ET
0.000 0.000 0.000 SCN
@@ -22600,7 +22600,7 @@ ET
0.200 0.200 0.200 SCN
BT
-158.49 678.086 Td
+105.99000000000001 678.086 Td
/F1.0 10.5 Tf
<20415049206f7220796f752063616e207265616368206675727468657220646f776e2074686520737461636b20616e642075736520746865204a454520536572766c6574204150492e> Tj
ET
@@ -22624,7 +22624,7 @@ ET
BT
83.574 638.2460000000001 Td
/F4.0 18 Tf
-<446f6d61696e4f626a656374436f6e7461696e6572> Tj
+<5573657253657276696365> Tj
ET
0.000 0.000 0.000 SCN
@@ -22633,7 +22633,7 @@ ET
0.200 0.200 0.200 SCN
BT
-272.57399999999996 638.2460000000001 Td
+182.57399999999998 638.2460000000001 Td
/F2.0 18 Tf
<20415049> Tj
ET
@@ -22657,7 +22657,7 @@ ET
BT
69.66 610.2260000000001 Td
/F4.0 10.5 Tf
-<446f6d61696e4f626a656374436f6e7461696e6572> Tj
+<5573657253657276696365> Tj
ET
0.000 0.000 0.000 SCN
@@ -22666,7 +22666,7 @@ ET
0.200 0.200 0.200 SCN
BT
-179.91000000000003 610.2260000000001 Td
+127.41000000000003 610.2260000000001 Td
/F1.0 10.5 Tf
<2073657276696365206578706f7365732074686520666f6c6c6f77696e67204150493a> Tj
ET
@@ -22794,7 +22794,7 @@ ET
BT
196.74 571.5850000000002 Td
/F4.0 11 Tf
-<636f6e7461696e6572> Tj
+<7573657253657276696365> Tj
ET
0.000 0.000 0.000 SCN
@@ -22803,7 +22803,7 @@ ET
0.200 0.200 0.200 SCN
BT
-246.24 571.5850000000002 Td
+257.24 571.5850000000002 Td
/F4.0 11 Tf
<2e> Tj
ET
@@ -22814,7 +22814,7 @@ ET
0.200 0.200 0.200 SCN
BT
-251.74 571.5850000000002 Td
+262.74 571.5850000000002 Td
/F4.0 11 Tf
<67657455736572> Tj
ET
@@ -22825,7 +22825,7 @@ ET
0.200 0.200 0.200 SCN
BT
-290.24 571.5850000000002 Td
+301.24 571.5850000000002 Td
/F4.0 11 Tf
<28> Tj
ET
@@ -22836,7 +22836,7 @@ ET
0.200 0.200 0.200 SCN
BT
-295.74 571.5850000000002 Td
+306.74 571.5850000000002 Td
/F4.0 11 Tf
<29> Tj
ET
@@ -22847,7 +22847,7 @@ ET
0.200 0.200 0.200 SCN
BT
-301.24 571.5850000000002 Td
+312.24 571.5850000000002 Td
/F4.0 11 Tf
<3b> Tj
ET
@@ -23574,12 +23574,12 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-1.042 Tw
+0.062 Tw
BT
48.24 228.50600000000017 Td
/F1.0 10.5 Tf
-[<4f6e206f63636173696f6e20796f75206d61> 20.01953125 <792066696e64206974206e656365737361727920746f2072656163682062656c6f77204973697320616e6420746f2074686520756e6465726c79696e6720736572766c6574204150492e202046> 40.0390625 <6f72>] TJ
+[<4f6e206f63636173696f6e20796f75206d61> 20.01953125 <792066696e64206974206e656365737361727920746f2072656163682062656c6f7720417061636865204973697320616e6420746f2074686520756e6465726c79696e6720736572766c6574204150492e>] TJ
ET
@@ -23589,12 +23589,12 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-0.742 Tw
+0.267 Tw
BT
48.24 212.72600000000017 Td
/F1.0 10.5 Tf
-<6578616d706c652c2074686520286e6f6e2d4153462920> Tj
+[<46> 40.0390625 <6f72206578616d706c652c2074686520286e6f6e2d4153462920>] TJ
ET
@@ -23604,10 +23604,10 @@ ET
0.259 0.545 0.792 scn
0.259 0.545 0.792 SCN
-0.742 Tw
+0.267 Tw
BT
-169.4402142857143 212.72600000000017 Td
+187.7704927455357 212.72600000000017 Td
/F1.0 10.5 Tf
<496e636f646520506c6174666f726d> Tj
ET
@@ -23619,12 +23619,12 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-0.742 Tw
+0.267 Tw
BT
-250.79028571428572 212.72600000000017 Td
+268.64584347098213 212.72600000000017 Td
/F1.0 10.5 Tf
-<277320746f67676c7a206d6f64756c6520286e6f6e2d4153462920686173206120726571756972656d656e7420746f20646f207468697320696e> Tj
+<277320746f67676c7a206d6f64756c6520286e6f6e2d4153462920686173206120726571756972656d656e7420746f20646f2074686973> Tj
ET
@@ -23637,7 +23637,7 @@ ET
BT
48.24 196.94600000000017 Td
/F1.0 10.5 Tf
-<6f7264657220746f206578706f73652069747320656d62656464656420746f67676c7a2077656220636f6e736f6c652e202028> Tj
+<696e206f7264657220746f206578706f73652069747320656d62656464656420746f67676c7a2077656220636f6e736f6c652e202028> Tj
ET
0.000 0.000 0.000 SCN
@@ -23863,10 +23863,10 @@ endobj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
-/URI (../rgsvc/rgsvc.pdf#_rgsvc_core-domain-api_DomainObjectContainer)
+/URI (../rgsvc/rgsvc.pdf#_rgsvc_core-domain-api_UserService)
>>
/Subtype /Link
-/Rect [69.66 608.7560000000001 179.91000000000003 619.2560000000001]
+/Rect [69.66 608.7560000000001 127.41000000000003 619.2560000000001]
/Type /Annot
>>
endobj
@@ -23880,7 +23880,7 @@ endobj
/URI (http://platform.incode.org)
>>
/Subtype /Link
-/Rect [169.4402142857143 209.66000000000017 250.79028571428572 223.94000000000017]
+/Rect [187.7704927455357 209.66000000000017 268.64584347098213 223.94000000000017]
/Type /Annot
>>
endobj
@@ -30796,7 +30796,7 @@ endobj
endobj
268 0 obj
<< /Border [0 0 0]
-/Dest (code-domainobjectcontainer-code-api)
+/Dest (code-userservice-code-api)
/Subtype /Link
/Rect [60.24 397.66999999999973 79.9485 411.9499999999997]
/Type /Annot
@@ -30804,23 +30804,23 @@ endobj
endobj
269 0 obj
<< /Border [0 0 0]
-/Dest (code-domainobjectcontainer-code-api)
+/Dest (code-userservice-code-api)
/Subtype /Link
-/Rect [79.9485 399.2659999999997 190.19850000000002 409.7659999999997]
+/Rect [79.9485 399.2659999999997 137.69850000000002 409.7659999999997]
/Type /Annot
>>
endobj
270 0 obj
<< /Border [0 0 0]
-/Dest (code-domainobjectcontainer-code-api)
+/Dest (code-userservice-code-api)
/Subtype /Link
-/Rect [190.19850000000002 397.66999999999973 210.51600000000002 411.9499999999997]
+/Rect [137.69850000000002 397.66999999999973 158.01600000000002 411.9499999999997]
/Type /Annot
>>
endobj
271 0 obj
<< /Border [0 0 0]
-/Dest (code-domainobjectcontainer-code-api)
+/Dest (code-userservice-code-api)
/Subtype /Link
/Rect [535.3009999999999 397.66999999999973 547.04 411.9499999999997]
/Type /Annot
@@ -31116,7 +31116,7 @@ endobj
>>
endobj
303 0 obj
-<< /Title <feff0036002e0031002e00200044006f006d00610069006e004f0062006a0065006300740043006f006e007400610069006e006500720020004100500049>
+<< /Title <feff0036002e0031002e0020005500730065007200530065007200760069006300650020004100500049>
/Parent 302 0 R
/Count 0
/Next 304 0 R
@@ -31546,338 +31546,338 @@ xref
0000001250 00000 n
0000001430 00000 n
0000001597 00000 n
-0000022329 00000 n
-0000022954 00000 n
-0000034032 00000 n
-0000034373 00000 n
-0000034417 00000 n
-0000034466 00000 n
-0000034512 00000 n
-0000034685 00000 n
-0000034740 00000 n
-0000034944 00000 n
-0000035144 00000 n
-0000035348 00000 n
-0000035541 00000 n
-0000035745 00000 n
-0000035950 00000 n
-0000036155 00000 n
-0000036359 00000 n
-0000036564 00000 n
-0000036769 00000 n
-0000036973 00000 n
-0000037168 00000 n
-0000037372 00000 n
-0000037569 00000 n
-0000037763 00000 n
-0000037818 00000 n
-0000054479 00000 n
-0000054824 00000 n
-0000054999 00000 n
-0000055186 00000 n
-0000055354 00000 n
-0000055529 00000 n
-0000055765 00000 n
-0000055990 00000 n
-0000056204 00000 n
-0000056374 00000 n
-0000056629 00000 n
-0000056879 00000 n
-0000057072 00000 n
-0000057287 00000 n
-0000057502 00000 n
-0000057751 00000 n
-0000075644 00000 n
-0000075965 00000 n
-0000076009 00000 n
-0000076234 00000 n
-0000076459 00000 n
-0000076514 00000 n
-0000076793 00000 n
-0000077039 00000 n
-0000077214 00000 n
-0000086987 00000 n
-0000087240 00000 n
-0000087296 00000 n
-0000103740 00000 n
-0000104016 00000 n
-0000104208 00000 n
-0000104263 00000 n
-0000104319 00000 n
-0000104526 00000 n
-0000105430 00000 n
-0000105660 00000 n
-0000105866 00000 n
-0000115577 00000 n
-0000115865 00000 n
-0000115909 00000 n
-0000115964 00000 n
-0000116210 00000 n
-0000116458 00000 n
-0000143031 00000 n
-0000143276 00000 n
-0000143547 00000 n
-0000143602 00000 n
-0000155669 00000 n
-0000155908 00000 n
-0000155963 00000 n
-0000156018 00000 n
-0000170801 00000 n
-0000171097 00000 n
-0000171337 00000 n
-0000171393 00000 n
-0000171659 00000 n
-0000171714 00000 n
-0000171926 00000 n
-0000200737 00000 n
-0000203181 00000 n
-0000203448 00000 n
-0000203676 00000 n
-0000203731 00000 n
-0000219937 00000 n
-0000220201 00000 n
-0000220422 00000 n
-0000220633 00000 n
-0000232974 00000 n
-0000233259 00000 n
-0000233317 00000 n
-0000233363 00000 n
-0000233629 00000 n
-0000234855 00000 n
-0000235113 00000 n
-0000327905 00000 n
-0000329944 00000 n
-0000330173 00000 n
-0000416095 00000 n
-0000418134 00000 n
-0000419166 00000 n
-0000419411 00000 n
-0000419639 00000 n
-0000507731 00000 n
-0000509770 00000 n
-0000511132 00000 n
-0000511390 00000 n
-0000511604 00000 n
-0000603390 00000 n
-0000605436 00000 n
-0000606001 00000 n
-0000606246 00000 n
-0000606466 00000 n
-0000703946 00000 n
-0000705985 00000 n
-0000709026 00000 n
-0000709292 00000 n
-0000709513 00000 n
-0000709571 00000 n
-0000709785 00000 n
-0000744057 00000 n
-0000748515 00000 n
-0000748781 00000 n
-0000749039 00000 n
-0000749268 00000 n
-0000789444 00000 n
-0000795216 00000 n
-0000795517 00000 n
-0000795795 00000 n
-0000796028 00000 n
-0000796085 00000 n
-0000796300 00000 n
-0000826013 00000 n
-0000832715 00000 n
-0000832987 00000 n
-0000833219 00000 n
-0000846452 00000 n
-0000846706 00000 n
-0000850492 00000 n
-0000850759 00000 n
-0000851000 00000 n
-0000851300 00000 n
-0000868635 00000 n
-0000868902 00000 n
-0000868948 00000 n
-0000869754 00000 n
-0000870404 00000 n
-0000870635 00000 n
-0000870881 00000 n
-0000875966 00000 n
-0000876207 00000 n
-0000887567 00000 n
-0000887887 00000 n
-0000887933 00000 n
-0000888139 00000 n
-0000888349 00000 n
-0000888564 00000 n
-0000888779 00000 n
-0000888994 00000 n
-0000889198 00000 n
-0000889255 00000 n
-0000899220 00000 n
-0000899476 00000 n
-0000899534 00000 n
-0000940589 00000 n
-0000940830 00000 n
-0000974701 00000 n
-0000974981 00000 n
-0000975227 00000 n
-0000975285 00000 n
-0000975513 00000 n
-0000975570 00000 n
-0000980328 00000 n
-0000980611 00000 n
-0000980824 00000 n
-0000980870 00000 n
-0000981068 00000 n
-0000981293 00000 n
-0000981564 00000 n
-0001002879 00000 n
-0001003167 00000 n
-0001003213 00000 n
-0001003270 00000 n
-0001003508 00000 n
-0001003565 00000 n
-0001003780 00000 n
-0001003994 00000 n
-0001011025 00000 n
-0001011253 00000 n
-0001026469 00000 n
-0001026794 00000 n
-0001026840 00000 n
-0001027020 00000 n
-0001027215 00000 n
-0001027416 00000 n
-0001027473 00000 n
-0001027676 00000 n
-0001027932 00000 n
-0001028164 00000 n
-0001051585 00000 n
-0001051915 00000 n
-0001051961 00000 n
-0001052157 00000 n
-0001052378 00000 n
-0001052617 00000 n
-0001052829 00000 n
-0001052886 00000 n
-0001053092 00000 n
-0001072464 00000 n
-0001072705 00000 n
-0001094248 00000 n
-0001094533 00000 n
-0001094590 00000 n
-0001094959 00000 n
-0001111353 00000 n
-0001111594 00000 n
-0001111724 00000 n
-0001111845 00000 n
-0001111970 00000 n
-0001112096 00000 n
-0001112239 00000 n
-0001112375 00000 n
-0001112534 00000 n
-0001112695 00000 n
-0001112859 00000 n
-0001113016 00000 n
-0001113181 00000 n
-0001113337 00000 n
-0001113501 00000 n
-0001113656 00000 n
-0001113817 00000 n
-0001113981 00000 n
-0001114144 00000 n
-0001114323 00000 n
-0001114493 00000 n
-0001114671 00000 n
-0001114851 00000 n
-0001115034 00000 n
-0001115220 00000 n
-0001115422 00000 n
-0001115634 00000 n
-0001115813 00000 n
-0001116003 00000 n
-0001116195 00000 n
-0001116387 00000 n
-0001116541 00000 n
-0001116707 00000 n
-0001116902 00000 n
-0001117099 00000 n
-0001117262 00000 n
-0001117436 00000 n
-0001117618 00000 n
-0001117800 00000 n
-0001117963 00000 n
-0001118136 00000 n
-0001118306 00000 n
-0001118488 00000 n
-0001118682 00000 n
-0001118863 00000 n
-0001119009 00000 n
-0001119165 00000 n
-0001119339 00000 n
-0001119513 00000 n
-0001119670 00000 n
-0001119829 00000 n
-0001119986 00000 n
-0001120155 00000 n
-0001120442 00000 n
-0001120520 00000 n
-0001120661 00000 n
-0001120853 00000 n
-0001121082 00000 n
-0001121271 00000 n
-0001121456 00000 n
-0001121749 00000 n
-0001122018 00000 n
-0001122298 00000 n
-0001122529 00000 n
-0001122739 00000 n
-0001123044 00000 n
-0001123245 00000 n
-0001123460 00000 n
-0001123701 00000 n
-0001123907 00000 n
-0001124188 00000 n
-0001124442 00000 n
-0001124656 00000 n
-0001124837 00000 n
-0001125108 00000 n
-0001125386 00000 n
-0001125628 00000 n
-0001125814 00000 n
-0001126114 00000 n
-0001126308 00000 n
-0001126538 00000 n
-0001126811 00000 n
-0001135129 00000 n
-0001135345 00000 n
-0001136708 00000 n
-0001137769 00000 n
-0001144948 00000 n
-0001145169 00000 n
-0001146532 00000 n
-0001147613 00000 n
-0001150983 00000 n
-0001151209 00000 n
-0001152572 00000 n
-0001153689 00000 n
-0001154851 00000 n
-0001155067 00000 n
-0001155370 00000 n
-0001156507 00000 n
-0001162240 00000 n
-0001162454 00000 n
-0001163817 00000 n
-0001164869 00000 n
-0001166233 00000 n
-0001166444 00000 n
-0001166759 00000 n
-0001167675 00000 n
-0001169830 00000 n
-0001170044 00000 n
-0001170380 00000 n
+0000022349 00000 n
+0000022974 00000 n
+0000034052 00000 n
+0000034393 00000 n
+0000034437 00000 n
+0000034486 00000 n
+0000034532 00000 n
+0000034705 00000 n
+0000034760 00000 n
+0000034964 00000 n
+0000035164 00000 n
+0000035368 00000 n
+0000035561 00000 n
+0000035765 00000 n
+0000035970 00000 n
+0000036175 00000 n
+0000036379 00000 n
+0000036584 00000 n
+0000036789 00000 n
+0000036993 00000 n
+0000037188 00000 n
+0000037392 00000 n
+0000037589 00000 n
+0000037783 00000 n
+0000037838 00000 n
+0000054499 00000 n
+0000054844 00000 n
+0000055019 00000 n
+0000055206 00000 n
+0000055374 00000 n
+0000055549 00000 n
+0000055785 00000 n
+0000056010 00000 n
+0000056224 00000 n
+0000056394 00000 n
+0000056649 00000 n
+0000056899 00000 n
+0000057092 00000 n
+0000057307 00000 n
+0000057522 00000 n
+0000057771 00000 n
+0000075664 00000 n
+0000075985 00000 n
+0000076029 00000 n
+0000076254 00000 n
+0000076479 00000 n
+0000076534 00000 n
+0000076813 00000 n
+0000077059 00000 n
+0000077234 00000 n
+0000087007 00000 n
+0000087260 00000 n
+0000087316 00000 n
+0000103760 00000 n
+0000104036 00000 n
+0000104228 00000 n
+0000104283 00000 n
+0000104339 00000 n
+0000104546 00000 n
+0000105450 00000 n
+0000105680 00000 n
+0000105886 00000 n
+0000115597 00000 n
+0000115885 00000 n
+0000115929 00000 n
+0000115984 00000 n
+0000116230 00000 n
+0000116478 00000 n
+0000143051 00000 n
+0000143296 00000 n
+0000143567 00000 n
+0000143622 00000 n
+0000155689 00000 n
+0000155928 00000 n
+0000155983 00000 n
+0000156038 00000 n
+0000170821 00000 n
+0000171117 00000 n
+0000171357 00000 n
+0000171413 00000 n
+0000171679 00000 n
+0000171734 00000 n
+0000171946 00000 n
+0000200757 00000 n
+0000203201 00000 n
+0000203468 00000 n
+0000203696 00000 n
+0000203751 00000 n
+0000219957 00000 n
+0000220221 00000 n
+0000220442 00000 n
+0000220653 00000 n
+0000232994 00000 n
+0000233279 00000 n
+0000233337 00000 n
+0000233383 00000 n
+0000233649 00000 n
+0000234875 00000 n
+0000235133 00000 n
+0000327925 00000 n
+0000329964 00000 n
+0000330193 00000 n
+0000416115 00000 n
+0000418154 00000 n
+0000419186 00000 n
+0000419431 00000 n
+0000419659 00000 n
+0000507751 00000 n
+0000509790 00000 n
+0000511152 00000 n
+0000511410 00000 n
+0000511624 00000 n
+0000603410 00000 n
+0000605456 00000 n
+0000606021 00000 n
+0000606266 00000 n
+0000606486 00000 n
+0000703966 00000 n
+0000706005 00000 n
+0000709046 00000 n
+0000709312 00000 n
+0000709533 00000 n
+0000709591 00000 n
+0000709805 00000 n
+0000744077 00000 n
+0000748535 00000 n
+0000748801 00000 n
+0000749059 00000 n
+0000749288 00000 n
+0000789464 00000 n
+0000795236 00000 n
+0000795537 00000 n
+0000795815 00000 n
+0000796048 00000 n
+0000796105 00000 n
+0000796320 00000 n
+0000826033 00000 n
+0000832735 00000 n
+0000833007 00000 n
+0000833239 00000 n
+0000846472 00000 n
+0000846726 00000 n
+0000850512 00000 n
+0000850779 00000 n
+0000851020 00000 n
+0000851320 00000 n
+0000868655 00000 n
+0000868922 00000 n
+0000868968 00000 n
+0000869774 00000 n
+0000870414 00000 n
+0000870645 00000 n
+0000870891 00000 n
+0000875976 00000 n
+0000876217 00000 n
+0000887577 00000 n
+0000887897 00000 n
+0000887943 00000 n
+0000888149 00000 n
+0000888359 00000 n
+0000888574 00000 n
+0000888789 00000 n
+0000889004 00000 n
+0000889208 00000 n
+0000889265 00000 n
+0000899230 00000 n
+0000899486 00000 n
+0000899544 00000 n
+0000940599 00000 n
+0000940840 00000 n
+0000974711 00000 n
+0000974991 00000 n
+0000975237 00000 n
+0000975295 00000 n
+0000975523 00000 n
+0000975580 00000 n
+0000980338 00000 n
+0000980621 00000 n
+0000980834 00000 n
+0000980880 00000 n
+0000981078 00000 n
+0000981303 00000 n
+0000981574 00000 n
+0001002859 00000 n
+0001003147 00000 n
+0001003193 00000 n
+0001003250 00000 n
+0001003478 00000 n
+0001003535 00000 n
+0001003750 00000 n
+0001003964 00000 n
+0001010995 00000 n
+0001011223 00000 n
+0001026439 00000 n
+0001026764 00000 n
+0001026810 00000 n
+0001026990 00000 n
+0001027185 00000 n
+0001027386 00000 n
+0001027443 00000 n
+0001027646 00000 n
+0001027902 00000 n
+0001028134 00000 n
+0001051555 00000 n
+0001051885 00000 n
+0001051931 00000 n
+0001052127 00000 n
+0001052348 00000 n
+0001052587 00000 n
+0001052799 00000 n
+0001052856 00000 n
+0001053062 00000 n
+0001072434 00000 n
+0001072675 00000 n
+0001094218 00000 n
+0001094503 00000 n
+0001094560 00000 n
+0001094929 00000 n
+0001111323 00000 n
+0001111564 00000 n
+0001111694 00000 n
+0001111815 00000 n
+0001111940 00000 n
+0001112066 00000 n
+0001112209 00000 n
+0001112345 00000 n
+0001112504 00000 n
+0001112665 00000 n
+0001112829 00000 n
+0001112986 00000 n
+0001113151 00000 n
+0001113307 00000 n
+0001113471 00000 n
+0001113626 00000 n
+0001113787 00000 n
+0001113951 00000 n
+0001114114 00000 n
+0001114293 00000 n
+0001114463 00000 n
+0001114641 00000 n
+0001114821 00000 n
+0001115004 00000 n
+0001115190 00000 n
+0001115392 00000 n
+0001115604 00000 n
+0001115783 00000 n
+0001115973 00000 n
+0001116165 00000 n
+0001116357 00000 n
+0001116511 00000 n
+0001116677 00000 n
+0001116872 00000 n
+0001117069 00000 n
+0001117232 00000 n
+0001117406 00000 n
+0001117588 00000 n
+0001117770 00000 n
+0001117933 00000 n
+0001118106 00000 n
+0001118266 00000 n
+0001118438 00000 n
+0001118622 00000 n
+0001118793 00000 n
+0001118939 00000 n
+0001119095 00000 n
+0001119269 00000 n
+0001119443 00000 n
+0001119600 00000 n
+0001119759 00000 n
+0001119916 00000 n
+0001120085 00000 n
+0001120372 00000 n
+0001120450 00000 n
+0001120591 00000 n
+0001120783 00000 n
+0001121012 00000 n
+0001121201 00000 n
+0001121386 00000 n
+0001121679 00000 n
+0001121948 00000 n
+0001122228 00000 n
+0001122459 00000 n
+0001122669 00000 n
+0001122974 00000 n
+0001123175 00000 n
+0001123390 00000 n
+0001123631 00000 n
+0001123837 00000 n
+0001124118 00000 n
+0001124372 00000 n
+0001124586 00000 n
+0001124767 00000 n
+0001125038 00000 n
+0001125316 00000 n
+0001125518 00000 n
+0001125704 00000 n
+0001126004 00000 n
+0001126198 00000 n
+0001126428 00000 n
+0001126701 00000 n
+0001135019 00000 n
+0001135235 00000 n
+0001136598 00000 n
+0001137659 00000 n
+0001144838 00000 n
+0001145059 00000 n
+0001146422 00000 n
+0001147503 00000 n
+0001150873 00000 n
+0001151099 00000 n
+0001152462 00000 n
+0001153579 00000 n
+0001154741 00000 n
+0001154957 00000 n
+0001155260 00000 n
+0001156397 00000 n
+0001162130 00000 n
+0001162344 00000 n
+0001163707 00000 n
+0001164759 00000 n
+0001166123 00000 n
+0001166334 00000 n
+0001166649 00000 n
+0001167565 00000 n
+0001169720 00000 n
+0001169934 00000 n
+0001170270 00000 n
trailer
<< /Size 337
/Root 2 0 R
/Info 1 0 R
>>
startxref
-1171518
+1171408
%%EOF
http://git-wip-us.apache.org/repos/asf/isis-site/blob/274edd1d/content/versions/SNAPSHOT/guides/ugtst/ugtst.html
----------------------------------------------------------------------
diff --git a/content/versions/SNAPSHOT/guides/ugtst/ugtst.html b/content/versions/SNAPSHOT/guides/ugtst/ugtst.html
index f7cdf20..2d2bc6b 100644
--- a/content/versions/SNAPSHOT/guides/ugtst/ugtst.html
+++ b/content/versions/SNAPSHOT/guides/ugtst/ugtst.html
@@ -1829,9 +1829,9 @@ Customer customer = (Customer)((WrappingObject)wrappedCustomer).__isis_wrapped()
<div class="ulist">
<ul>
<li> <p>for <strong><em>object properties</em></strong> the test can call the getter or setter method</p> </li>
- <li> <p>for <strong><em>object collections</em></strong> the test can call the getter. <br></p>
+ <li> <p>for <strong><em>object collections</em></strong> the test can call the getter.</p>
<div class="paragraph">
- <p>If there is a supporting <code>addTo…()</code> or <code>removeFrom…()</code> method, then these can be called. It can also call <code>add(…)</code> or <code>remove(…)</code> on the collection (returned by the gettter) itself.<br></p>
+ <p>If there is a supporting <code>addTo…()</code> or <code>removeFrom…()</code> method, then these can be called. It can also call <code>add(…)</code> or <code>remove(…)</code> on the collection (returned by the gettter) itself.</p>
</div>
<div class="admonitionblock note">
<table>
@@ -1856,7 +1856,7 @@ Customer customer = (Customer)((WrappingObject)wrappedCustomer).__isis_wrapped()
<p>What the test can’t call is any of the remaining supporting methods, such as <code>hide…()</code>, <code>disable…()</code> or <code>validate…()</code>. That’s because their value is implied by the exception being thrown.</p>
</div>
<div class="paragraph">
- <p>The wrapper <em>does</em> also allow the object’s <code>title()</code> method or its <code>toString()</code> , however this is little use for objects whose title is built up using the <code>@Title</code> annotation. Instead, we recommend that your test verifies an object’s title by calling <code>DomainObjectContainer#titleOf(…)</code> method.</p>
+ <p>The wrapper <em>does</em> also allow the object’s <code>title()</code> method or its <code>toString()</code> , however this is little use for objects whose title is built up using the <code>@Title</code> annotation. Instead, we recommend that your test verifies an object’s title by calling <code>TitleService#titleOf(…)</code> method.</p>
</div>
</div>
<div class="sect3">
@@ -2303,7 +2303,7 @@ Feature: <span class="predefined-type">List</span> and Create New Simple Objects
<td class="icon"> <i class="fa icon-tip" title="Tip"></i> </td>
<td class="content">
<div class="paragraph">
- <p>The <a href="../rgsvc/rgsvc.html#_rgsvc_api_Scratchpad"><code>Scratchpad</code></a> domain service is one way in which glue classes can pass state between each other. Or, for more type safety, you could develop your own custom domain services for each scenario, and inject these in as regular services. See <a href="http://www.thinkcode.se/blog/2017/04/01/sharing-state-between-steps-in-cucumberjvm-using-picocontainer">this blog</a> post for more details.</p>
+ <p>The <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_Scratchpad"><code>Scratchpad</code></a> domain service is one way in which glue classes can pass state between each other. Or, for more type safety, you could develop your own custom domain services for each scenario, and inject these in as regular services. See <a href="http://www.thinkcode.se/blog/2017/04/01/sharing-state-between-steps-in-cucumberjvm-using-picocontainer">this blog</a> post for more details.</p>
</div> </td>
</tr>
</tbody>
@@ -2992,7 +2992,7 @@ Feature: <span class="predefined-type">List</span> and Create New Simple Objects
</ul>
</div>
<div class="paragraph">
- <p>The <code>TickingClockFixture</code> is a pre-built fixture script that resets the date/time returned by the <a href="../rgsvc/rgsvc.html#_rgsvc_api_ClockService"><code>ClockService</code></a> to a known value.</p>
+ <p>The <code>TickingClockFixture</code> is a pre-built fixture script that resets the date/time returned by the <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_ClockService"><code>ClockService</code></a> to a known value.</p>
</div>
<div class="paragraph">
<p>Thereafter the time returned continues to tick forward (as would the real clock) until reset once more.</p>
@@ -3091,7 +3091,7 @@ toDoItem = sudoService.sudo(username,
</div>
</div>
<div class="paragraph">
- <p>Behind the scenes the <code>SudoService</code> simply talks to the <code>DomainObjectContainer</code> to override the user returned by the <code>getUser()</code> API. It is possible to override both users and roles.</p>
+ <p>Behind the scenes the <code>SudoService</code> simply talks to the <code>UserService</code> to override the user returned by the <code>getUser()</code> API. It is possible to override both users and roles.</p>
</div>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/isis-site/blob/274edd1d/content/versions/SNAPSHOT/guides/ugtst/ugtst.pdf
----------------------------------------------------------------------
diff --git a/content/versions/SNAPSHOT/guides/ugtst/ugtst.pdf b/content/versions/SNAPSHOT/guides/ugtst/ugtst.pdf
index 44f1e18..80bfb8a 100644
--- a/content/versions/SNAPSHOT/guides/ugtst/ugtst.pdf
+++ b/content/versions/SNAPSHOT/guides/ugtst/ugtst.pdf
@@ -4,8 +4,8 @@
<< /Title (Testing)
/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:20180812182717+01'00')
-/ModDate (D:20180812182717+01'00')
+/CreationDate (D:20180814004057+02'00')
+/ModDate (D:20180814004057+02'00')
>>
endobj
2 0 obj
@@ -32081,7 +32081,7 @@ endobj
>>
endobj
158 0 obj
-<< /Length 14416
+<< /Length 14408
>>
stream
q
@@ -32387,7 +32387,7 @@ ET
BT
48.24 665.226 Td
/F1.0 10.5 Tf
-[<73616d65207479706520617320746865206f626a656374206265696e672070726f786965642e2020416e642074686520726f6c65206f662074686973207772> 20.01953125 <617070657220697320746f2073696d756c617465207468652055492e>] TJ
+[<73616d65207479706520617320746865206f626a656374206265696e672070726f786965642e20416e642074686520726f6c65206f662074686973207772> 20.01953125 <617070657220697320746f2073696d756c617465207468652055492e>] TJ
ET
0.000 0.000 0.000 SCN
@@ -32648,7 +32648,7 @@ ET
BT
66.24000000000001 467.206 Td
/F1.0 10.5 Tf
-<746573742e20205468697320697320757375616c6c7920646f6e6520696e207468652074657374d57320> Tj
+<746573742e205468697320697320757375616c6c7920646f6e6520696e207468652074657374d57320> Tj
ET
0.000 0.000 0.000 SCN
@@ -32657,7 +32657,7 @@ ET
0.694 0.129 0.275 SCN
BT
-252.80400000000003 467.206 Td
+250.08450000000002 467.206 Td
/F6.0 10.5 Tf
<73657455702829> Tj
ET
@@ -32668,7 +32668,7 @@ ET
0.200 0.200 0.200 SCN
BT
-289.55400000000003 467.206 Td
+286.83450000000005 467.206 Td
/F1.0 10.5 Tf
<206d6574686f642e> Tj
ET
@@ -32812,12 +32812,12 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-3.322 Tw
+3.787 Tw
BT
66.24000000000001 348.526 Td
/F1.0 10.5 Tf
-[<69662074686520627573696e6573732072756c6520636865636b7320706173732c207468656e2074686520756e6465726c79696e67206d656d62657220697320696e766f6b> 20.01953125 <65642e20204f746865727769736520616e>] TJ
+[<69662074686520627573696e6573732072756c6520636865636b7320706173732c207468656e2074686520756e6465726c79696e67206d656d62657220697320696e766f6b> 20.01953125 <65642e204f746865727769736520616e>] TJ
ET
@@ -32838,12 +32838,12 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-0.976 Tw
+1.223 Tw
BT
48.24000000000001 304.966 Td
/F1.0 10.5 Tf
-[<5468652074797065206f6620657863657074696f6e20646570656e64732075706f6e207768617420736f7274206f6620636865636b206661696c65642e20204974d57320737472> 20.01953125 <6169676874666f727761726420656e6f7567683a20696620746865>] TJ
+[<5468652074797065206f6620657863657074696f6e20646570656e64732075706f6e207768617420736f7274206f6620636865636b206661696c65642e204974d57320737472> 20.01953125 <6169676874666f727761726420656e6f7567683a20696620746865>] TJ
ET
@@ -34398,7 +34398,7 @@ endobj
[166 0 R /XYZ 0 106.34356828193836 null]
endobj
171 0 obj
-<< /Length 25788
+<< /Length 25715
>>
stream
q
@@ -34410,7 +34410,7 @@ q
BT
48.24 794.6759999999999 Td
/F1.0 10.5 Tf
-<6d6574686f6473206f662074686520646f6d61696e206f626a656374d573206d656d626572732061726520616c6c6f77656420746f2062652063616c6c65642e202054686174206d65616e733a> Tj
+<6d6574686f6473206f662074686520646f6d61696e206f626a656374d573206d656d626572732061726520616c6c6f77656420746f2062652063616c6c65642e2054686174206d65616e733a> Tj
ET
0.000 0.000 0.000 SCN
@@ -34506,7 +34506,7 @@ ET
BT
176.2695 745.116 Td
/F1.0 10.5 Tf
-<2074686520746573742063616e2063616c6c20746865206765747465722e20> Tj
+<2074686520746573742063616e2063616c6c20746865206765747465722e> Tj
ET
0.000 0.000 0.000 SCN
@@ -34514,7 +34514,7 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-0.134 Tw
+0.312 Tw
BT
66.24000000000001 717.336 Td
@@ -34529,10 +34529,10 @@ ET
0.694 0.129 0.275 scn
0.694 0.129 0.275 SCN
-0.134 Tw
+0.312 Tw
BT
-183.49002941176468 717.336 Td
+184.38165625 717.336 Td
/F6.0 10.5 Tf
<616464546f> Tj
ET
@@ -34544,10 +34544,10 @@ ET
0.694 0.129 0.275 scn
0.694 0.129 0.275 SCN
-0.134 Tw
+0.312 Tw
BT
-209.74002941176468 717.336 Td
+210.63165625 717.336 Td
/F7.0 10.5 Tf
<c9> Tj
ET
@@ -34559,10 +34559,10 @@ ET
0.694 0.129 0.275 scn
0.694 0.129 0.275 SCN
-0.134 Tw
+0.312 Tw
BT
-220.24002941176468 717.336 Td
+221.13165625 717.336 Td
/F6.0 10.5 Tf
<2829> Tj
ET
@@ -34574,10 +34574,10 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-0.134 Tw
+0.312 Tw
BT
-230.74002941176468 717.336 Td
+231.63165625 717.336 Td
/F1.0 10.5 Tf
<206f7220> Tj
ET
@@ -34589,10 +34589,10 @@ ET
0.694 0.129 0.275 scn
0.694 0.129 0.275 SCN
-0.134 Tw
+0.312 Tw
BT
-247.45044117647055 717.336 Td
+248.69871874999998 717.336 Td
/F6.0 10.5 Tf
<72656d6f766546726f6d> Tj
ET
@@ -34604,10 +34604,10 @@ ET
0.694 0.129 0.275 scn
0.694 0.129 0.275 SCN
-0.134 Tw
+0.312 Tw
BT
-299.9504411764706 717.336 Td
+301.19871875 717.336 Td
/F7.0 10.5 Tf
<c9> Tj
ET
@@ -34619,10 +34619,10 @@ ET
0.694 0.129 0.275 scn
0.694 0.129 0.275 SCN
-0.134 Tw
+0.312 Tw
BT
-310.4504411764706 717.336 Td
+311.69871875 717.336 Td
/F6.0 10.5 Tf
<2829> Tj
ET
@@ -34634,12 +34634,12 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-0.134 Tw
+0.312 Tw
BT
-320.9504411764706 717.336 Td
+322.19871875 717.336 Td
/F1.0 10.5 Tf
-<206d6574686f642c207468656e2074686573652063616e2062652063616c6c65642e202049742063616e20616c736f> Tj
+<206d6574686f642c207468656e2074686573652063616e2062652063616c6c65642e2049742063616e20616c736f> Tj
ET
@@ -35070,7 +35070,7 @@ ET
BT
48.24000000000001 578.6560000000002 Td
/F1.0 10.5 Tf
-<6d6574686f642e2020546865736520617265206f6674656e2075736566756c20666f72206f627461696e696e6720612076616c69642076616c756520746f207573652e> Tj
+<6d6574686f642e20546865736520617265206f6674656e2075736566756c20666f72206f627461696e696e6720612076616c69642076616c756520746f207573652e> Tj
ET
0.000 0.000 0.000 SCN
@@ -35258,7 +35258,7 @@ ET
BT
111.24000000000001 535.0960000000002 Td
/F1.0 10.5 Tf
-[<2e202054686174d57320626563617573652074686569722076616c756520697320696d706c6965642062> 20.01953125 <792074686520657863657074696f6e206265696e67207468726f776e2e>] TJ
+[<2e2054686174d57320626563617573652074686569722076616c756520697320696d706c6965642062> 20.01953125 <792074686520657863657074696f6e206265696e67207468726f776e2e>] TJ
ET
0.000 0.000 0.000 SCN
@@ -35371,7 +35371,7 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-1.173 Tw
+0.063 Tw
BT
48.24000000000001 491.5360000000003 Td
@@ -35386,10 +35386,10 @@ ET
0.694 0.129 0.275 scn
0.694 0.129 0.275 SCN
-1.173 Tw
+0.063 Tw
BT
-272.4260625 491.5360000000003 Td
+262.4445 491.5360000000003 Td
/F6.0 10.5 Tf
<405469746c65> Tj
ET
@@ -35401,12 +35401,12 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-1.173 Tw
+0.063 Tw
BT
-303.9260625 491.5360000000003 Td
+293.9445 491.5360000000003 Td
/F1.0 10.5 Tf
-<20616e6e6f746174696f6e2e2020496e73746561642c207765207265636f6d6d656e64207468617420796f7572> Tj
+<20616e6e6f746174696f6e2e20496e73746561642c207765207265636f6d6d656e64207468617420796f75722074657374> Tj
ET
@@ -35419,7 +35419,7 @@ ET
BT
48.24000000000001 475.7560000000003 Td
/F1.0 10.5 Tf
-[<7465737420766572696669657320616e206f626a656374d573207469746c652062> 20.01953125 <792063616c6c696e6720>] TJ
+[<766572696669657320616e206f626a656374d573207469746c652062> 20.01953125 <792063616c6c696e6720>] TJ
ET
0.000 0.000 0.000 SCN
@@ -35428,9 +35428,9 @@ ET
0.694 0.129 0.275 SCN
BT
-237.84879492187503 475.7560000000003 Td
+217.384294921875 475.7560000000003 Td
/F6.0 10.5 Tf
-<446f6d61696e4f626a656374436f6e7461696e6572237469746c654f6628> Tj
+<5469746c6553657276696365237469746c654f6628> Tj
ET
0.000 0.000 0.000 SCN
@@ -35439,7 +35439,7 @@ ET
0.694 0.129 0.275 SCN
BT
-395.348794921875 475.7560000000003 Td
+327.63429492187504 475.7560000000003 Td
/F7.0 10.5 Tf
<c9> Tj
ET
@@ -35450,7 +35450,7 @@ ET
0.694 0.129 0.275 SCN
BT
-405.848794921875 475.7560000000003 Td
+338.13429492187504 475.7560000000003 Td
/F6.0 10.5 Tf
<29> Tj
ET
@@ -35461,7 +35461,7 @@ ET
0.200 0.200 0.200 SCN
BT
-411.098794921875 475.7560000000003 Td
+343.38429492187504 475.7560000000003 Td
/F1.0 10.5 Tf
<206d6574686f642e> Tj
ET
@@ -36111,7 +36111,7 @@ ET
BT
48.24000000000001 190.39600000000027 Td
/F1.0 10.5 Tf
-[<746f20616e> 20.01953125 <792073756273637269626572732e2020412074657374206d69676874207468657265666f7265206c6f6f6b206c696b> 20.01953125 <653a>] TJ
+[<746f20616e> 20.01953125 <792073756273637269626572732e20412074657374206d69676874207468657265666f7265206c6f6f6b206c696b> 20.01953125 <653a>] TJ
ET
0.000 0.000 0.000 SCN
@@ -47410,7 +47410,7 @@ endobj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
-/URI (../rgsvc/rgsvc.pdf#_rgsvc_api_Scratchpad)
+/URI (../rgsvc/rgsvc.pdf#_rgsvc_core-domain-api_Scratchpad)
>>
/Subtype /Link
/Rect [148.91443885216344 453.276 201.41443885216344 463.776]
@@ -68313,7 +68313,7 @@ endobj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
-/URI (../rgsvc/rgsvc.pdf#_rgsvc_api_ClockService)
+/URI (../rgsvc/rgsvc.pdf#_rgsvc_core-domain-api_ClockService)
>>
/Subtype /Link
/Rect [48.24 484.206 111.24000000000001 494.706]
@@ -68335,7 +68335,7 @@ endobj
>>
endobj
274 0 obj
-<< /Length 54703
+<< /Length 54682
>>
stream
q
@@ -72292,7 +72292,7 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-1.645 Tw
+0.774 Tw
BT
48.239999999999995 91.42599999999999 Td
@@ -72307,10 +72307,10 @@ ET
0.694 0.129 0.275 scn
0.694 0.129 0.275 SCN
-1.645 Tw
+0.774 Tw
BT
-165.97330769230769 91.42599999999999 Td
+162.4891880208333 91.42599999999999 Td
/F6.0 10.5 Tf
<5375646f53657276696365> Tj
ET
@@ -72322,10 +72322,10 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-1.645 Tw
+0.774 Tw
BT
-223.72330769230769 91.42599999999999 Td
+220.2391880208333 91.42599999999999 Td
/F1.0 10.5 Tf
<2073696d706c792074616c6b7320746f2074686520> Tj
ET
@@ -72337,12 +72337,12 @@ ET
0.694 0.129 0.275 scn
0.694 0.129 0.275 SCN
-1.645 Tw
+0.774 Tw
BT
-328.60119230769226 91.42599999999999 Td
+320.7619230468749 91.42599999999999 Td
/F6.0 10.5 Tf
-<446f6d61696e4f626a656374436f6e7461696e6572> Tj
+<5573657253657276696365> Tj
ET
@@ -72352,12 +72352,12 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-1.645 Tw
+0.774 Tw
BT
-438.85119230769226 91.42599999999999 Td
+378.5119230468749 91.42599999999999 Td
/F1.0 10.5 Tf
-<20746f206f76657272696465207468652075736572> Tj
+[<20746f206f766572726964652074686520757365722072657475726e65642062> 20.01953125 <79>] TJ
ET
@@ -72370,7 +72370,7 @@ ET
BT
48.239999999999995 75.64599999999999 Td
/F1.0 10.5 Tf
-[<72657475726e65642062> 20.01953125 <792074686520>] TJ
+<74686520> Tj
ET
0.000 0.000 0.000 SCN
@@ -72379,7 +72379,7 @@ ET
0.694 0.129 0.275 SCN
BT
-129.205294921875 75.64599999999999 Td
+66.92999999999999 75.64599999999999 Td
/F6.0 10.5 Tf
<676574557365722829> Tj
ET
@@ -72390,7 +72390,7 @@ ET
0.200 0.200 0.200 SCN
BT
-176.455294921875 75.64599999999999 Td
+114.17999999999999 75.64599999999999 Td
/F1.0 10.5 Tf
<204150492e20497420697320706f737369626c6520746f206f7665727269646520626f746820757365727320616e6420726f6c65732e> Tj
ET
@@ -73912,265 +73912,265 @@ xref
0000524070 00000 n
0000524342 00000 n
0000524617 00000 n
-0000539088 00000 n
-0000539376 00000 n
-0000539422 00000 n
-0000539651 00000 n
-0000539852 00000 n
-0000540043 00000 n
-0000554399 00000 n
-0000574319 00000 n
-0000574617 00000 n
-0000574803 00000 n
-0000574860 00000 n
-0000575029 00000 n
-0000575087 00000 n
-0000600930 00000 n
-0000601241 00000 n
-0000601432 00000 n
-0000601489 00000 n
-0000632496 00000 n
-0000632811 00000 n
-0000633035 00000 n
-0000633093 00000 n
-0000633332 00000 n
-0000633571 00000 n
-0000652273 00000 n
-0000652540 00000 n
-0000652765 00000 n
-0000653015 00000 n
-0000668784 00000 n
-0000669104 00000 n
-0000669150 00000 n
-0000669370 00000 n
-0000669599 00000 n
-0000669793 00000 n
-0000669850 00000 n
-0000670419 00000 n
-0000670634 00000 n
-0000670868 00000 n
-0000671096 00000 n
-0000671333 00000 n
-0000671391 00000 n
-0000704326 00000 n
-0000704585 00000 n
-0000704823 00000 n
-0000737227 00000 n
-0000737513 00000 n
-0000737751 00000 n
-0000768989 00000 n
-0000769328 00000 n
-0000769536 00000 n
-0000769805 00000 n
-0000770096 00000 n
-0000770327 00000 n
-0000770558 00000 n
-0000770616 00000 n
-0000770851 00000 n
-0000791058 00000 n
-0000791286 00000 n
-0000806264 00000 n
-0000806557 00000 n
-0000806603 00000 n
-0000806818 00000 n
-0000807093 00000 n
-0000833481 00000 n
-0000833770 00000 n
-0000833816 00000 n
-0000833873 00000 n
-0000834096 00000 n
-0000834341 00000 n
-0000834579 00000 n
-0000838807 00000 n
-0000839087 00000 n
-0000839309 00000 n
-0000887537 00000 n
-0000890754 00000 n
-0000890982 00000 n
-0000931560 00000 n
-0000934777 00000 n
-0000935652 00000 n
-0000935897 00000 n
-0000936091 00000 n
-0001001866 00000 n
-0001005083 00000 n
-0001014228 00000 n
-0001014507 00000 n
-0001014706 00000 n
-0001014945 00000 n
-0001031846 00000 n
-0001032105 00000 n
-0001032151 00000 n
-0001032388 00000 n
-0001094778 00000 n
-0001095051 00000 n
-0001095264 00000 n
-0001102451 00000 n
-0001102757 00000 n
-0001148924 00000 n
-0001149160 00000 n
-0001149218 00000 n
-0001149467 00000 n
-0001184272 00000 n
-0001184527 00000 n
-0001184573 00000 n
-0001195824 00000 n
-0001196070 00000 n
-0001196283 00000 n
-0001226047 00000 n
-0001226275 00000 n
-0001262963 00000 n
-0001263205 00000 n
-0001279691 00000 n
-0001279966 00000 n
-0001280168 00000 n
-0001280213 00000 n
+0000539080 00000 n
+0000539368 00000 n
+0000539414 00000 n
+0000539643 00000 n
+0000539844 00000 n
+0000540035 00000 n
+0000554391 00000 n
+0000574311 00000 n
+0000574609 00000 n
+0000574795 00000 n
+0000574852 00000 n
+0000575021 00000 n
+0000575079 00000 n
+0000600849 00000 n
+0000601160 00000 n
+0000601351 00000 n
+0000601408 00000 n
+0000632415 00000 n
+0000632730 00000 n
+0000632954 00000 n
+0000633012 00000 n
+0000633251 00000 n
+0000633490 00000 n
+0000652192 00000 n
+0000652459 00000 n
+0000652684 00000 n
+0000652934 00000 n
+0000668703 00000 n
+0000669023 00000 n
+0000669069 00000 n
+0000669289 00000 n
+0000669518 00000 n
+0000669712 00000 n
+0000669769 00000 n
+0000670338 00000 n
+0000670553 00000 n
+0000670787 00000 n
+0000671015 00000 n
+0000671252 00000 n
+0000671310 00000 n
+0000704245 00000 n
+0000704504 00000 n
+0000704742 00000 n
+0000737146 00000 n
+0000737432 00000 n
+0000737670 00000 n
+0000768908 00000 n
+0000769247 00000 n
+0000769467 00000 n
+0000769736 00000 n
+0000770027 00000 n
+0000770258 00000 n
+0000770489 00000 n
+0000770547 00000 n
+0000770782 00000 n
+0000790989 00000 n
+0000791217 00000 n
+0000806195 00000 n
+0000806488 00000 n
+0000806534 00000 n
+0000806749 00000 n
+0000807024 00000 n
+0000833412 00000 n
+0000833701 00000 n
+0000833747 00000 n
+0000833804 00000 n
+0000834027 00000 n
+0000834272 00000 n
+0000834510 00000 n
+0000838738 00000 n
+0000839018 00000 n
+0000839240 00000 n
+0000887468 00000 n
+0000890685 00000 n
+0000890913 00000 n
+0000931491 00000 n
+0000934708 00000 n
+0000935583 00000 n
+0000935828 00000 n
+0000936022 00000 n
+0001001797 00000 n
+0001005014 00000 n
+0001014159 00000 n
+0001014438 00000 n
+0001014637 00000 n
+0001014876 00000 n
+0001031777 00000 n
+0001032036 00000 n
+0001032082 00000 n
+0001032319 00000 n
+0001094709 00000 n
+0001094982 00000 n
+0001095195 00000 n
+0001102382 00000 n
+0001102688 00000 n
+0001148855 00000 n
+0001149091 00000 n
+0001149149 00000 n
+0001149398 00000 n
+0001184203 00000 n
+0001184458 00000 n
+0001184504 00000 n
+0001195755 00000 n
+0001196001 00000 n
+0001196214 00000 n
+0001225978 00000 n
+0001226206 00000 n
+0001262894 00000 n
+0001263136 00000 n
+0001279622 00000 n
+0001279897 00000 n
+0001280099 00000 n
+0001280144 00000 n
+0001280353 00000 n
0001280410 00000 n
-0001280467 00000 n
-0001280691 00000 n
-0001335449 00000 n
-0001335704 00000 n
-0001335831 00000 n
-0001335952 00000 n
-0001336077 00000 n
-0001336203 00000 n
-0001336342 00000 n
-0001336482 00000 n
-0001336641 00000 n
-0001336791 00000 n
-0001336938 00000 n
-0001337087 00000 n
-0001337247 00000 n
-0001337420 00000 n
-0001337593 00000 n
-0001337755 00000 n
-0001337920 00000 n
-0001338076 00000 n
-0001338225 00000 n
-0001338376 00000 n
-0001338539 00000 n
-0001338693 00000 n
-0001338845 00000 n
-0001338990 00000 n
-0001339148 00000 n
-0001339299 00000 n
-0001339466 00000 n
-0001339626 00000 n
-0001339807 00000 n
-0001339982 00000 n
-0001340158 00000 n
-0001340336 00000 n
-0001340529 00000 n
-0001340726 00000 n
-0001340913 00000 n
-0001341102 00000 n
-0001341273 00000 n
-0001341444 00000 n
-0001341630 00000 n
-0001341816 00000 n
-0001342001 00000 n
-0001342186 00000 n
-0001342370 00000 n
-0001342556 00000 n
-0001342749 00000 n
-0001342944 00000 n
-0001343131 00000 n
-0001343318 00000 n
-0001343507 00000 n
-0001343698 00000 n
-0001343868 00000 n
-0001344038 00000 n
-0001344220 00000 n
-0001344402 00000 n
-0001344589 00000 n
-0001344776 00000 n
-0001344962 00000 n
-0001345150 00000 n
-0001345308 00000 n
-0001345477 00000 n
-0001345650 00000 n
-0001345833 00000 n
-0001346013 00000 n
-0001346204 00000 n
-0001346373 00000 n
-0001346555 00000 n
-0001346735 00000 n
+0001280634 00000 n
+0001335371 00000 n
+0001335626 00000 n
+0001335753 00000 n
+0001335874 00000 n
+0001335999 00000 n
+0001336125 00000 n
+0001336264 00000 n
+0001336404 00000 n
+0001336563 00000 n
+0001336713 00000 n
+0001336860 00000 n
+0001337009 00000 n
+0001337169 00000 n
+0001337342 00000 n
+0001337515 00000 n
+0001337677 00000 n
+0001337842 00000 n
+0001337998 00000 n
+0001338147 00000 n
+0001338298 00000 n
+0001338461 00000 n
+0001338615 00000 n
+0001338767 00000 n
+0001338912 00000 n
+0001339070 00000 n
+0001339221 00000 n
+0001339388 00000 n
+0001339548 00000 n
+0001339729 00000 n
+0001339904 00000 n
+0001340080 00000 n
+0001340258 00000 n
+0001340451 00000 n
+0001340648 00000 n
+0001340835 00000 n
+0001341024 00000 n
+0001341195 00000 n
+0001341366 00000 n
+0001341552 00000 n
+0001341738 00000 n
+0001341923 00000 n
+0001342108 00000 n
+0001342292 00000 n
+0001342478 00000 n
+0001342671 00000 n
+0001342866 00000 n
+0001343053 00000 n
+0001343240 00000 n
+0001343429 00000 n
+0001343620 00000 n
+0001343790 00000 n
+0001343960 00000 n
+0001344142 00000 n
+0001344324 00000 n
+0001344511 00000 n
+0001344698 00000 n
+0001344884 00000 n
+0001345072 00000 n
+0001345230 00000 n
+0001345399 00000 n
+0001345572 00000 n
+0001345755 00000 n
+0001345935 00000 n
+0001346126 00000 n
+0001346295 00000 n
+0001346477 00000 n
+0001346657 00000 n
+0001346944 00000 n
0001347022 00000 n
-0001347100 00000 n
-0001347237 00000 n
-0001347429 00000 n
-0001347654 00000 n
-0001347829 00000 n
-0001348058 00000 n
-0001348299 00000 n
-0001348551 00000 n
-0001348823 00000 n
-0001349059 00000 n
-0001349263 00000 n
-0001349491 00000 n
-0001349671 00000 n
-0001349872 00000 n
-0001350137 00000 n
-0001350334 00000 n
-0001350553 00000 n
-0001350774 00000 n
-0001350981 00000 n
-0001351275 00000 n
-0001351469 00000 n
-0001351666 00000 n
-0001351867 00000 n
-0001352119 00000 n
-0001352324 00000 n
-0001352543 00000 n
-0001352805 00000 n
-0001352995 00000 n
-0001353224 00000 n
-0001353443 00000 n
-0001353687 00000 n
-0001353870 00000 n
-0001354098 00000 n
-0001354284 00000 n
-0001354673 00000 n
-0001363714 00000 n
-0001363930 00000 n
-0001365293 00000 n
-0001366348 00000 n
-0001373649 00000 n
-0001373870 00000 n
-0001375233 00000 n
-0001376316 00000 n
-0001377644 00000 n
-0001377855 00000 n
-0001378169 00000 n
-0001379084 00000 n
-0001383225 00000 n
-0001383455 00000 n
-0001384818 00000 n
-0001385935 00000 n
-0001390115 00000 n
-0001390341 00000 n
-0001391704 00000 n
-0001392807 00000 n
-0001398618 00000 n
-0001398832 00000 n
-0001400195 00000 n
-0001401246 00000 n
-0001402641 00000 n
-0001402859 00000 n
-0001404222 00000 n
-0001405361 00000 n
-0001407719 00000 n
-0001407933 00000 n
-0001408275 00000 n
-0001409413 00000 n
-0001410576 00000 n
-0001410792 00000 n
-0001411095 00000 n
+0001347159 00000 n
+0001347351 00000 n
+0001347576 00000 n
+0001347751 00000 n
+0001347980 00000 n
+0001348221 00000 n
+0001348473 00000 n
+0001348745 00000 n
+0001348981 00000 n
+0001349185 00000 n
+0001349413 00000 n
+0001349593 00000 n
+0001349794 00000 n
+0001350059 00000 n
+0001350256 00000 n
+0001350475 00000 n
+0001350696 00000 n
+0001350903 00000 n
+0001351197 00000 n
+0001351391 00000 n
+0001351588 00000 n
+0001351789 00000 n
+0001352041 00000 n
+0001352246 00000 n
+0001352465 00000 n
+0001352727 00000 n
+0001352917 00000 n
+0001353146 00000 n
+0001353365 00000 n
+0001353609 00000 n
+0001353792 00000 n
+0001354020 00000 n
+0001354206 00000 n
+0001354595 00000 n
+0001363636 00000 n
+0001363852 00000 n
+0001365215 00000 n
+0001366270 00000 n
+0001373571 00000 n
+0001373792 00000 n
+0001375155 00000 n
+0001376238 00000 n
+0001377566 00000 n
+0001377777 00000 n
+0001378091 00000 n
+0001379006 00000 n
+0001383147 00000 n
+0001383377 00000 n
+0001384740 00000 n
+0001385857 00000 n
+0001390037 00000 n
+0001390263 00000 n
+0001391626 00000 n
+0001392729 00000 n
+0001398540 00000 n
+0001398754 00000 n
+0001400117 00000 n
+0001401168 00000 n
+0001402563 00000 n
+0001402781 00000 n
+0001404144 00000 n
+0001405283 00000 n
+0001407641 00000 n
+0001407855 00000 n
+0001408197 00000 n
+0001409335 00000 n
+0001410498 00000 n
+0001410714 00000 n
+0001411017 00000 n
trailer
<< /Size 413
/Root 2 0 R
/Info 1 0 R
>>
startxref
-1412232
+1412154
%%EOF
http://git-wip-us.apache.org/repos/asf/isis-site/blob/274edd1d/content/versions/SNAPSHOT/guides/ugvro/ugvro.pdf
----------------------------------------------------------------------
diff --git a/content/versions/SNAPSHOT/guides/ugvro/ugvro.pdf b/content/versions/SNAPSHOT/guides/ugvro/ugvro.pdf
index a47fc02..e402eae 100644
--- a/content/versions/SNAPSHOT/guides/ugvro/ugvro.pdf
+++ b/content/versions/SNAPSHOT/guides/ugvro/ugvro.pdf
@@ -4,8 +4,8 @@
<< /Title (Restful Objects Viewer)
/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:20180812182730+01'00')
-/ModDate (D:20180812182730+01'00')
+/CreationDate (D:20180814004113+02'00')
+/ModDate (D:20180814004113+02'00')
>>
endobj
2 0 obj
http://git-wip-us.apache.org/repos/asf/isis-site/blob/274edd1d/content/versions/SNAPSHOT/guides/ugvw/ugvw.html
----------------------------------------------------------------------
diff --git a/content/versions/SNAPSHOT/guides/ugvw/ugvw.html b/content/versions/SNAPSHOT/guides/ugvw/ugvw.html
index ba9aaab..5af50cf 100644
--- a/content/versions/SNAPSHOT/guides/ugvw/ugvw.html
+++ b/content/versions/SNAPSHOT/guides/ugvw/ugvw.html
@@ -1439,7 +1439,16 @@ table.CodeRay td.code>pre{padding:0}
<div class="sect3">
<h4 id="_other_annotations">3.1.4. Other Annotations</h4>
<div class="paragraph">
- <p>All the layout annotations (eg <code>@Regex</code> and <code>@Named</code>) have been deprecated, instead replaced by the various <code>XxxLayout</code> annotations: <a href="../rgant/rgant.html#_rgant-ActionLayout, "><code>@ActionLayout</code></a> <a href="../rgant/rgant.html#_rgant-CollectionLayout"><code>@CollectionLayout</code></a>, <a href="../rgant/rgant.html#_rgant-DomainObjectLayout"><code>@DomainObjectLayout</code></a>, <a href="../rgant/rgant.html#_rgant-DomainServiceLayout"><code>@DomainServiceLayout</code></a>, <a href="../rgant/rgant.html#_rgant-ParameterLayout"><code>@ParameterLayout</code></a>, <a href="../rgant/rgant.html#_rgant-PropertyLayout"><code>@PropertyLayout</code></a>, and <a href="../rgant/rgant.html#_rgant-ViewModelLayout"><code>@ViewModelLayout</code></a></p>
+ <p>Layout semantics can also be specified using the various <code>XxxLayout</code> annotations:</p>
+ </div>
+ <div class="ulist">
+ <ul>
+ <li> <p>for domain services: <a href="../rgant/rgant.html#_rgant-DomainServiceLayout"><code>@DomainServiceLayout</code></a></p> </li>
+ <li> <p>for domain objects: <a href="../rgant/rgant.html#_rgant-DomainObjectLayout"><code>@DomainObjectLayout</code></a> and <a href="../rgant/rgant.html#_rgant-ViewModelLayout"><code>@ViewModelLayout</code></a></p> </li>
+ <li> <p>for actions: <a href="../rgant/rgant.html#_rgant-ActionLayout, "><code>@ActionLayout</code></a> and <a href="../rgant/rgant.html#_rgant-ParameterLayout"><code>@ParameterLayout</code></a></p> </li>
+ <li> <p>for properties: <a href="../rgant/rgant.html#_rgant-PropertyLayout"><code>@PropertyLayout</code></a></p> </li>
+ <li> <p>for collections: <a href="../rgant/rgant.html#_rgant-CollectionLayout"><code>@CollectionLayout</code></a></p> </li>
+ </ul>
</div>
</div>
</div>
[03/39] isis-site git commit: ISIS-1810: updates docs for 2.0.0-M1
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/274edd1d/content/versions/SNAPSHOT/pages/tg/tg.html
----------------------------------------------------------------------
diff --git a/content/versions/SNAPSHOT/pages/tg/tg.html b/content/versions/SNAPSHOT/pages/tg/tg.html
index eead162..317c3b2 100644
--- a/content/versions/SNAPSHOT/pages/tg/tg.html
+++ b/content/versions/SNAPSHOT/pages/tg/tg.html
@@ -342,10 +342,7 @@ mvn clean install -D mavenmixin-jettyconsole</code></pre>
</div>
</div>
<div class="paragraph">
- <p>A splash screen should appear offering to start up the app. Go ahead and start; the web browser should be opened at <a href="http://localhost:8080">http://localhost:8080</a></p>
- </div>
- <div class="paragraph">
- <p>Alternatively, you can run using the mvn-jetty-plugin:</p>
+ <p>A splash screen should appear offering to start up the app. Go ahead and start; the web browser should be opened at <a href="http://localhost:8080">http://localhost:8080</a>. Alternatively, you can run using the mvn-jetty-plugin:</p>
</div>
<div class="listingblock">
<div class="content">
@@ -792,7 +789,7 @@ mvn clean install -D mavenmixin-jettyconsole</code></pre>
<li> <p>generally we recommend using the <a href="../../guides/rgant/rgant.html#_rgant-Inject"><code>@Inject</code></a> annotation with either private or default visibility</p> </li>
</ul>
</div> </li>
- <li> <p>the service itself should use <a href="../../guides/rgsvc/rgsvc.html#_rgsvc_core-domain-api_DomainObjectContainer"><code>DomainObjectContainer</code></a></p> </li>
+ <li> <p>the service itself should use <a href="../../guides/rgsvc/rgsvc.html#_rgsvc_core-domain-api_RepositoryService"><code>RepositoryService</code></a></p> </li>
<li> <p>use the <a href="../../guides/rgant/rgant.html#_rgant-MemberOrder"><code>@MemberOrder(name=…)</code></a> annotation to associate an action with a property or with a collection</p> </li>
</ul>
</div>
http://git-wip-us.apache.org/repos/asf/isis-site/blob/274edd1d/content/versions/SNAPSHOT/release-notes/release-notes.html
----------------------------------------------------------------------
diff --git a/content/versions/SNAPSHOT/release-notes/release-notes.html b/content/versions/SNAPSHOT/release-notes/release-notes.html
index 3de5762..f9a042f 100644
--- a/content/versions/SNAPSHOT/release-notes/release-notes.html
+++ b/content/versions/SNAPSHOT/release-notes/release-notes.html
@@ -309,7 +309,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_release-notes_2.0.0-M1">2.0.0-M1</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/2.0.0-M1/release-notes/release-notes.html#_release-notes_2.0.0-M1">2.0.0-M1</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">31-07-2018</p></td>
<td class="tableblock halign-left valign-top">
<div>
@@ -328,7 +328,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_release-notes_1.16.2">1.16.2</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/1.16.2/release-notes/release-notes.html#_release-notes_1.16.2">1.16.2</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">05-03-2018</p></td>
<td class="tableblock halign-left valign-top">
<div>
@@ -347,7 +347,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_release-notes_1.16.1">1.16.1</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/1.16.1/release-notes/release-notes.html#_release-notes_1.16.1">1.16.1</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">22-02-2018</p></td>
<td class="tableblock halign-left valign-top">
<div>
@@ -366,7 +366,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_release-notes_1.16.0">1.16.0</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/1.16.0/release-notes/release-notes.html#_release-notes_1.16.0">1.16.0</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">08-01-2018</p></td>
<td class="tableblock halign-left valign-top">
<div>
@@ -385,7 +385,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_release-notes_1.15.1">1.15.1</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/1.15.1/release-notes/release-notes.html#_release-notes_1.15.1">1.15.1</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">25-09-2017</p></td>
<td class="tableblock halign-left valign-top">
<div>
@@ -404,7 +404,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_release-notes_1.15.0">1.15.0</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/1.15.0/release-notes/release-notes.html#_release-notes_1.15.0">1.15.0</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">14-08-2017</p></td>
<td class="tableblock halign-left valign-top">
<div>
@@ -423,7 +423,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_release-notes_1.14.0">1.14.0</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/1.14.0/release-notes/release-notes.html#_release-notes_1.14.0">1.14.0</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">19-02-2017</p></td>
<td class="tableblock halign-left valign-top">
<div>
@@ -442,7 +442,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_release-notes_1.13.2.1">1.13.2.1</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/1.13.2.1/release-notes/release-notes.html#_release-notes_1.13.2.1">1.13.2.1</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">03-jan-2017</p></td>
<td class="tableblock halign-left valign-top">
<div>
@@ -461,7 +461,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_release-notes_1.13.2">1.13.2</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/1.13.2/release-notes/release-notes.html#_release-notes_1.13.2">1.13.2</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">14-dec-2016</p></td>
<td class="tableblock halign-left valign-top">
<div>
@@ -480,7 +480,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_release-notes_1.13.1">1.13.1</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/1.13.1/release-notes/release-notes.html#_release-notes_1.13.1">1.13.1</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">30-oct-2016</p></td>
<td class="tableblock halign-left valign-top">
<div>
@@ -499,7 +499,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_release-notes_1.13.0">1.13.0</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/1.13.0/release-notes/release-notes.html#_release-notes_1.13.0">1.13.0</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">11-jul-2016</p></td>
<td class="tableblock halign-left valign-top">
<div>
@@ -518,7 +518,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_release-notes_1.12.2">1.12.2</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/1.12.2/release-notes/release-notes.html#_release-notes_1.12.2">1.12.2</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">06-jun-2016</p></td>
<td class="tableblock halign-left valign-top">
<div>
@@ -537,7 +537,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_release-notes_1.12.1">1.12.1</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/1.12.1/release-notes/release-notes.html#_release-notes_1.12.1">1.12.1</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">12-apr-2016</p></td>
<td class="tableblock halign-left valign-top">
<div>
@@ -556,7 +556,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_release-notes_1.12.0">1.12.0</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/1.12.0/release-notes/release-notes.html#_release-notes_1.12.0">1.12.0</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">29-mar-2016</p></td>
<td class="tableblock halign-left valign-top">
<div>
@@ -575,7 +575,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_release-notes_1.11.1">1.11.1</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/1.11.1/release-notes/release-notes.html#_release-notes_1.11.1">1.11.1</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">17-jan-2016</p></td>
<td class="tableblock halign-left valign-top">
<div>
@@ -594,7 +594,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_release-notes_1.11.0">1.11.0</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/1.11.0/release-notes/release-notes.html#_release-notes_1.11.0">1.11.0</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">02-jan-2016</p></td>
<td class="tableblock halign-left valign-top">
<div>
@@ -613,7 +613,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_release-notes_1.10.0">1.10.0</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/1.10.0/release-notes/release-notes.html#_release-notes_1.10.0">1.10.0</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">10-nov-2015</p></td>
<td class="tableblock halign-left valign-top">
<div>
@@ -632,7 +632,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_release-notes_1.9.0">1.9.0</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/1.9.0/release-notes/release-notes.html#_release-notes_1.9.0">1.9.0</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">1-sep-2015</p></td>
<td class="tableblock halign-left valign-top">
<div>
@@ -651,7 +651,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_release-notes_1.8.0">1.8.0</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/1.8.0/release-notes/release-notes.html#_release-notes_1.8.0">1.8.0</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">24-feb-2015</p></td>
<td class="tableblock halign-left valign-top">
<div>
@@ -673,7 +673,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_release-notes_1.7.0">1.7.0</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/1.7.0/release-notes/release-notes.html#_release-notes_1.7.0">1.7.0</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">18-oct-2014</p></td>
<td class="tableblock halign-left valign-top">
<div>
@@ -697,7 +697,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_release-notes_1.6.0">1.6.0</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/1.6.0/release-notes/release-notes.html#_release-notes_1.6.0">1.6.0</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">28-jul-2014</p></td>
<td class="tableblock halign-left valign-top">
<div>
@@ -721,7 +721,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_release-notes_1.5.0">1.5.0</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/1.5.0/release-notes/release-notes.html#_release-notes_1.5.0">1.5.0</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">08-jun-2014</p></td>
<td class="tableblock halign-left valign-top">
<div>
@@ -748,7 +748,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_release-notes_1.4.1">1.4.1</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/1.4.1/release-notes/release-notes.html#_release-notes_1.4.1">1.4.1</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">14-mar-2014</p></td>
<td class="tableblock halign-left valign-top">
<div>
@@ -772,7 +772,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#r1.4.0">1.4.0</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/1.4.0/release-notes/release-notes.html#_release-notes_1.4.0">1.4.0</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">11-mar-2014</p></td>
<td class="tableblock halign-left valign-top">
<div></div></td>
@@ -796,7 +796,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_release-notes_1.3.1">1.3.1</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/1.3.1/release-notes/release-notes.html#_release-notes_1.3.1">1.3.1</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">7-nov-2013</p></td>
<td class="tableblock halign-left valign-top">
<div>
@@ -819,7 +819,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_release-notes_1.3.0">1.3.0</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/1.3.0/release-notes/release-notes.html#_release-notes_1.3.0">1.3.0</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">25-oct-2013</p></td>
<td class="tableblock halign-left valign-top">
<div>
@@ -847,7 +847,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_release-notes_1.2.0">1.2.0</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/1.2.0/release-notes/release-notes.html#_release-notes_1.2.0">1.2.0</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">30-may-2013</p></td>
<td class="tableblock halign-left valign-top">
<div></div></td>
@@ -870,7 +870,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_release-notes_1.1.0">1.1.0</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/1.1.0/release-notes/release-notes.html#_release-notes_1.1.0">1.1.0</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">31-jan-2013</p></td>
<td class="tableblock halign-left valign-top">
<div></div></td>
@@ -890,7 +890,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#r1.0.1">1.0.1</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/1.0.1/release-notes/release-notes.html#_release-notes_1.0.1">1.0.1</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">10-jan-2013</p></td>
<td class="tableblock halign-left valign-top">
<div>
@@ -912,7 +912,7 @@ table.CodeRay td.code>pre{padding:0}
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_release-notes_1.0.0">1.0.0</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://isis.apache.org/versions/1.0.0/release-notes/release-notes.html#_release-notes_1.0.0">1.0.0</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">24-dec-2012</p></td>
<td class="tableblock halign-left valign-top">
<div>
@@ -1579,7 +1579,7 @@ table.CodeRay td.code>pre{padding:0}
<p>The version of Apache Wicket has also been upgraded from <code>6.x</code> to <code>7.x</code>.</p>
</div>
<div class="paragraph">
- <p>Most applications written against v1.14.x should run against v1.15.0 with few if any changes. That said, we do recommend that you read and keep in mind the <a href="../migration-notes/migration-notes.html#_migration-notes_1.14.0-to-1.15.0">migration notes</a> when you upgrade your app.</p>
+ <p>Most applications written against v1.14.x should run against v1.15.0 with few if any changes. That said, we do recommend that you read and keep in mind the <a href="https://isis.apache.org/versions/1.15.0/migration-notes/migration-notes.html#_migration-notes_1.14.0-to-1.15.0">migration notes</a> when you upgrade your app.</p>
</div>
<div class="admonitionblock note">
<table>
@@ -1770,7 +1770,7 @@ table.CodeRay td.code>pre{padding:0}
<p>The release also has a number of bug fixes.</p>
</div>
<div class="paragraph">
- <p>Most applications written against v1.13.x should run against v1.14.0 with few if any changes. That said, we do recommend that you read and keep in mind the <a href="../migration-notes/migration-notes.html#_migration-notes_1.13.0-to-1.14.0">migration notes</a> when you upgrade your app.</p>
+ <p>Most applications written against v1.13.x should run against v1.14.0 with few if any changes. That said, we do recommend that you read and keep in mind the <a href="https://isis.apache.org/versions/1.14.0/migration-notes/migration-notes.html#_migration-notes_1.13.0-to-1.14.0">migration notes</a> when you upgrade your app.</p>
</div>
<div class="sect2">
<h3 id="_new_feature_7">New Feature</h3>
@@ -2091,19 +2091,19 @@ table.CodeRay td.code>pre{padding:0}
</div>
<div class="sectionbody">
<div class="paragraph">
- <p>Apache Isis 1.13.0 improves and formalizes the support for commands and auditing, and introduces the new concept of an interaction. A command now represents the <em>intention</em> to interact with the application, either to invoke an action or to edit a property. This is captured as a JAXB DTO. An interaction on the other hand captures the fact that a command has been performed. Interactions are also captured as DTOs. Interactions can include sub-interactions, representing the fact that an action can invoke another action by way of the <a href="../guides/rgsvc/rgsvc.html#_rgsvc_application-layer-api_WrapperFactory"><code>WrapperFactory</code></a>.</p>
+ <p>Apache Isis 1.13.0 improves and formalizes the support for commands and auditing, and introduces the new concept of an interaction. A command now represents the <em>intention</em> to interact with the application, either to invoke an action or to edit a property. This is captured as a JAXB DTO. An interaction on the other hand captures the fact that a command has been performed. Interactions are also captured as DTOs. Interactions can include sub-interactions, representing the fact that an action can invoke another action by way of the <a href="https://isis.apache.org/versions/1.13.0/guides/rgsvc/rgsvc.html#_rgsvc_application-layer-api_WrapperFactory"><code>WrapperFactory</code></a>.</p>
</div>
<div class="paragraph">
- <p>The existing <a href="../guides/rgsvc/rgsvc.html#_rgsvc_persistence-layer-spi_AuditingService"><code>AuditingService</code></a> and <a href="../guides/rgsvc/rgsvc.html#_rgsvc_persistence-layer-spi_PublishingService"><code>PublishingService</code></a> SPI services have both been deprecated, instead replaced by <a href="../guides/rgsvc/rgsvc.html#_rgsvc_persistence-layer-spi_AuditerService"><code>AuditerService</code></a> and <a href="../guides/rgsvc/rgsvc.html#_rgsvc_persistence-layer-spi_PublisherService"><code>PublisherService</code></a>. It is now possible to have multiple implementations of each.</p>
+ <p>The existing <a href="https://isis.apache.org/versions/1.13.0/guides/rgsvc/rgsvc.html#_rgsvc_persistence-layer-spi_AuditingService"><code>AuditingService</code></a> and <a href="https://isis.apache.org/versions/1.13.0/guides/rgsvc/rgsvc.html#_rgsvc_persistence-layer-spi_PublishingService"><code>PublishingService</code></a> SPI services have both been deprecated, instead replaced by <a href="https://isis.apache.org/versions/1.13.0/guides/rgsvc/rgsvc.html#_rgsvc_persistence-layer-spi_AuditerService"><code>AuditerService</code></a> and <a href="https://isis.apache.org/versions/1.13.0/guides/rgsvc/rgsvc.html#_rgsvc_persistence-layer-spi_PublisherService"><code>PublisherService</code></a>. It is now possible to have multiple implementations of each.</p>
</div>
<div class="paragraph">
- <p>The (non-ASF) <a href="http://platform.incode.org" target="_blank">Incode Platform</a>'s auditing module has been reworked to implement <a href="../guides/rgsvc/rgsvc.html#_rgsvc_spi_AuditService"><code>AuditService</code></a>, while the new (non-ASF) <a href="http://platform.incode.org" target="_blank">Incode Platform</a>'s publishmq module implements <a href="../guides/rgsvc/rgsvc.html#_rgsvc_persistence-layer-spi_PublisherService"><code>PublisherService</code></a> to publish interaction events to an ActiveMQ bus (and to allow such events to be replayed if necessary).</p>
+ <p>The (non-ASF) <a href="http://platform.incode.org" target="_blank">Incode Platform</a>'s auditing module has been reworked to implement <a href="https://isis.apache.org/versions/1.13.0/guides/rgsvc/rgsvc.html#_rgsvc_spi_AuditService"><code>AuditService</code></a>, while the new (non-ASF) <a href="http://platform.incode.org" target="_blank">Incode Platform</a>'s publishmq module implements <a href="https://isis.apache.org/versions/1.13.0/guides/rgsvc/rgsvc.html#_rgsvc_persistence-layer-spi_PublisherService"><code>PublisherService</code></a> to publish interaction events to an ActiveMQ bus (and to allow such events to be replayed if necessary).</p>
</div>
<div class="paragraph">
<p>The release also includes a great deal of internal refactorings and simplifications.</p>
</div>
<div class="paragraph">
- <p>Most applications written against v1.12.x should run against v1.13.0 with few if any changes. That said, this release has removed a small number of features that were dependent on internal APIs, and some configuration properties are now removed/unsupported. We therefore do recommend that you read and keep in mind the <a href="../migration-notes/migration-notes.html#_migration-notes_1.12.0-to-1.13.0">migration notes</a> when you upgrade your app.</p>
+ <p>Most applications written against v1.12.x should run against v1.13.0 with few if any changes. That said, this release has removed a small number of features that were dependent on internal APIs, and some configuration properties are now removed/unsupported. We therefore do recommend that you read and keep in mind the <a href="https://isis.apache.org/versions/1.13.0/migration-notes/migration-notes.html#_migration-notes_1.12.0-to-1.13.0">migration notes</a> when you upgrade your app.</p>
</div>
<div class="sect2">
<h3 id="_new_feature_11">New Feature</h3>
@@ -2328,21 +2328,21 @@ table.CodeRay td.code>pre{padding:0}
<p>As a result of this change, the support for editing objects has been modified; rather than an 'edit' button which toggles the entire page into edit mode, instead each property is edited individually. The current implementation of this is using a prompt dialog (very similar to the action prompt dialogs; in a future release we hope to support "in-place" edits instead.</p>
</div>
<div class="paragraph">
- <p>Another notable change in this release include various new domain services. Some of these are in support of the file-based layouts functionality, others including new access into Apache Isis' metamodel. (Some of these new services were originally part of the (non-ASF) <a href="http://www.isisaddons.org">Isis Addons</a>). In addition, the <a href="../guides/rgsvc/rgsvc.html#_rgsvc_core-domain-api_DomainObjectContainer"><code>DomainObjectContainer</code></a> service has been deprecated, replaced by a number of fine-grained services (such as <a href="../guides/rgsvc/rgsvc.html#_rgsvc_persistence-layer-api_RepositoryService"><code>RepositoryService</code></a> and <a href="../guides/rgsvc/rgsvc.html#_rgsvc_application-layer-api_MessageService"><code>MessageService</code></a>).</p>
+ <p>Another notable change in this release include various new domain services. Some of these are in support of the file-based layouts functionality, others including new access into Apache Isis' metamodel. (Some of these new services were originally part of the (non-ASF) <a href="http://www.isisaddons.org">Isis Addons</a>). In addition, the <a href="https://isis.apache.org/versions/1.12.0/guides/rgsvc/rgsvc.html#_rgsvc_core-domain-api_DomainObjectContainer"><code>DomainObjectContainer</code></a> service has been deprecated, replaced by a number of fine-grained services (such as <a href="https://isis.apache.org/versions/1.12.0/guides/rgsvc/rgsvc.html#_rgsvc_persistence-layer-api_RepositoryService"><code>RepositoryService</code></a> and <a href="https://isis.apache.org/versions/1.12.0/guides/rgsvc/rgsvc.html#_rgsvc_application-layer-api_MessageService"><code>MessageService</code></a>).</p>
</div>
<div class="paragraph">
- <p>The release also includes a number of new mixins, to automatically surface in the UI an entity’s id, version (if any), and to download the layout XML and rebuild the metamodel for a given domain entity. There is also a mixin to clear any UI hints (part of the file-based layouts functionality). In all cases these mixins can be hidden using either security or by writing a <a href="../guides/rgcms/rgcms.html#_rgcms_classes_super_AbstractSubscriber">subscriber</a> to veto the visibility of the corresponding domain event.</p>
+ <p>The release also includes a number of new mixins, to automatically surface in the UI an entity’s id, version (if any), and to download the layout XML and rebuild the metamodel for a given domain entity. There is also a mixin to clear any UI hints (part of the file-based layouts functionality). In all cases these mixins can be hidden using either security or by writing a <a href="https://isis.apache.org/versions/1.12.0/guides/rgcms/rgcms.html#_rgcms_classes_super_AbstractSubscriber">subscriber</a> to veto the visibility of the corresponding domain event.</p>
</div>
<div class="sect2">
<h3 id="_new_feature_12">New Feature</h3>
<div class="ulist">
<ul>
- <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1351">ISIS-1351</a> - Extend <a href="../guides/rgsvc/rgsvc.html#_rgsvc_core-domain-api_ConfigurationService"><code>ConfigurationService</code></a> to list all configuration properties in the UI</p> </li>
- <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1325">ISIS-1325</a> - New <a href="../guides/rgsvc/rgsvc.html#_rgsvc_application-layer-api_SessionManagementService"><code>SessionManagementService</code></a></p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1351">ISIS-1351</a> - Extend <a href="https://isis.apache.org/versions/1.12.0/guides/rgsvc/rgsvc.html#_rgsvc_core-domain-api_ConfigurationService"><code>ConfigurationService</code></a> to list all configuration properties in the UI</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1325">ISIS-1325</a> - New <a href="https://isis.apache.org/versions/1.12.0/guides/rgsvc/rgsvc.html#_rgsvc_application-layer-api_SessionManagementService"><code>SessionManagementService</code></a></p> </li>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1317">ISIS-1317</a> - Allow single domain object class to be invalidated through a mixin.</p> </li>
- <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1313">ISIS-1313</a> - Enhancement to <a href="../guides/rgmvn/rgmvn.html#_rgmvn_xsd">xsd</a> goal of the isis-maven-plugin to ignore/include the Isis common schemas.</p> </li>
- <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1292">ISIS-1292</a> - Extend <a href="../guides/rgsvc/rgsvc.html#_rgsvc_metadata-api_MetamodelService"><code>MetaModelService</code></a> to surface packages, classes etc (as used by the security module).</p> </li>
- <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-993">ISIS-993</a> - Show different object members on multiple tabs (<a href="../guides/ugvw/ugvw.html#_ugvw_layout_file-based">dynamic XML layouts</a>)</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1313">ISIS-1313</a> - Enhancement to <a href="https://isis.apache.org/versions/1.12.0/guides/rgmvn/rgmvn.html#_rgmvn_xsd">xsd</a> goal of the isis-maven-plugin to ignore/include the Isis common schemas.</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1292">ISIS-1292</a> - Extend <a href="https://isis.apache.org/versions/1.12.0/guides/rgsvc/rgsvc.html#_rgsvc_metadata-api_MetamodelService"><code>MetaModelService</code></a> to surface packages, classes etc (as used by the security module).</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-993">ISIS-993</a> - Show different object members on multiple tabs (<a href="https://isis.apache.org/versions/1.12.0/guides/ugvw/ugvw.html#_ugvw_layout_file-based">dynamic XML layouts</a>)</p> </li>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-784">ISIS-784</a> - Change Wicket viewer to get rid of edit mode, instead allow individual fields to be edited by clicking on them (similar to the way that JIRA works).</p> </li>
</ul>
</div>
@@ -2352,25 +2352,25 @@ table.CodeRay td.code>pre{padding:0}
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1333">ISIS-1333</a> - Remove self-host profile from the archetype</p> </li>
- <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1332">ISIS-1332</a> - Factor out a <a href="../guides/rgsvc/rgsvc.html#_rgsvc_presentation-layer-spi_HintStore"><code>HintStore</code></a> service, so that this is pluggable.</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1332">ISIS-1332</a> - Factor out a <a href="https://isis.apache.org/versions/1.12.0/guides/rgsvc/rgsvc.html#_rgsvc_presentation-layer-spi_HintStore"><code>HintStore</code></a> service, so that this is pluggable.</p> </li>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1330">ISIS-1330</a> - Add CSS classes for table cells and for collections to make it easier to fine tune pages using CSS.</p> </li>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1329">ISIS-1329</a> - Extend hint support for "show all"</p> </li>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1327">ISIS-1327</a> - Change the view mode of the select2 (value drop down) to be a simple text field.</p> </li>
- <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1324">ISIS-1324</a> - Allow multiple different views of same collection in a layout (<a href="../guides/ugvw/ugvw.html#_ugvw_layout_file-based">dynamic XML layouts</a>)</p> </li>
- <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1323">ISIS-1323</a> - Deprecate @CollectionLayout#renderType, since is duplicated by <a href="../guides/rgant/rgant.html#_rgant-CollectionLayout_defaultView"><code>@CollectionLayout#defaultView()</code></a></p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1324">ISIS-1324</a> - Allow multiple different views of same collection in a layout (<a href="https://isis.apache.org/versions/1.12.0/guides/ugvw/ugvw.html#_ugvw_layout_file-based">dynamic XML layouts</a>)</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1323">ISIS-1323</a> - Deprecate @CollectionLayout#renderType, since is duplicated by <a href="https://isis.apache.org/versions/1.12.0/guides/rgant/rgant.html#_rgant-CollectionLayout_defaultView"><code>@CollectionLayout#defaultView()</code></a></p> </li>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1322">ISIS-1322</a> - Mixins not exposing the mixedin object in events (for subscribers to veto).</p> </li>
- <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1321">ISIS-1321</a> - Extend <a href="../guides/rgsvc/rgsvc.html#_rgsvc_metadata-api_MetamodelService"><code>MetaModelService</code></a> to allow CSV of metamodel to be downloaded.</p> </li>
- <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1320">ISIS-1320</a> - Move <a href="../guides/rgsvc/rgsvc.html#_rgsvc_presentation-layer-spi_ContentMappingService"><code>ContentMappingService</code></a> to applib (and simplify)</p> </li>
- <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1312">ISIS-1312</a> - Improve <a href="../guides/rgsvc/rgsvc.html#_rgsvc_integration-api_JaxbService"><code>JaxbServiceDefault#xsd(…)</code></a> to correctly reference the Isis common schema imports.</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1321">ISIS-1321</a> - Extend <a href="https://isis.apache.org/versions/1.12.0/guides/rgsvc/rgsvc.html#_rgsvc_metadata-api_MetamodelService"><code>MetaModelService</code></a> to allow CSV of metamodel to be downloaded.</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1320">ISIS-1320</a> - Move <a href="https://isis.apache.org/versions/1.12.0/guides/rgsvc/rgsvc.html#_rgsvc_presentation-layer-spi_ContentMappingService"><code>ContentMappingService</code></a> to applib (and simplify)</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1312">ISIS-1312</a> - Improve <a href="https://isis.apache.org/versions/1.12.0/guides/rgsvc/rgsvc.html#_rgsvc_integration-api_JaxbService"><code>JaxbServiceDefault#xsd(…)</code></a> to correctly reference the Isis common schema imports.</p> </li>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1300">ISIS-1300</a> - Allow the enablement of the WicketSource plugin to be configurable, and disabled by default</p> </li>
- <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1299">ISIS-1299</a> - <a href="../guides/rgant/rgant.html#_rgant-ViewModel"><code>@ViewModel</code></a> and <a href="../guides/rgant/rgant.html#_rgant-XmlRootElement"><code>@XmlRootElement</code></a> view models should automatically support isCloneable.</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1299">ISIS-1299</a> - <a href="https://isis.apache.org/versions/1.12.0/guides/rgant/rgant.html#_rgant-ViewModel"><code>@ViewModel</code></a> and <a href="https://isis.apache.org/versions/1.12.0/guides/rgant/rgant.html#_rgant-XmlRootElement"><code>@XmlRootElement</code></a> view models should automatically support isCloneable.</p> </li>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1298">ISIS-1298</a> - Fix deprecated annotation use for ViewModel.Cloneable#clone</p> </li>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1295">ISIS-1295</a> - Run integration tests using thread-local, to allow "complete" tests that also exercise, eg Quartz jobs.</p> </li>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1240">ISIS-1240</a> - Derive icon from service when not provided</p> </li>
- <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1239">ISIS-1239</a> - For wicket ui, use a cookie or similar to remember the hint from last time (<a href="../guides/ugvw/ugvw.html#_ugvw_layout_file-based">dynamic XML layouts</a>)</p> </li>
- <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1228">ISIS-1228</a> - Reorganizing/splitting out <a href="../guides/rgant/rgant.html#_rgant-DomainObjectContainer"><code>@DomainObjectContainer</code></a> service.</p> </li>
- <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1048">ISIS-1048</a> - Make view model URLs more secure, eg through a private key (<a href="../guides/rgsvc/rgsvc.html#_rgsvc_presentation-layer-spi_UrlEncodingService"><code>UrlEncodingService</code></a>).</p> </li>
- <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1037">ISIS-1037</a> - Support layout.xml as well as layout.json (<a href="../guides/ugvw/ugvw.html#_ugvw_layout_file-based">dynamic XML layouts</a>)</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1239">ISIS-1239</a> - For wicket ui, use a cookie or similar to remember the hint from last time (<a href="https://isis.apache.org/versions/1.12.0/guides/ugvw/ugvw.html#_ugvw_layout_file-based">dynamic XML layouts</a>)</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1228">ISIS-1228</a> - Reorganizing/splitting out <a href="https://isis.apache.org/versions/1.12.0/guides/rgant/rgant.html#_rgant-DomainObjectContainer"><code>@DomainObjectContainer</code></a> service.</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1048">ISIS-1048</a> - Make view model URLs more secure, eg through a private key (<a href="https://isis.apache.org/versions/1.12.0/guides/rgsvc/rgsvc.html#_rgsvc_presentation-layer-spi_UrlEncodingService"><code>UrlEncodingService</code></a>).</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1037">ISIS-1037</a> - Support layout.xml as well as layout.json (<a href="https://isis.apache.org/versions/1.12.0/guides/ugvw/ugvw.html#_ugvw_layout_file-based">dynamic XML layouts</a>)</p> </li>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-806">ISIS-806</a> - In Wicket viewer, shouldn’t be possible to invoke an action if editing a form.</p> </li>
</ul>
</div>
@@ -2379,7 +2379,7 @@ table.CodeRay td.code>pre{padding:0}
<h3 id="_bug_14">Bug</h3>
<div class="ulist">
<ul>
- <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1348">ISIS-1348</a> - Bug with <a href="../guides/ugtst/ugtst.html#_ugtst_unit-test-support_soap-fake-server-junit-rule">SoapEndpointPublishingRule</a> when multiple endpoints.</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1348">ISIS-1348</a> - Bug with <a href="https://isis.apache.org/versions/1.12.0/guides/ugtst/ugtst.html#_ugtst_unit-test-support_soap-fake-server-junit-rule">SoapEndpointPublishingRule</a> when multiple endpoints.</p> </li>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1347">ISIS-1347</a> - Missing annotation in SimpleObject</p> </li>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1346">ISIS-1346</a> - ActionInvocationContext isn’t populated properly</p> </li>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1342">ISIS-1342</a> - The metamodel validation error page doesn’t reliably render itself if there are errors.</p> </li>
@@ -2387,8 +2387,8 @@ table.CodeRay td.code>pre{padding:0}
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1340">ISIS-1340</a> - Rebuild metamodel mixin action isn’t working reliably</p> </li>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1328">ISIS-1328</a> - Bookmark hints are not being honoured</p> </li>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1319">ISIS-1319</a> - Input dialog for action label for mandatory parameter not shown when the parameter is an view model</p> </li>
- <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1318">ISIS-1318</a> - contributed actions/mixins breaks publishing; also flush any pending actions to be published as the result of doing a wrapped action via the <a href="../guides/rgsvc/rgsvc.html#_rgsvc_application-layer-api_WrapperFactory"><code>WrapperFactory</code></a></p> </li>
- <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1315">ISIS-1315</a> - Can’t generate <a href="../guides/rgmvn/rgmvn.html#_rgmvn_swagger">swagger</a> specs, where actions are contributed.</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1318">ISIS-1318</a> - contributed actions/mixins breaks publishing; also flush any pending actions to be published as the result of doing a wrapped action via the <a href="https://isis.apache.org/versions/1.12.0/guides/rgsvc/rgsvc.html#_rgsvc_application-layer-api_WrapperFactory"><code>WrapperFactory</code></a></p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1315">ISIS-1315</a> - Can’t generate <a href="https://isis.apache.org/versions/1.12.0/guides/rgmvn/rgmvn.html#_rgmvn_swagger">swagger</a> specs, where actions are contributed.</p> </li>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1314">ISIS-1314</a> - Filename parameter label missing for DTO mixins</p> </li>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1311">ISIS-1311</a> - Mixins for Persistable metadata causes exception when rendering.</p> </li>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1310">ISIS-1310</a> - DomainObjectContainer#titleOf(..) does not resolve @Title annotated on private field</p> </li>
@@ -2468,7 +2468,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
<div class="ulist">
<ul>
- <li> <p>the <a href="../guides/ugvro/ugvro.html">Restful Objects viewer</a> now supports simplified representations intended to make it easier to write custom Javascript (and other) clients that consume the REST API; these are obtained using the HTTP Accept header. There is also support for <a href="http://swagger.io">Swagger</a> spec files so that the REST API can be more easily explored and tested.<br></p>
+ <li> <p>the <a href="https://isis.apache.org/versions/1.11.0/guides/ugvro/ugvro.html#">Restful Objects viewer</a> now supports simplified representations intended to make it easier to write custom Javascript (and other) clients that consume the REST API; these are obtained using the HTTP Accept header. There is also support for <a href="http://swagger.io">Swagger</a> spec files so that the REST API can be more easily explored and tested.<br></p>
<div class="paragraph">
<p>In addition, the <code>x-ro-follow-links</code> capability for RO spec representations is now supported.</p>
</div> </li>
@@ -2686,7 +2686,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
<div class="sectionbody">
<div class="paragraph">
- <p>Apache Isis 1.9.0 provides various new "under-the-cover" features, such as <code>AppManifest</code> for simplified bootstrapping, and content negotiation support within <a href="../guides/ugvro/ugvro.html">RestfulObjects viewer</a>. It also updates the DataNucleus version to DN 4.1.x.</p>
+ <p>Apache Isis 1.9.0 provides various new "under-the-cover" features, such as <code>AppManifest</code> for simplified bootstrapping, and content negotiation support within <a href="https://isis.apache.org/versions/1.9.0/guides/ugvro/ugvro.html#">RestfulObjects viewer</a>. It also updates the DataNucleus version to DN 4.1.x.</p>
</div>
<div class="paragraph">
<p>This release was also the first to include the updated Asciidoc website.</p>
[30/39] isis-site git commit: ISIS-1810: updates docs for 2.0.0-M1
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/274edd1d/content/versions/2.0.0-M1/guides/rgcms/rgcms.pdf
----------------------------------------------------------------------
diff --git a/content/versions/2.0.0-M1/guides/rgcms/rgcms.pdf b/content/versions/2.0.0-M1/guides/rgcms/rgcms.pdf
index 39a4023..84df587 100644
--- a/content/versions/2.0.0-M1/guides/rgcms/rgcms.pdf
+++ b/content/versions/2.0.0-M1/guides/rgcms/rgcms.pdf
@@ -4,16 +4,16 @@
<< /Title (Classes, Methods and Schema)
/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:20180812182434+01'00')
-/ModDate (D:20180812182434+01'00')
+/CreationDate (D:20180814003812+02'00')
+/ModDate (D:20180814003812+02'00')
>>
endobj
2 0 obj
<< /Type /Catalog
/Pages 3 0 R
/Names 14 0 R
-/Outlines 1050 0 R
-/PageLabels 1079 0 R
+/Outlines 1032 0 R
+/PageLabels 1061 0 R
/PageMode /UseOutlines
/OpenAction [7 0 R /FitH 842.89]
/ViewerPreferences << /DisplayDocTitle true
@@ -22,8 +22,8 @@ endobj
endobj
3 0 obj
<< /Type /Pages
-/Count 98
-/Kids [7 0 R 10 0 R 12 0 R 39 0 R 62 0 R 127 0 R 150 0 R 155 0 R 163 0 R 168 0 R 172 0 R 177 0 R 187 0 R 191 0 R 194 0 R 204 0 R 209 0 R 216 0 R 223 0 R 240 0 R 243 0 R 247 0 R 260 0 R 291 0 R 299 0 R 308 0 R 311 0 R 327 0 R 339 0 R 347 0 R 356 0 R 374 0 R 402 0 R 420 0 R 423 0 R 433 0 R 441 0 R 450 0 R 456 0 R 462 0 R 465 0 R 474 0 R 507 0 R 526 0 R 547 0 R 558 0 R 568 0 R 570 0 R 576 0 R 583 0 R 589 0 R 598 0 R 605 0 R 615 0 R 625 0 R 641 0 R 658 0 R 672 0 R 688 0 R 705 0 R 715 0 R 718 0 R 722 0 R 728 0 R 733 0 R 736 0 R 743 0 R 751 0 R 757 0 R 765 0 R 773 0 R 781 0 R 795 0 R 808 0 R 828 0 R 837 0 R 850 0 R 870 0 R 875 0 R 885 0 R 894 0 R 897 0 R 908 0 R 911 0 R 916 0 R 920 0 R 927 0 R 933 0 R 942 0 R 947 0 R 953 0 R 958 0 R 964 0 R 972 0 R 978 0 R 985 0 R 987 0 R 992 0 R]
+/Count 95
+/Kids [7 0 R 10 0 R 12 0 R 39 0 R 62 0 R 127 0 R 150 0 R 155 0 R 163 0 R 168 0 R 172 0 R 177 0 R 190 0 R 194 0 R 197 0 R 210 0 R 215 0 R 222 0 R 229 0 R 246 0 R 249 0 R 253 0 R 266 0 R 297 0 R 305 0 R 314 0 R 322 0 R 333 0 R 345 0 R 353 0 R 362 0 R 393 0 R 421 0 R 430 0 R 440 0 R 448 0 R 457 0 R 463 0 R 469 0 R 472 0 R 483 0 R 513 0 R 530 0 R 541 0 R 551 0 R 553 0 R 559 0 R 567 0 R 573 0 R 582 0 R 589 0 R 599 0 R 609 0 R 624 0 R 644 0 R 651 0 R 666 0 R 690 0 R 698 0 R 701 0 R 707 0 R 714 0 R 717 0 R 724 0 R 727 0 R 737 0 R 744 0 R 753 0 R 763 0 R 773 0 R 785 0 R 804 0 R 814 0 R 828 0 R 847 0 R 853 0 R 862 0 R 874 0 R 879 0 R 890 0 R 893 0 R 898 0 R 902 0 R 909 0 R 915 0 R 924 0 R 929 0 R 935 0 R 940 0 R 946 0 R 954 0 R 960 0 R 967 0 R 969 0 R 974 0 R]
>>
endobj
4 0 obj
@@ -80,11 +80,11 @@ endobj
<< /Type /Font
/BaseFont /AAAABM+NotoSerif
/Subtype /TrueType
-/FontDescriptor 1081 0 R
+/FontDescriptor 1063 0 R
/FirstChar 32
/LastChar 255
-/Widths 1083 0 R
-/ToUnicode 1082 0 R
+/Widths 1065 0 R
+/ToUnicode 1064 0 R
>>
endobj
9 0 obj
@@ -380,7 +380,7 @@ ET
BT
535.3009999999999 640.9759999999999 Td
/F1.0 10.5 Tf
-<3333> Tj
+<3332> Tj
ET
0.000 0.000 0.000 SCN
@@ -442,7 +442,7 @@ ET
BT
535.3009999999999 622.4959999999999 Td
/F1.0 10.5 Tf
-<3333> Tj
+<3332> Tj
ET
0.000 0.000 0.000 SCN
@@ -482,7 +482,7 @@ ET
BT
535.3009999999999 604.0159999999998 Td
/F1.0 10.5 Tf
-<3339> Tj
+<3338> Tj
ET
0.000 0.000 0.000 SCN
@@ -522,7 +522,7 @@ ET
BT
535.3009999999999 585.5359999999998 Td
/F1.0 10.5 Tf
-<3432> Tj
+<3430> Tj
ET
0.000 0.000 0.000 SCN
@@ -562,7 +562,7 @@ ET
BT
535.3009999999999 567.0559999999998 Td
/F1.0 10.5 Tf
-<3439> Tj
+<3437> Tj
ET
0.000 0.000 0.000 SCN
@@ -602,7 +602,7 @@ ET
BT
535.3009999999999 548.5759999999998 Td
/F1.0 10.5 Tf
-<3533> Tj
+<3531> Tj
ET
0.000 0.000 0.000 SCN
@@ -642,7 +642,7 @@ ET
BT
535.3009999999999 530.0959999999998 Td
/F1.0 10.5 Tf
-<3538> Tj
+<3536> Tj
ET
0.000 0.000 0.000 SCN
@@ -682,7 +682,7 @@ ET
BT
535.3009999999999 511.6159999999998 Td
/F1.0 10.5 Tf
-<3632> Tj
+<3539> Tj
ET
0.000 0.000 0.000 SCN
@@ -722,7 +722,7 @@ ET
BT
535.3009999999999 493.1359999999998 Td
/F1.0 10.5 Tf
-<3635> Tj
+<3633> Tj
ET
0.000 0.000 0.000 SCN
@@ -762,7 +762,7 @@ ET
BT
535.3009999999999 474.6559999999998 Td
/F1.0 10.5 Tf
-<3637> Tj
+<3635> Tj
ET
0.000 0.000 0.000 SCN
@@ -802,7 +802,7 @@ ET
BT
535.3009999999999 456.17599999999976 Td
/F1.0 10.5 Tf
-<3638> Tj
+<3635> Tj
ET
0.000 0.000 0.000 SCN
@@ -842,7 +842,7 @@ ET
BT
535.3009999999999 437.69599999999974 Td
/F1.0 10.5 Tf
-<3639> Tj
+<3636> Tj
ET
0.000 0.000 0.000 SCN
@@ -882,7 +882,7 @@ ET
BT
535.3009999999999 419.2159999999997 Td
/F1.0 10.5 Tf
-<3730> Tj
+<3638> Tj
ET
0.000 0.000 0.000 SCN
@@ -922,7 +922,7 @@ ET
BT
535.3009999999999 400.7359999999997 Td
/F1.0 10.5 Tf
-<3734> Tj
+<3732> Tj
ET
0.000 0.000 0.000 SCN
@@ -962,7 +962,7 @@ ET
BT
535.3009999999999 382.2559999999997 Td
/F1.0 10.5 Tf
-<3737> Tj
+<3734> Tj
ET
0.000 0.000 0.000 SCN
@@ -1002,7 +1002,7 @@ ET
BT
535.3009999999999 363.77599999999967 Td
/F1.0 10.5 Tf
-<3830> Tj
+<3737> Tj
ET
0.000 0.000 0.000 SCN
@@ -1042,7 +1042,7 @@ ET
BT
535.3009999999999 345.29599999999965 Td
/F1.0 10.5 Tf
-<3830> Tj
+<3737> Tj
ET
0.000 0.000 0.000 SCN
@@ -1082,7 +1082,7 @@ ET
BT
535.3009999999999 326.81599999999963 Td
/F1.0 10.5 Tf
-<3834> Tj
+<3831> Tj
ET
0.000 0.000 0.000 SCN
@@ -1122,7 +1122,7 @@ ET
BT
535.3009999999999 308.3359999999996 Td
/F1.0 10.5 Tf
-<3838> Tj
+<3835> Tj
ET
0.000 0.000 0.000 SCN
@@ -1162,7 +1162,7 @@ ET
BT
535.3009999999999 289.8559999999996 Td
/F1.0 10.5 Tf
-<3931> Tj
+<3838> Tj
ET
0.000 0.000 0.000 SCN
@@ -1182,7 +1182,7 @@ endobj
/F3.0 18 0 R
>>
>>
-/Annots [995 0 R 996 0 R 997 0 R 998 0 R 999 0 R 1000 0 R 1001 0 R 1002 0 R 1003 0 R 1004 0 R 1005 0 R 1006 0 R 1007 0 R 1008 0 R 1009 0 R 1010 0 R 1011 0 R 1012 0 R 1013 0 R 1014 0 R 1015 0 R 1016 0 R 1017 0 R 1018 0 R 1019 0 R 1020 0 R 1021 0 R 1022 0 R 1023 0 R 1024 0 R 1025 0 R 1026 0 R 1027 0 R 1028 0 R 1029 0 R 1030 0 R 1031 0 R 1032 0 R 1033 0 R 1034 0 R 1035 0 R 1036 0 R 1037 0 R 1038 0 R 1039 0 R 1040 0 R 1041 0 R 1042 0 R 1043 0 R 1044 0 R 1045 0 R 1046 0 R 1047 0 R 1048 0 R]
+/Annots [977 0 R 978 0 R 979 0 R 980 0 R 981 0 R 982 0 R 983 0 R 984 0 R 985 0 R 986 0 R 987 0 R 988 0 R 989 0 R 990 0 R 991 0 R 992 0 R 993 0 R 994 0 R 995 0 R 996 0 R 997 0 R 998 0 R 999 0 R 1000 0 R 1001 0 R 1002 0 R 1003 0 R 1004 0 R 1005 0 R 1006 0 R 1007 0 R 1008 0 R 1009 0 R 1010 0 R 1011 0 R 1012 0 R 1013 0 R 1014 0 R 1015 0 R 1016 0 R 1017 0 R 1018 0 R 1019 0 R 1020 0 R 1021 0 R 1022 0 R 1023 0 R 1024 0 R 1025 0 R 1026 0 R 1027 0 R 1028 0 R 1029 0 R 1030 0 R]
>>
endobj
11 0 obj
@@ -1989,7 +1989,7 @@ endobj
/F3.0 18 0 R
/F4.0 19 0 R
>>
-/XObject << /Stamp1 1049 0 R
+/XObject << /Stamp1 1031 0 R
>>
>>
/Annots [17 0 R 20 0 R 21 0 R 23 0 R 24 0 R 25 0 R 26 0 R 27 0 R 28 0 R 29 0 R 30 0 R 31 0 R 32 0 R 33 0 R 34 0 R 35 0 R 36 0 R 37 0 R]
@@ -2004,18 +2004,18 @@ endobj
>>
endobj
15 0 obj
-<< /Kids [220 0 R 467 0 R 949 0 R 840 0 R 701 0 R 824 0 R 541 0 R 731 0 R 425 0 R 221 0 R 967 0 R 287 0 R 753 0 R]
+<< /Kids [226 0 R 474 0 R 931 0 R 821 0 R 731 0 R 868 0 R 564 0 R 712 0 R 432 0 R 227 0 R 949 0 R 293 0 R 735 0 R]
>>
endobj
16 0 obj
<< /Type /Font
/BaseFont /AAAABN+NotoSerif-Bold
/Subtype /TrueType
-/FontDescriptor 1085 0 R
+/FontDescriptor 1067 0 R
/FirstChar 32
/LastChar 255
-/Widths 1087 0 R
-/ToUnicode 1086 0 R
+/Widths 1069 0 R
+/ToUnicode 1068 0 R
>>
endobj
17 0 obj
@@ -2033,22 +2033,22 @@ endobj
<< /Type /Font
/BaseFont /AAAABO+mplus1mn-regular
/Subtype /TrueType
-/FontDescriptor 1089 0 R
+/FontDescriptor 1071 0 R
/FirstChar 32
/LastChar 255
-/Widths 1091 0 R
-/ToUnicode 1090 0 R
+/Widths 1073 0 R
+/ToUnicode 1072 0 R
>>
endobj
19 0 obj
<< /Type /Font
/BaseFont /AAAABP+mplus-1p-regular
/Subtype /TrueType
-/FontDescriptor 1093 0 R
+/FontDescriptor 1075 0 R
/FirstChar 32
/LastChar 255
-/Widths 1095 0 R
-/ToUnicode 1094 0 R
+/Widths 1077 0 R
+/ToUnicode 1076 0 R
>>
endobj
20 0 obj
@@ -3790,7 +3790,7 @@ endobj
/F6.0 44 0 R
/F4.0 19 0 R
>>
-/XObject << /Stamp1 1049 0 R
+/XObject << /Stamp1 1031 0 R
>>
>>
/Annots [41 0 R 45 0 R 46 0 R 47 0 R 48 0 R 49 0 R 50 0 R 51 0 R 52 0 R 53 0 R 54 0 R 55 0 R 56 0 R 57 0 R 58 0 R 59 0 R 60 0 R]
@@ -3817,22 +3817,22 @@ endobj
<< /Type /Font
/BaseFont /AAAABQ+FontAwesome
/Subtype /TrueType
-/FontDescriptor 1097 0 R
+/FontDescriptor 1079 0 R
/FirstChar 32
/LastChar 255
-/Widths 1099 0 R
-/ToUnicode 1098 0 R
+/Widths 1081 0 R
+/ToUnicode 1080 0 R
>>
endobj
44 0 obj
<< /Type /Font
/BaseFont /AAAABR+NotoSerif-Italic
/Subtype /TrueType
-/FontDescriptor 1101 0 R
+/FontDescriptor 1083 0 R
/FirstChar 32
/LastChar 255
-/Widths 1103 0 R
-/ToUnicode 1102 0 R
+/Widths 1085 0 R
+/ToUnicode 1084 0 R
>>
endobj
45 0 obj
@@ -8015,7 +8015,7 @@ endobj
/F4.0 19 0 R
/F1.0 8 0 R
>>
-/XObject << /Stamp1 1049 0 R
+/XObject << /Stamp1 1031 0 R
>>
>>
/Annots [63 0 R 64 0 R 65 0 R 66 0 R 67 0 R 68 0 R 69 0 R 70 0 R 71 0 R 72 0 R 73 0 R 74 0 R 75 0 R 76 0 R 77 0 R 78 0 R 79 0 R 80 0 R 81 0 R 82 0 R 83 0 R 84 0 R 85 0 R 86 0 R 87 0 R 88 0 R 89 0 R 90 0 R 91 0 R 92 0 R 93 0 R 94 0 R 95 0 R 96 0 R 97 0 R 98 0 R 99 0 R 100 0 R 101 0 R 102 0 R 103 0 R 104 0 R 105 0 R 106 0 R 107 0 R 108 0 R 109 0 R 110 0 R 111 0 R 112 0 R 113 0 R 114 0 R 115 0 R 116 0 R 117 0 R 118 0 R 119 0 R 120 0 R 121 0 R 122 0 R 123 0 R 124 0 R 125 0 R]
@@ -11463,7 +11463,7 @@ endobj
/F5.1 43 0 R
/F3.1 141 0 R
>>
-/XObject << /Stamp1 1049 0 R
+/XObject << /Stamp1 1031 0 R
>>
>>
/Annots [128 0 R 129 0 R 130 0 R 131 0 R 132 0 R 133 0 R 134 0 R 135 0 R 136 0 R 137 0 R 138 0 R 140 0 R 142 0 R 143 0 R 144 0 R 146 0 R 147 0 R 148 0 R]
@@ -11608,11 +11608,11 @@ endobj
<< /Type /Font
/BaseFont /AAAABS+mplus1mn-regular
/Subtype /TrueType
-/FontDescriptor 1105 0 R
+/FontDescriptor 1087 0 R
/FirstChar 32
/LastChar 255
-/Widths 1107 0 R
-/ToUnicode 1106 0 R
+/Widths 1089 0 R
+/ToUnicode 1088 0 R
>>
endobj
142 0 obj
@@ -14702,7 +14702,7 @@ endobj
/F3.0 18 0 R
/F3.1 141 0 R
>>
-/XObject << /Stamp1 1049 0 R
+/XObject << /Stamp1 1031 0 R
>>
>>
/Annots [152 0 R]
@@ -16271,7 +16271,7 @@ endobj
/F4.0 19 0 R
/F6.0 44 0 R
>>
-/XObject << /Stamp1 1049 0 R
+/XObject << /Stamp1 1031 0 R
>>
>>
/Annots [156 0 R 158 0 R 159 0 R 160 0 R]
@@ -18602,7 +18602,7 @@ endobj
/F2.0 16 0 R
/F1.0 8 0 R
>>
-/XObject << /Stamp1 1049 0 R
+/XObject << /Stamp1 1031 0 R
>>
>>
/Annots [165 0 R]
@@ -20762,7 +20762,7 @@ endobj
/Contents 167 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/XObject << /I1 166 0 R
-/Stamp1 1049 0 R
+/Stamp1 1031 0 R
>>
/Font << /F1.0 8 0 R
/F3.0 18 0 R
@@ -23299,7 +23299,7 @@ endobj
/F4.0 19 0 R
/F1.1 175 0 R
>>
-/XObject << /Stamp1 1049 0 R
+/XObject << /Stamp1 1031 0 R
>>
>>
>>
@@ -23314,15 +23314,15 @@ endobj
<< /Type /Font
/BaseFont /AAAABT+NotoSerif
/Subtype /TrueType
-/FontDescriptor 1109 0 R
+/FontDescriptor 1091 0 R
/FirstChar 32
/LastChar 255
-/Widths 1111 0 R
-/ToUnicode 1110 0 R
+/Widths 1093 0 R
+/ToUnicode 1092 0 R
>>
endobj
176 0 obj
-<< /Length 29971
+<< /Length 30896
>>
stream
q
@@ -24890,12 +24890,12 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-1.757 Tw
+2.006 Tw
BT
48.24000000000001 398.04600000000016 Td
/F1.0 10.5 Tf
-[<76616c75652e202054686973206d61> 20.01953125 <7920626520736f6d652073656e7369626c652064656661756c742028656720746f6461> 20.01953125 <79d57320646174652c206f722030206f722031292c206f72>] TJ
+[<76616c75652e2054686973206d61> 20.01953125 <7920626520736f6d652073656e7369626c652064656661756c742028656720746f6461> 20.01953125 <79d57320646174652c206f722030206f722031292c206f72>] TJ
/F1.1 10.5 Tf
<21> Tj
/F1.0 10.5 Tf
@@ -24977,12 +24977,72 @@ ET
0.694 0.129 0.275 scn
0.694 0.129 0.275 SCN
-0.264 Tw
+0.862 Tw
BT
48.24000000000001 338.70600000000013 Td
/F3.0 10.5 Tf
-<446f6d61696e4f626a656374436f6e7461696e6572236e65775472616e7369656e74496e7374616e636528> Tj
+<5265706f7369746f72795365727669636523696e7374616e746961746528> 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
+
+0.862 Tw
+
+BT
+205.74 338.70600000000013 Td
+/F4.0 10.5 Tf
+<c9> 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
+
+0.862 Tw
+
+BT
+216.24 338.70600000000013 Td
+/F3.0 10.5 Tf
+<29> 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
+
+0.862 Tw
+
+BT
+221.49 338.70600000000013 Td
+/F1.0 10.5 Tf
+<206f7220> 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
+
+0.862 Tw
+
+BT
+239.657 338.70600000000013 Td
+/F3.0 10.5 Tf
+<466163746f72795365727669636523696e7374616e746961746528> Tj
ET
@@ -24992,10 +25052,10 @@ ET
0.694 0.129 0.275 scn
0.694 0.129 0.275 SCN
-0.264 Tw
+0.862 Tw
BT
-273.99 338.70600000000013 Td
+381.40700000000004 338.70600000000013 Td
/F4.0 10.5 Tf
<c9> Tj
ET
@@ -25007,10 +25067,10 @@ ET
0.694 0.129 0.275 scn
0.694 0.129 0.275 SCN
-0.264 Tw
+0.862 Tw
BT
-284.49 338.70600000000013 Td
+391.90700000000004 338.70600000000013 Td
/F3.0 10.5 Tf
<29> Tj
ET
@@ -25022,12 +25082,12 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-0.264 Tw
+0.862 Tw
BT
-289.74 338.70600000000013 Td
+397.15700000000004 338.70600000000013 Td
/F1.0 10.5 Tf
-<2e2020546869732069732061206d756368206c65737320636f6d6d6f6e2075736520636173652e2020496620612064656661756c74> Tj
+<2e20546869732069732061206d756368206c65737320636f6d6d6f6e> Tj
ET
@@ -25037,10 +25097,25 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
+0.559 Tw
+
BT
48.24000000000001 322.92600000000016 Td
/F1.0 10.5 Tf
-<6973206e6f7420737065636966696564207468656e2070726f706572746965732061726520696e697469616c697a656420746f20612064656661756c74206261736564206f6e2074686569722074797065202865672030206f7220> Tj
+<75736520636173652e20496620612064656661756c74206973206e6f7420737065636966696564207468656e2070726f706572746965732061726520696e697469616c697a656420746f20612064656661756c74206261736564206f6e2074686569722074797065> 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
+
+BT
+48.24000000000001 307.1460000000002 Td
+/F1.0 10.5 Tf
+<2865672030206f7220> Tj
ET
0.000 0.000 0.000 SCN
@@ -25049,7 +25124,7 @@ ET
0.694 0.129 0.275 SCN
BT
-475.9155 322.92600000000016 Td
+88.17150000000001 307.1460000000002 Td
/F3.0 10.5 Tf
<66616c7365> Tj
ET
@@ -25060,7 +25135,7 @@ ET
0.200 0.200 0.200 SCN
BT
-502.1655 322.92600000000016 Td
+114.42150000000001 307.1460000000002 Td
/F1.0 10.5 Tf
<292e> Tj
ET
@@ -25073,7 +25148,7 @@ ET
1.865 Tw
BT
-48.24000000000001 295.14600000000013 Td
+48.24000000000001 279.36600000000016 Td
/F1.0 10.5 Tf
[<546865207369676e6174757265206f662074686520737570706f7274696e67206d6574686f6420646570656e6473206f6e207768657468657220697420697320666f7220616e20616374696f6e20706172> 20.01953125 <616d65746572206f722061>] TJ
ET
@@ -25086,7 +25161,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24000000000001 279.3660000000001 Td
+48.24000000000001 263.5860000000001 Td
/F1.0 10.5 Tf
[<70726f7065727479> 89.84375 <2e>] TJ
ET
@@ -25097,7 +25172,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24000000000001 247.53600000000012 Td
+48.24000000000001 231.75600000000014 Td
/F2.0 10.5 Tf
[<506172> 20.01953125 <616d6574657273>] TJ
ET
@@ -25108,7 +25183,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24000000000001 221.7060000000001 Td
+48.24000000000001 205.92600000000013 Td
/F1.0 10.5 Tf
[<46> 40.0390625 <6f7220616e20616374696f6e20706172> 20.01953125 <616d6574657220696e2028302d626173656420706f736974696f6e206e292c20616e64206f66207479706520>] TJ
ET
@@ -25119,7 +25194,7 @@ ET
0.694 0.129 0.275 SCN
BT
-347.510384765625 221.7060000000001 Td
+347.510384765625 205.92600000000013 Td
/F3.0 10.5 Tf
<54> Tj
ET
@@ -25130,7 +25205,7 @@ ET
0.200 0.200 0.200 SCN
BT
-352.760384765625 221.7060000000001 Td
+352.760384765625 205.92600000000013 Td
/F1.0 10.5 Tf
<2c20746865207369676e61747572652069733a> Tj
ET
@@ -25139,28 +25214,28 @@ ET
0.000 0.000 0.000 scn
q
0.961 0.961 0.961 scn
-52.240 205.890 m
-543.040 205.890 l
-545.249 205.890 547.040 204.099 547.040 201.890 c
-547.040 173.150 l
-547.040 170.941 545.249 169.150 543.040 169.150 c
-52.240 169.150 l
-50.031 169.150 48.240 170.941 48.240 173.150 c
-48.240 201.890 l
-48.240 204.099 50.031 205.890 52.240 205.890 c
+52.240 190.110 m
+543.040 190.110 l
+545.249 190.110 547.040 188.319 547.040 186.110 c
+547.040 157.370 l
+547.040 155.161 545.249 153.370 543.040 153.370 c
+52.240 153.370 l
+50.031 153.370 48.240 155.161 48.240 157.370 c
+48.240 186.110 l
+48.240 188.319 50.031 190.110 52.240 190.110 c
h
f
0.800 0.800 0.800 SCN
0.75 w
-52.240 205.890 m
-543.040 205.890 l
-545.249 205.890 547.040 204.099 547.040 201.890 c
-547.040 173.150 l
-547.040 170.941 545.249 169.150 543.040 169.150 c
-52.240 169.150 l
-50.031 169.150 48.240 170.941 48.240 173.150 c
-48.240 201.890 l
-48.240 204.099 50.031 205.890 52.240 205.890 c
+52.240 190.110 m
+543.040 190.110 l
+545.249 190.110 547.040 188.319 547.040 186.110 c
+547.040 157.370 l
+547.040 155.161 545.249 153.370 543.040 153.370 c
+52.240 153.370 l
+50.031 153.370 48.240 155.161 48.240 157.370 c
+48.240 186.110 l
+48.240 188.319 50.031 190.110 52.240 190.110 c
h
S
Q
@@ -25168,7 +25243,7 @@ Q
0.000 0.400 0.600 SCN
BT
-59.24000000000001 183.06500000000008 Td
+59.24000000000001 167.28500000000014 Td
/F3.0 11 Tf
<7075626c6963> Tj
ET
@@ -25179,7 +25254,7 @@ ET
0.200 0.200 0.200 SCN
BT
-92.24000000000001 183.06500000000008 Td
+92.24000000000001 167.28500000000014 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -25190,7 +25265,7 @@ ET
0.200 0.200 0.200 SCN
BT
-97.74000000000001 183.06500000000008 Td
+97.74000000000001 167.28500000000014 Td
/F3.0 11 Tf
<54> Tj
ET
@@ -25201,7 +25276,7 @@ ET
0.200 0.200 0.200 SCN
BT
-103.24000000000001 183.06500000000008 Td
+103.24000000000001 167.28500000000014 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -25212,7 +25287,7 @@ ET
0.200 0.200 0.200 SCN
BT
-108.74000000000001 183.06500000000008 Td
+108.74000000000001 167.28500000000014 Td
/F3.0 11 Tf
<64656661756c744e587878> Tj
ET
@@ -25223,7 +25298,7 @@ ET
0.200 0.200 0.200 SCN
BT
-169.24 183.06500000000008 Td
+169.24 167.28500000000014 Td
/F3.0 11 Tf
<28> Tj
ET
@@ -25234,7 +25309,7 @@ ET
0.200 0.200 0.200 SCN
BT
-174.74 183.06500000000008 Td
+174.74 167.28500000000014 Td
/F3.0 11 Tf
<29> Tj
ET
@@ -25245,7 +25320,7 @@ ET
0.200 0.200 0.200 SCN
BT
-180.24 183.06500000000008 Td
+180.24 167.28500000000014 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -25256,7 +25331,7 @@ ET
0.200 0.200 0.200 SCN
BT
-185.74 183.06500000000008 Td
+185.74 167.28500000000014 Td
/F3.0 11 Tf
<7b> Tj
ET
@@ -25267,7 +25342,7 @@ ET
0.200 0.200 0.200 SCN
BT
-191.24 183.06500000000008 Td
+191.24 167.28500000000014 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -25278,7 +25353,7 @@ ET
0.200 0.200 0.200 SCN
BT
-196.74 183.06500000000008 Td
+196.74 167.28500000000014 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -25289,7 +25364,7 @@ ET
0.200 0.200 0.200 SCN
BT
-202.24 183.06500000000008 Td
+202.24 167.28500000000014 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -25300,7 +25375,7 @@ ET
0.200 0.200 0.200 SCN
BT
-207.74 183.06500000000008 Td
+207.74 167.28500000000014 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -25311,7 +25386,7 @@ ET
0.200 0.200 0.200 SCN
BT
-213.24 183.06500000000008 Td
+213.24 167.28500000000014 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -25322,7 +25397,7 @@ ET
0.200 0.200 0.200 SCN
BT
-218.74 183.06500000000008 Td
+218.74 167.28500000000014 Td
/F3.0 11 Tf
<7d> Tj
ET
@@ -25333,7 +25408,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24000000000001 145.1860000000001 Td
+48.24000000000001 129.40600000000012 Td
/F1.0 10.5 Tf
[<46> 40.0390625 <6f72206578616d706c653a>] TJ
ET
@@ -25379,10 +25454,10 @@ endobj
/F1.1 175 0 R
/F6.0 44 0 R
>>
-/XObject << /Stamp1 1049 0 R
+/XObject << /Stamp1 1031 0 R
>>
>>
-/Annots [178 0 R 179 0 R 180 0 R 182 0 R 183 0 R 184 0 R]
+/Annots [178 0 R 179 0 R 180 0 R 182 0 R 183 0 R 184 0 R 185 0 R 186 0 R 187 0 R]
>>
endobj
178 0 obj
@@ -25425,10 +25500,10 @@ endobj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
-/URI (../rgsvc/rgsvc.pdf#_rgsvc_core-domain-api_DomainObjectContainer)
+/URI (../rgsvc/rgsvc.pdf#_rgsvc_core-domain-api_RepositoryService)
>>
/Subtype /Link
-/Rect [48.24000000000001 337.2360000000001 273.99 347.7360000000001]
+/Rect [48.24000000000001 337.2360000000001 205.74 347.7360000000001]
/Type /Annot
>>
endobj
@@ -25436,10 +25511,10 @@ endobj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
-/URI (../rgsvc/rgsvc.pdf#_rgsvc_core-domain-api_DomainObjectContainer)
+/URI (../rgsvc/rgsvc.pdf#_rgsvc_core-domain-api_RepositoryService)
>>
/Subtype /Link
-/Rect [273.99 337.2360000000001 284.49 347.7360000000001]
+/Rect [205.74 337.2360000000001 216.24 347.7360000000001]
/Type /Annot
>>
endobj
@@ -25447,18 +25522,51 @@ endobj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
-/URI (../rgsvc/rgsvc.pdf#_rgsvc_core-domain-api_DomainObjectContainer)
+/URI (../rgsvc/rgsvc.pdf#_rgsvc_core-domain-api_RepositoryService)
>>
/Subtype /Link
-/Rect [284.49 337.2360000000001 289.74 347.7360000000001]
+/Rect [216.24 337.2360000000001 221.49 347.7360000000001]
/Type /Annot
>>
endobj
185 0 obj
-[177 0 R /XYZ 0 263.5500000000001 null]
+<< /Border [0 0 0]
+/A << /Type /Action
+/S /URI
+/URI (../rgsvc/rgsvc.pdf#_rgsvc_core-domain-api_FactoryService)
+>>
+/Subtype /Link
+/Rect [239.657 337.2360000000001 381.40700000000004 347.7360000000001]
+/Type /Annot
+>>
endobj
186 0 obj
-<< /Length 32310
+<< /Border [0 0 0]
+/A << /Type /Action
+/S /URI
+/URI (../rgsvc/rgsvc.pdf#_rgsvc_core-domain-api_FactoryService)
+>>
+/Subtype /Link
+/Rect [381.40700000000004 337.2360000000001 391.90700000000004 347.7360000000001]
+/Type /Annot
+>>
+endobj
+187 0 obj
+<< /Border [0 0 0]
+/A << /Type /Action
+/S /URI
+/URI (../rgsvc/rgsvc.pdf#_rgsvc_core-domain-api_FactoryService)
+>>
+/Subtype /Link
+/Rect [391.90700000000004 337.2360000000001 397.15700000000004 347.7360000000001]
+/Type /Annot
+>>
+endobj
+188 0 obj
+[177 0 R /XYZ 0 247.77000000000015 null]
+endobj
+189 0 obj
+<< /Length 32306
>>
stream
q
@@ -27729,7 +27837,7 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-0.597 Tw
+0.834 Tw
BT
48.239999999999995 347.86599999999993 Td
@@ -27744,10 +27852,10 @@ ET
0.259 0.545 0.792 scn
0.259 0.545 0.792 SCN
-0.597 Tw
+0.834 Tw
BT
-265.5162247395833 347.86599999999993 Td
+267.174455078125 347.86599999999993 Td
/F1.0 10.5 Tf
<636f6e747269627574656420616374696f6e73> Tj
ET
@@ -27759,12 +27867,12 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-0.597 Tw
+0.834 Tw
BT
-363.34318541666664 347.86599999999993 Td
+365.2383058035714 347.86599999999993 Td
/F1.0 10.5 Tf
-[<2e202046> 40.0390625 <6f72206578616d706c652c2068657265206973206120636f6e7472696275746564>] TJ
+[<2e2046> 40.0390625 <6f72206578616d706c652c2068657265206973206120636f6e7472696275746564>] TJ
ET
@@ -27828,34 +27936,34 @@ Q
endstream
endobj
-187 0 obj
+190 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 186 0 R
+/Contents 189 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/Font << /F3.0 18 0 R
/F3.1 141 0 R
/F1.0 8 0 R
>>
-/XObject << /Stamp1 1049 0 R
+/XObject << /Stamp1 1031 0 R
>>
>>
-/Annots [188 0 R 189 0 R]
+/Annots [191 0 R 192 0 R]
>>
endobj
-188 0 obj
+191 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
/URI (../ugfun/ugfun.pdf#_ugfun_how-tos_contributed-members)
>>
/Subtype /Link
-/Rect [265.5162247395833 344.79999999999995 363.34318541666664 359.0799999999999]
+/Rect [267.174455078125 344.79999999999995 365.2383058035714 359.0799999999999]
/Type /Annot
>>
endobj
-189 0 obj
+192 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -27866,7 +27974,7 @@ endobj
/Type /Annot
>>
endobj
-190 0 obj
+193 0 obj
<< /Length 44651
>>
stream
@@ -31071,27 +31179,27 @@ Q
endstream
endobj
-191 0 obj
+194 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 190 0 R
+/Contents 193 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/Font << /F3.0 18 0 R
/F3.1 141 0 R
/F1.0 8 0 R
/F2.0 16 0 R
>>
-/XObject << /Stamp1 1049 0 R
+/XObject << /Stamp1 1031 0 R
>>
>>
>>
endobj
-192 0 obj
-[191 0 R /XYZ 0 352.78999999999996 null]
+195 0 obj
+[194 0 R /XYZ 0 352.78999999999996 null]
endobj
-193 0 obj
-<< /Length 16286
+196 0 obj
+<< /Length 16986
>>
stream
q
@@ -31167,12 +31275,12 @@ ET
0.694 0.129 0.275 scn
0.694 0.129 0.275 SCN
-5.867 Tw
+4.291 Tw
BT
48.24 727.326 Td
/F3.0 10.5 Tf
-<446f6d61696e4f626a656374436f6e7461696e6572236e65775472616e7369656e74496e7374616e636528> Tj
+<5265706f7369746f72795365727669636523696e7374616e746961746528> Tj
ET
@@ -31182,10 +31290,10 @@ ET
0.694 0.129 0.275 scn
0.694 0.129 0.275 SCN
-5.867 Tw
+4.291 Tw
BT
-273.99 727.326 Td
+205.74 727.326 Td
/F4.0 10.5 Tf
<c9> Tj
ET
@@ -31197,10 +31305,10 @@ ET
0.694 0.129 0.275 scn
0.694 0.129 0.275 SCN
-5.867 Tw
+4.291 Tw
BT
-284.49 727.326 Td
+216.24 727.326 Td
/F3.0 10.5 Tf
<29> Tj
ET
@@ -31212,12 +31320,72 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-5.867 Tw
+4.291 Tw
BT
-289.74 727.326 Td
+221.49 727.326 Td
/F1.0 10.5 Tf
-[<2069732063616c6c65642e202054686973206d6574686f642069732063616c6c656420616674657220616e> 20.01953125 <79>] TJ
+<206f7220> 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
+
+4.291 Tw
+
+BT
+246.5152857142857 727.326 Td
+/F3.0 10.5 Tf
+<466163746f72795365727669636523696e7374616e746961746528> 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
+
+4.291 Tw
+
+BT
+388.2652857142857 727.326 Td
+/F4.0 10.5 Tf
+<c9> 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
+
+4.291 Tw
+
+BT
+398.7652857142857 727.326 Td
+/F3.0 10.5 Tf
+<29> 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
+
+4.291 Tw
+
+BT
+404.0152857142857 727.326 Td
+/F1.0 10.5 Tf
+<2069732063616c6c65642e2054686973206d6574686f64206973> Tj
ET
@@ -31230,7 +31398,7 @@ ET
BT
48.24 711.546 Td
/F1.0 10.5 Tf
-<646570656e64656e636965732068617665206265656e20696e6a656374656420696e746f2074686520736572766963652e> Tj
+[<63616c6c656420616674657220616e> 20.01953125 <792073657276696365732068617665206265656e20696e6a656374656420696e746f2074686520646f6d61696e206f626a6563742e>] TJ
ET
0.000 0.000 0.000 SCN
@@ -31238,12 +31406,12 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-0.762 Tw
+1.052 Tw
BT
48.24 683.766 Td
/F1.0 10.5 Tf
-[<546865207365636f6e64206973206d6f726520737472> 20.01953125 <6169676874666f72776172643a2073696d706c7920696e697469616c697a652070726f7065727469657320696e2074686520636f6e7374727563746f722e2020486f77657665722c2074686973>] TJ
+[<546865207365636f6e64206973206d6f726520737472> 20.01953125 <6169676874666f72776172643a2073696d706c7920696e697469616c697a652070726f7065727469657320696e2074686520636f6e7374727563746f722e20486f77657665722c2074686973>] TJ
ET
@@ -32058,11 +32226,11 @@ Q
endstream
endobj
-194 0 obj
+197 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 193 0 R
+/Contents 196 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/Font << /F2.0 16 0 R
/F1.0 8 0 R
@@ -32070,16 +32238,16 @@ endobj
/F4.0 19 0 R
/F5.1 43 0 R
>>
-/XObject << /Stamp1 1049 0 R
+/XObject << /Stamp1 1031 0 R
>>
>>
-/Annots [196 0 R 197 0 R 198 0 R 199 0 R 201 0 R 202 0 R]
+/Annots [199 0 R 200 0 R 201 0 R 202 0 R 203 0 R 204 0 R 205 0 R 207 0 R 208 0 R]
>>
endobj
-195 0 obj
-[194 0 R /XYZ 0 841.89 null]
+198 0 obj
+[197 0 R /XYZ 0 841.89 null]
endobj
-196 0 obj
+199 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -32090,43 +32258,76 @@ endobj
/Type /Annot
>>
endobj
-197 0 obj
+200 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
-/URI (../rgsvc/rgsvc.pdf#_rgsvc_core-domain-api_DomainObjectContainer)
+/URI (../rgsvc/rgsvc.pdf#_rgsvc_core-domain-api_RepositoryService)
>>
/Subtype /Link
-/Rect [48.24 725.856 273.99 736.356]
+/Rect [48.24 725.856 205.74 736.356]
/Type /Annot
>>
endobj
-198 0 obj
+201 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
-/URI (../rgsvc/rgsvc.pdf#_rgsvc_core-domain-api_DomainObjectContainer)
+/URI (../rgsvc/rgsvc.pdf#_rgsvc_core-domain-api_RepositoryService)
>>
/Subtype /Link
-/Rect [273.99 725.856 284.49 736.356]
+/Rect [205.74 725.856 216.24 736.356]
/Type /Annot
>>
endobj
-199 0 obj
+202 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
-/URI (../rgsvc/rgsvc.pdf#_rgsvc_core-domain-api_DomainObjectContainer)
+/URI (../rgsvc/rgsvc.pdf#_rgsvc_core-domain-api_RepositoryService)
>>
/Subtype /Link
-/Rect [284.49 725.856 289.74 736.356]
+/Rect [216.24 725.856 221.49 736.356]
/Type /Annot
>>
endobj
-200 0 obj
-[194 0 R /XYZ 0 652.1700000000001 null]
+203 0 obj
+<< /Border [0 0 0]
+/A << /Type /Action
+/S /URI
+/URI (../rgsvc/rgsvc.pdf#_rgsvc_core-domain-api_FactoryService)
+>>
+/Subtype /Link
+/Rect [246.5152857142857 725.856 388.2652857142857 736.356]
+/Type /Annot
+>>
endobj
-201 0 obj
+204 0 obj
+<< /Border [0 0 0]
+/A << /Type /Action
+/S /URI
+/URI (../rgsvc/rgsvc.pdf#_rgsvc_core-domain-api_FactoryService)
+>>
+/Subtype /Link
+/Rect [388.2652857142857 725.856 398.7652857142857 736.356]
+/Type /Annot
+>>
+endobj
+205 0 obj
+<< /Border [0 0 0]
+/A << /Type /Action
+/S /URI
+/URI (../rgsvc/rgsvc.pdf#_rgsvc_core-domain-api_FactoryService)
+>>
+/Subtype /Link
+/Rect [398.7652857142857 725.856 404.0152857142857 736.356]
+/Type /Annot
+>>
+endobj
+206 0 obj
+[197 0 R /XYZ 0 652.1700000000001 null]
+endobj
+207 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -32137,7 +32338,7 @@ endobj
/Type /Annot
>>
endobj
-202 0 obj
+208 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -32148,7 +32349,7 @@ endobj
/Type /Annot
>>
endobj
-203 0 obj
+209 0 obj
<< /Length 34784
>>
stream
@@ -34642,11 +34843,11 @@ Q
endstream
endobj
-204 0 obj
+210 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 203 0 R
+/Contents 209 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/Font << /F3.0 18 0 R
/F1.0 8 0 R
@@ -34654,13 +34855,13 @@ endobj
/F2.0 16 0 R
/F4.0 19 0 R
>>
-/XObject << /Stamp1 1049 0 R
+/XObject << /Stamp1 1031 0 R
>>
>>
-/Annots [205 0 R 206 0 R]
+/Annots [211 0 R 212 0 R]
>>
endobj
-205 0 obj
+211 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -34671,7 +34872,7 @@ endobj
/Type /Annot
>>
endobj
-206 0 obj
+212 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -34682,10 +34883,10 @@ endobj
/Type /Annot
>>
endobj
-207 0 obj
-[204 0 R /XYZ 0 139.14999999999998 null]
+213 0 obj
+[210 0 R /XYZ 0 139.14999999999998 null]
endobj
-208 0 obj
+214 0 obj
<< /Length 25175
>>
stream
@@ -36359,11 +36560,11 @@ Q
endstream
endobj
-209 0 obj
+215 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 208 0 R
+/Contents 214 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/Font << /F1.0 8 0 R
/F3.0 18 0 R
@@ -36371,13 +36572,13 @@ endobj
/F4.0 19 0 R
/F2.0 16 0 R
>>
-/XObject << /Stamp1 1049 0 R
+/XObject << /Stamp1 1031 0 R
>>
>>
-/Annots [210 0 R 211 0 R 212 0 R 214 0 R]
+/Annots [216 0 R 217 0 R 218 0 R 220 0 R]
>>
endobj
-210 0 obj
+216 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -36388,7 +36589,7 @@ endobj
/Type /Annot
>>
endobj
-211 0 obj
+217 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -36399,7 +36600,7 @@ endobj
/Type /Annot
>>
endobj
-212 0 obj
+218 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -36410,10 +36611,10 @@ endobj
/Type /Annot
>>
endobj
-213 0 obj
-[209 0 R /XYZ 0 616.62 null]
+219 0 obj
+[215 0 R /XYZ 0 616.62 null]
endobj
-214 0 obj
+220 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -36424,7 +36625,7 @@ endobj
/Type /Annot
>>
endobj
-215 0 obj
+221 0 obj
<< /Length 39979
>>
stream
@@ -39235,11 +39436,11 @@ Q
endstream
endobj
-216 0 obj
+222 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 215 0 R
+/Contents 221 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/Font << /F3.0 18 0 R
/F5.1 43 0 R
@@ -39249,13 +39450,13 @@ endobj
/F1.1 175 0 R
/F3.1 141 0 R
>>
-/XObject << /Stamp1 1049 0 R
+/XObject << /Stamp1 1031 0 R
>>
>>
-/Annots [217 0 R 218 0 R]
+/Annots [223 0 R 224 0 R]
>>
endobj
-217 0 obj
+223 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -39266,7 +39467,7 @@ endobj
/Type /Annot
>>
endobj
-218 0 obj
+224 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -39277,20 +39478,20 @@ endobj
/Type /Annot
>>
endobj
-219 0 obj
-[216 0 R /XYZ 0 466.25 null]
+225 0 obj
+[222 0 R /XYZ 0 466.25 null]
endobj
-220 0 obj
+226 0 obj
<< /Limits [(__rgcms) (__rgcms_classes_AppManifest-bootstrapping_bootstrapping_AppManifestAbstract)]
-/Names [(__rgcms) 13 0 R (__rgcms_classes_AppManifest-bootstrapping_api) 431 0 R (__rgcms_classes_AppManifest-bootstrapping_api_getAdditionalServices) 439 0 R (__rgcms_classes_AppManifest-bootstrapping_api_getAuthenticationMechanism) 444 0 R (__rgcms_classes_AppManifest-bootstrapping_api_getAuthorizationMechanism) 446 0 R (__rgcms_classes_AppManifest-bootstrapping_api_getConfigurationProperties) 451 0 R (__rgcms_classes_AppManifest-bootstrapping_api_getFixtures) 448 0 R (__rgcms_classes_AppManifest-bootstrapping_api_getModules) 434 0 R (__rgcms_classes_AppManifest-bootstrapping_bootstrapping) 452 0 R (__rgcms_classes_AppManifest-bootstrapping_bootstrapping_AppManifestAbstract) 459 0 R]
+/Names [(__rgcms) 13 0 R (__rgcms_classes_AppManifest-bootstrapping_api) 438 0 R (__rgcms_classes_AppManifest-bootstrapping_api_getAdditionalServices) 446 0 R (__rgcms_classes_AppManifest-bootstrapping_api_getAuthenticationMechanism) 451 0 R (__rgcms_classes_AppManifest-bootstrapping_api_getAuthorizationMechanism) 453 0 R (__rgcms_classes_AppManifest-bootstrapping_api_getConfigurationProperties) 458 0 R (__rgcms_classes_AppManifest-bootstrapping_api_getFixtures) 455 0 R (__rgcms_classes_AppManifest-bootstrapping_api_getModules) 441 0 R (__rgcms_classes_AppManifest-bootstrapping_bootstrapping) 459 0 R (__rgcms_classes_AppManifest-bootstrapping_bootstrapping_AppManifestAbstract) 466 0 R]
>>
endobj
-221 0 obj
+227 0 obj
<< /Limits [(_rgcms_methods_prefixes_hide) (_rgcms_methods_reserved_disable)]
-/Names [(_rgcms_methods_prefixes_hide) 213 0 R (_rgcms_methods_prefixes_modify) 219 0 R (_rgcms_methods_prefixes_removeFrom) 227 0 R (_rgcms_methods_prefixes_set) 232 0 R (_rgcms_methods_prefixes_validate) 236 0 R (_rgcms_methods_prefixes_validateAddTo) 245 0 R (_rgcms_methods_prefixes_validateRemoveFrom) 256 0 R (_rgcms_methods_reserved) 267 0 R (_rgcms_methods_reserved_cssClass) 286 0 R (_rgcms_methods_reserved_disable) 300 0 R]
+/Names [(_rgcms_methods_prefixes_hide) 219 0 R (_rgcms_methods_prefixes_modify) 225 0 R (_rgcms_methods_prefixes_removeFrom) 233 0 R (_rgcms_methods_prefixes_set) 238 0 R (_rgcms_methods_prefixes_validate) 242 0 R (_rgcms_methods_prefixes_validateAddTo) 251 0 R (_rgcms_methods_prefixes_validateRemoveFrom) 262 0 R (_rgcms_methods_reserved) 273 0 R (_rgcms_methods_reserved_cssClass) 292 0 R (_rgcms_methods_reserved_disable) 306 0 R]
>>
endobj
-222 0 obj
+228 0 obj
<< /Length 31226
>>
stream
@@ -41430,11 +41631,11 @@ Q
endstream
endobj
-223 0 obj
+229 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 222 0 R
+/Contents 228 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/Font << /F3.1 141 0 R
/F1.0 8 0 R
@@ -41444,13 +41645,13 @@ endobj
/F5.1 43 0 R
/F6.0 44 0 R
>>
-/XObject << /Stamp1 1049 0 R
+/XObject << /Stamp1 1031 0 R
>>
>>
-/Annots [224 0 R 225 0 R 226 0 R 228 0 R 229 0 R 230 0 R 231 0 R 233 0 R 234 0 R 235 0 R 237 0 R]
+/Annots [230 0 R 231 0 R 232 0 R 234 0 R 235 0 R 236 0 R 237 0 R 239 0 R 240 0 R 241 0 R 243 0 R]
>>
endobj
-224 0 obj
+230 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -41461,7 +41662,7 @@ endobj
/Type /Annot
>>
endobj
-225 0 obj
+231 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -41472,7 +41673,7 @@ endobj
/Type /Annot
>>
endobj
-226 0 obj
+232 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -41483,10 +41684,10 @@ endobj
/Type /Annot
>>
endobj
-227 0 obj
-[223 0 R /XYZ 0 750.33 null]
+233 0 obj
+[229 0 R /XYZ 0 750.33 null]
endobj
-228 0 obj
+234 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -41497,7 +41698,7 @@ endobj
/Type /Annot
>>
endobj
-229 0 obj
+235 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -41508,7 +41709,7 @@ endobj
/Type /Annot
>>
endobj
-230 0 obj
+236 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -41519,7 +41720,7 @@ endobj
/Type /Annot
>>
endobj
-231 0 obj
+237 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -41530,10 +41731,10 @@ endobj
/Type /Annot
>>
endobj
-232 0 obj
-[223 0 R /XYZ 0 341.4100000000004 null]
+238 0 obj
+[229 0 R /XYZ 0 341.4100000000004 null]
endobj
-233 0 obj
+239 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -41544,7 +41745,7 @@ endobj
/Type /Annot
>>
endobj
-234 0 obj
+240 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -41555,7 +41756,7 @@ endobj
/Type /Annot
>>
endobj
-235 0 obj
+241 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -41566,10 +41767,10 @@ endobj
/Type /Annot
>>
endobj
-236 0 obj
-[223 0 R /XYZ 0 236.7900000000004 null]
+242 0 obj
+[229 0 R /XYZ 0 236.7900000000004 null]
endobj
-237 0 obj
+243 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -41580,10 +41781,10 @@ endobj
/Type /Annot
>>
endobj
-238 0 obj
-[223 0 R /XYZ 0 100.61000000000035 null]
+244 0 obj
+[229 0 R /XYZ 0 100.61000000000035 null]
endobj
-239 0 obj
+245 0 obj
<< /Length 31476
>>
stream
@@ -43725,25 +43926,25 @@ Q
endstream
endobj
-240 0 obj
+246 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 239 0 R
+/Contents 245 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/Font << /F3.0 18 0 R
/F1.0 8 0 R
/F2.0 16 0 R
>>
-/XObject << /Stamp1 1049 0 R
+/XObject << /Stamp1 1031 0 R
>>
>>
>>
endobj
-241 0 obj
-[240 0 R /XYZ 0 342.19000000000005 null]
+247 0 obj
+[246 0 R /XYZ 0 342.19000000000005 null]
endobj
-242 0 obj
+248 0 obj
<< /Length 41329
>>
stream
@@ -46720,29 +46921,29 @@ Q
endstream
endobj
-243 0 obj
+249 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 242 0 R
+/Contents 248 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/Font << /F3.0 18 0 R
/F2.0 16 0 R
/F1.0 8 0 R
/F4.0 19 0 R
>>
-/XObject << /Stamp1 1049 0 R
+/XObject << /Stamp1 1031 0 R
>>
>>
>>
endobj
-244 0 obj
-[243 0 R /XYZ 0 521.31 null]
+250 0 obj
+[249 0 R /XYZ 0 521.31 null]
endobj
-245 0 obj
-[243 0 R /XYZ 0 101.43000000000006 null]
+251 0 obj
+[249 0 R /XYZ 0 101.43000000000006 null]
endobj
-246 0 obj
+252 0 obj
<< /Length 34147
>>
stream
@@ -49091,11 +49292,11 @@ Q
endstream
endobj
-247 0 obj
+253 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 246 0 R
+/Contents 252 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/Font << /F1.0 8 0 R
/F5.1 43 0 R
@@ -49103,13 +49304,13 @@ endobj
/F4.0 19 0 R
/F2.0 16 0 R
>>
-/XObject << /Stamp1 1049 0 R
+/XObject << /Stamp1 1031 0 R
>>
>>
-/Annots [248 0 R 249 0 R 250 0 R 251 0 R 252 0 R 253 0 R 254 0 R 255 0 R 257 0 R 258 0 R]
+/Annots [254 0 R 255 0 R 256 0 R 257 0 R 258 0 R 259 0 R 260 0 R 261 0 R 263 0 R 264 0 R]
>>
endobj
-248 0 obj
+254 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -49120,7 +49321,7 @@ endobj
/Type /Annot
>>
endobj
-249 0 obj
+255 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -49131,7 +49332,7 @@ endobj
/Type /Annot
>>
endobj
-250 0 obj
+256 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -49142,7 +49343,7 @@ endobj
/Type /Annot
>>
endobj
-251 0 obj
+257 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -49153,7 +49354,7 @@ endobj
/Type /Annot
>>
endobj
-252 0 obj
+258 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -49164,7 +49365,7 @@ endobj
/Type /Annot
>>
endobj
-253 0 obj
+259 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -49175,7 +49376,7 @@ endobj
/Type /Annot
>>
endobj
-254 0 obj
+260 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -49186,7 +49387,7 @@ endobj
/Type /Annot
>>
endobj
-255 0 obj
+261 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -49197,10 +49398,10 @@ endobj
/Type /Annot
>>
endobj
-256 0 obj
-[247 0 R /XYZ 0 369.22000000000014 null]
+262 0 obj
+[253 0 R /XYZ 0 369.22000000000014 null]
endobj
-257 0 obj
+263 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -49211,7 +49412,7 @@ endobj
/Type /Annot
>>
endobj
-258 0 obj
+264 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -49222,7 +49423,7 @@ endobj
/Type /Annot
>>
endobj
-259 0 obj
+265 0 obj
<< /Length 34031
>>
stream
@@ -51653,11 +51854,11 @@ Q
endstream
endobj
-260 0 obj
+266 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 259 0 R
+/Contents 265 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/Font << /F3.0 18 0 R
/F1.0 8 0 R
@@ -51665,13 +51866,13 @@ endobj
/F2.0 16 0 R
/F6.0 44 0 R
>>
-/XObject << /Stamp1 1049 0 R
+/XObject << /Stamp1 1031 0 R
>>
>>
-/Annots [261 0 R 262 0 R 263 0 R 264 0 R 265 0 R 266 0 R 268 0 R 269 0 R 270 0 R 271 0 R 272 0 R 273 0 R 274 0 R 275 0 R 276 0 R 277 0 R 278 0 R 279 0 R 280 0 R 281 0 R 282 0 R 283 0 R 284 0 R 285 0 R 288 0 R 289 0 R]
+/Annots [267 0 R 268 0 R 269 0 R 270 0 R 271 0 R 272 0 R 274 0 R 275 0 R 276 0 R 277 0 R 278 0 R 279 0 R 280 0 R 281 0 R 282 0 R 283 0 R 284 0 R 285 0 R 286 0 R 287 0 R 288 0 R 289 0 R 290 0 R 291 0 R 294 0 R 295 0 R]
>>
endobj
-261 0 obj
+267 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -51682,7 +51883,7 @@ endobj
/Type /Annot
>>
endobj
-262 0 obj
+268 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -51693,7 +51894,7 @@ endobj
/Type /Annot
>>
endobj
-263 0 obj
+269 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -51704,7 +51905,7 @@ endobj
/Type /Annot
>>
endobj
-264 0 obj
+270 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -51715,7 +51916,7 @@ endobj
/Type /Annot
>>
endobj
-265 0 obj
+271 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -51726,7 +51927,7 @@ endobj
/Type /Annot
>>
endobj
-266 0 obj
+272 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -51737,10 +51938,10 @@ endobj
/Type /Annot
>>
endobj
-267 0 obj
-[260 0 R /XYZ 0 611.45 null]
+273 0 obj
+[266 0 R /XYZ 0 611.45 null]
endobj
-268 0 obj
+274 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -51751,7 +51952,7 @@ endobj
/Type /Annot
>>
endobj
-269 0 obj
+275 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -51762,7 +51963,7 @@ endobj
/Type /Annot
>>
endobj
-270 0 obj
+276 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -51773,7 +51974,7 @@ endobj
/Type /Annot
>>
endobj
-271 0 obj
+277 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -51784,7 +51985,7 @@ endobj
/Type /Annot
>>
endobj
-272 0 obj
+278 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -51795,7 +51996,7 @@ endobj
/Type /Annot
>>
endobj
-273 0 obj
+279 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -51806,7 +52007,7 @@ endobj
/Type /Annot
>>
endobj
-274 0 obj
+280 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -51817,7 +52018,7 @@ endobj
/Type /Annot
>>
endobj
-275 0 obj
+281 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -51828,7 +52029,7 @@ endobj
/Type /Annot
>>
endobj
-276 0 obj
+282 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -51839,7 +52040,7 @@ endobj
/Type /Annot
>>
endobj
-277 0 obj
+283 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -51850,7 +52051,7 @@ endobj
/Type /Annot
>>
endobj
-278 0 obj
+284 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -51861,7 +52062,7 @@ endobj
/Type /Annot
>>
endobj
-279 0 obj
+285 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -51872,7 +52073,7 @@ endobj
/Type /Annot
>>
endobj
-280 0 obj
+286 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -51883,7 +52084,7 @@ endobj
/Type /Annot
>>
endobj
-281 0 obj
+287 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -51894,7 +52095,7 @@ endobj
/Type /Annot
>>
endobj
-282 0 obj
+288 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -51905,7 +52106,7 @@ endobj
/Type /Annot
>>
endobj
-283 0 obj
+289 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -51916,7 +52117,7 @@ endobj
/Type /Annot
>>
endobj
-284 0 obj
+290 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -51927,7 +52128,7 @@ endobj
/Type /Annot
>>
endobj
-285 0 obj
+291 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -51938,15 +52139,15 @@ endobj
/Type /Annot
>>
endobj
-286 0 obj
-[260 0 R /XYZ 0 195.55000000000015 null]
+292 0 obj
+[266 0 R /XYZ 0 195.55000000000015 null]
endobj
-287 0 obj
+293 0 obj
<< /Limits [(action-parameter-set) (dependent-choices)]
-/Names [(action-parameter-set) 241 0 R (adapter-classes) 758 0 R (alternative-approaches) 779 0 R (alternatives) 195 0 R (alternatives-2) 306 0 R (alternatives-3) 329 0 R (alternatives-4) 788 0 R (api) 566 0 R (api-2) 574 0 R (api-3) 584 0 R (api-4) 590 0 R (code-changesdto-code) 956 0 R (code-objectsdto-code) 962 0 R (code-specification-code) 752 0 R (code-specification2-code) 754 0 R (combining-specifications) 760 0 R (dependent-choices) 164 0 R]
+/Names [(action-parameter-set) 247 0 R (adapter-classes) 740 0 R (alternative-approaches) 761 0 R (alternatives) 198 0 R (alternatives-2) 312 0 R (alternatives-3) 335 0 R (alternatives-4) 770 0 R (api) 549 0 R (api-2) 557 0 R (api-3) 568 0 R (api-4) 574 0 R (code-changesdto-code) 938 0 R (code-objectsdto-code) 944 0 R (code-specification-code) 734 0 R (code-specification2-code) 738 0 R (combining-specifications) 742 0 R (dependent-choices) 164 0 R]
>>
endobj
-288 0 obj
+294 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -51957,7 +52158,7 @@ endobj
/Type /Annot
>>
endobj
-289 0 obj
+295 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -51968,7 +52169,7 @@ endobj
/Type /Annot
>>
endobj
-290 0 obj
+296 0 obj
<< /Length 14875
>>
stream
@@ -52994,23 +53195,23 @@ Q
endstream
endobj
-291 0 obj
+297 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 290 0 R
+/Contents 296 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/Font << /F1.0 8 0 R
/F3.0 18 0 R
>>
-/XObject << /I2 293 0 R
-/Stamp1 1049 0 R
+/XObject << /I2 299 0 R
+/Stamp1 1031 0 R
>>
>>
-/Annots [292 0 R 294 0 R 295 0 R 296 0 R 297 0 R]
+/Annots [298 0 R 300 0 R 301 0 R 302 0 R 303 0 R]
>>
endobj
-292 0 obj
+298 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -53021,7 +53222,7 @@ endobj
/Type /Annot
>>
endobj
-293 0 obj
+299 0 obj
<< /Type /XObject
/Subtype /Image
/Height 988
@@ -53437,7 +53638,7 @@ L
�� �ɠ\aXB =�+ K�# �'�>p�ai����� [���� � � � �zٺw}Z�����S{��F�� �7[��?|b[橽j��g�%���� � �MZގ�S{��|�V 0p�G ���� MC ��> 4��# 4���T��
endstream
endobj
-294 0 obj
+300 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -53448,7 +53649,7 @@ endobj
/Type /Annot
>>
endobj
-295 0 obj
+301 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -53459,7 +53660,7 @@ endobj
/Type /Annot
>>
endobj
-296 0 obj
+302 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -53470,7 +53671,7 @@ endobj
/Type /Annot
>>
endobj
-297 0 obj
+303 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -53481,7 +53682,7 @@ endobj
/Type /Annot
>>
endobj
-298 0 obj
+304 0 obj
<< /Length 28093
>>
stream
@@ -54704,7 +54905,7 @@ ET
0.694 0.129 0.275 scn
0.694 0.129 0.275 SCN
-0.449 Tw
+0.713 Tw
BT
48.24 246.4260000000002 Td
@@ -54719,7 +54920,7 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-0.449 Tw
+0.713 Tw
BT
158.49 246.4260000000002 Td
@@ -54734,10 +54935,10 @@ ET
0.694 0.129 0.275 scn
0.694 0.129 0.275 SCN
-0.449 Tw
+0.713 Tw
BT
-183.93680078124999 246.4260000000002 Td
+184.46486751302083 246.4260000000002 Td
/F3.0 10.5 Tf
<416374696f6e446f6d61696e4576656e74> Tj
ET
@@ -54749,12 +54950,12 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-0.449 Tw
+0.713 Tw
BT
-273.18680078125 246.4260000000002 Td
+273.7148675130208 246.4260000000002 Td
/F1.0 10.5 Tf
-[<2e20204120676f6f64207061747465726e20697320746f206d616b> 20.01953125 <65207468657365206e65737465642073746174696320636c61737365732e>] TJ
+[<2e204120676f6f64207061747465726e20697320746f206d616b> 20.01953125 <65207468657365206e65737465642073746174696320636c61737365732e>] TJ
ET
@@ -55373,11 +55574,11 @@ Q
endstream
endobj
-299 0 obj
+305 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 298 0 R
+/Contents 304 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/Font << /F2.0 16 0 R
/F3.0 18 0 R
@@ -55385,16 +55586,16 @@ endobj
/F4.0 19 0 R
/F1.1 175 0 R
>>
-/XObject << /Stamp1 1049 0 R
+/XObject << /Stamp1 1031 0 R
>>
>>
-/Annots [301 0 R 302 0 R 303 0 R 304 0 R 305 0 R]
+/Annots [307 0 R 308 0 R 309 0 R 310 0 R 311 0 R]
>>
endobj
-300 0 obj
-[299 0 R /XYZ 0 841.89 null]
+306 0 obj
+[305 0 R /XYZ 0 841.89 null]
endobj
-301 0 obj
+307 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -55405,7 +55606,7 @@ endobj
/Type /Annot
>>
endobj
-302 0 obj
+308 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -55416,7 +55617,7 @@ endobj
/Type /Annot
>>
endobj
-303 0 obj
+309 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -55427,7 +55628,7 @@ endobj
/Type /Annot
>>
endobj
-304 0 obj
+310 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -55438,7 +55639,7 @@ endobj
/Type /Annot
>>
endobj
-305 0 obj
+311 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -55449,11 +55650,11 @@ endobj
/Type /Annot
>>
endobj
-306 0 obj
-[299 0 R /XYZ 0 347.61000000000024 null]
+312 0 obj
+[305 0 R /XYZ 0 347.61000000000024 null]
endobj
-307 0 obj
-<< /Length 35797
+313 0 obj
+<< /Length 37264
>>
stream
q
@@ -55463,10 +55664,10 @@ q
52.240 805.890 m
543.040 805.890 l
545.249 805.890 547.040 804.099 547.040 801.890 c
-547.040 669.970 l
-547.040 667.761 545.249 665.970 543.040 665.970 c
-52.240 665.970 l
-50.031 665.970 48.240 667.761 48.240 669.970 c
+547.040 699.450 l
+547.040 697.241 545.249 695.450 543.040 695.450 c
+52.240 695.450 l
+50.031 695.450 48.240 697.241 48.240 699.450 c
48.240 801.890 l
48.240 804.099 50.031 805.890 52.240 805.890 c
h
@@ -55477,10 +55678,10 @@ f
52.240 805.890 m
543.040 805.890 l
545.249 805.890 547.040 804.099 547.040 801.890 c
-547.040 669.970 l
-547.040 667.761 545.249 665.970 543.040 665.970 c
-52.240 665.970 l
-50.031 665.970 48.240 667.761 48.240 669.970 c
+547.040 699.450 l
+547.040 697.241 545.249 695.450 543.040 695.450 c
+52.240 695.450 l
+50.031 695.450 48.240 697.241 48.240 699.450 c
48.240 801.890 l
48.240 804.099 50.031 805.890 52.240 805.890 c
h
@@ -56097,53 +56298,9 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 724.105 Td
-/F3.0 11 Tf
-<ca20202020202020> Tj
-ET
-
-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
-
-BT
-103.24000000000001 724.105 Td
-/F3.0 11 Tf
-<2e> Tj
-ET
-
-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
-
-BT
-108.74000000000001 724.105 Td
-/F3.0 11 Tf
-<2e> Tj
-ET
-
-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
-
-BT
-114.24000000000001 724.105 Td
-/F3.0 11 Tf
-<2e> Tj
-ET
-
-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
-
-BT
-59.24 709.365 Td
+515.74 738.845 Td
/F3.0 11 Tf
-<ca202020> Tj
+<20> Tj
ET
0.000 0.000 0.000 SCN
@@ -56152,7 +56309,7 @@ ET
0.200 0.200 0.200 SCN
BT
-81.24000000000001 709.365 Td
+521.24 738.845 Td
/F3.0 11 Tf
<7d> Tj
ET
@@ -56163,7 +56320,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 694.625 Td
+59.24 724.105 Td
/F3.0 11 Tf
<ca202020> Tj
ET
@@ -56174,7 +56331,7 @@ ET
0.200 0.200 0.200 SCN
BT
-81.24000000000001 694.625 Td
+81.24000000000001 724.105 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -56185,7 +56342,7 @@ ET
0.200 0.200 0.200 SCN
BT
-86.74000000000001 694.625 Td
+86.74000000000001 724.105 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -56196,7 +56353,7 @@ ET
0.200 0.200 0.200 SCN
BT
-92.24000000000001 694.625 Td
+92.24000000000001 724.105 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -56207,7 +56364,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 679.885 Td
+59.24 709.365 Td
/F3.0 11 Tf
<7d> Tj
ET
@@ -56218,7 +56375,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24 642.006 Td
+48.24 671.4859999999999 Td
/F1.0 10.5 Tf
<5468656e2c20656163682070726f70657274792f636f6c6c656374696f6e2f616374696f6e20656d69747320656974686572207468657365206261736520646f6d61696e206576656e7473206f72207468656972206f776e20737562636c6173733a> Tj
ET
@@ -56227,28 +56384,28 @@ ET
0.000 0.000 0.000 scn
q
0.961 0.961 0.961 scn
-52.240 626.190 m
-543.040 626.190 l
-545.249 626.190 547.040 624.399 547.040 622.190 c
-547.040 446.050 l
-547.040 443.841 545.249 442.050 543.040 442.050 c
-52.240 442.050 l
-50.031 442.050 48.240 443.841 48.240 446.050 c
-48.240 622.190 l
-48.240 624.399 50.031 626.190 52.240 626.190 c
+52.240 655.670 m
+543.040 655.670 l
+545.249 655.670 547.040 653.879 547.040 651.670 c
+547.040 519.750 l
+547.040 517.541 545.249 515.750 543.040 515.750 c
+52.240 515.750 l
+50.031 515.750 48.240 517.541 48.240 519.750 c
+48.240 651.670 l
+48.240 653.879 50.031 655.670 52.240 655.670 c
h
f
0.800 0.800 0.800 SCN
0.75 w
-52.240 626.190 m
-543.040 626.190 l
-545.249 626.190 547.040 624.399 547.040 622.190 c
-547.040 446.050 l
-547.040 443.841 545.249 442.050 543.040 442.050 c
-52.240 442.050 l
-50.031 442.050 48.240 443.841 48.240 446.050 c
-48.240 622.190 l
-48.240 624.399 50.031 626.190 52.240 626.190 c
+52.240 655.670 m
+543.040 655.670 l
+545.249 655.670 547.040 653.879 547.040 651.670 c
+547.040 519.750 l
+547.040 517.541 545.249 515.750 543.040 515.750 c
+52.240 515.750 l
+50.031 515.750 48.240 517.541 48.240 519.750 c
+48.240 651.670 l
+48.240 653.879 50.031 655.670 52.240 655.670 c
h
S
Q
@@ -56256,7 +56413,7 @@ Q
0.000 0.400 0.600 SCN
BT
-59.24 603.365 Td
+59.24 632.8449999999999 Td
/F3.0 11 Tf
<7075626c6963> Tj
ET
@@ -56267,7 +56424,7 @@ ET
0.200 0.200 0.200 SCN
BT
-92.24000000000001 603.365 Td
+92.24000000000001 632.8449999999999 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -56278,7 +56435,7 @@ ET
0.000 0.467 0.533 SCN
BT
-97.74000000000001 603.365 Td
+97.74000000000001 632.8449999999999 Td
/F3.0 11 Tf
<636c617373> Tj
ET
@@ -56289,7 +56446,7 @@ ET
0.200 0.200 0.200 SCN
BT
-125.24000000000001 603.365 Td
+125.24000000000001 632.8449999999999 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -56300,7 +56457,7 @@ ET
0.000 0.667 0.533 SCN
BT
-130.74 603.365 Td
+130.74 632.8449999999999 Td
/F3.0 11 Tf
<546f446f4974656d> Tj
ET
@@ -56311,7 +56468,7 @@ ET
0.200 0.200 0.200 SCN
BT
-174.74 603.365 Td
+174.74 632.8449999999999 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -56322,7 +56479,7 @@ ET
0.200 0.200 0.200 SCN
BT
-180.24 603.365 Td
+180.24 632.8449999999999 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -56333,7 +56490,7 @@ ET
0.200 0.200 0.200 SCN
BT
-185.74 603.365 Td
+185.74 632.8449999999999 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -56344,7 +56501,7 @@ ET
0.200 0.200 0.200 SCN
BT
-191.24 603.365 Td
+191.24 632.8449999999999 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -56355,7 +56512,7 @@ ET
0.200 0.200 0.200 SCN
BT
-196.74 603.365 Td
+196.74 632.8449999999999 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -56366,7 +56523,7 @@ ET
0.200 0.200 0.200 SCN
BT
-202.24 603.365 Td
+202.24 632.8449999999999 Td
/F3.0 11 Tf
<7b> Tj
ET
@@ -56377,7 +56534,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 588.625 Td
+59.24 618.1049999999999 Td
/F3.0 11 Tf
<ca202020> Tj
ET
@@ -56388,7 +56545,7 @@ ET
0.000 0.400 0.600 SCN
BT
-81.24000000000001 588.625 Td
+81.24000000000001 618.1049999999999 Td
/F3.0 11 Tf
<7075626c6963> Tj
ET
@@ -56399,7 +56556,7 @@ ET
0.200 0.200 0.200 SCN
BT
-114.24000000000001 588.625 Td
+114.24000000000001 618.1049999999999 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -56410,7 +56567,7 @@ ET
0.000 0.400 0.600 SCN
BT
-119.74000000000001 588.625 Td
+119.74000000000001 618.1049999999999 Td
/F3.0 11 Tf
<737461746963> Tj
ET
@@ -56421,7 +56578,7 @@ ET
0.200 0.200 0.200 SCN
BT
-152.74 588.625 Td
+152.74 618.1049999999999 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -56432,7 +56589,7 @@ ET
0.000 0.467 0.533 SCN
BT
-158.24 588.625 Td
+158.24 618.1049999999999 Td
/F3.0 11 Tf
<636c617373> Tj
ET
@@ -56443,7 +56600,7 @@ ET
0.200 0.200 0.200 SCN
BT
-185.74 588.625 Td
+185.74 618.1049999999999 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -56454,7 +56611,7 @@ ET
0.000 0.667 0.533 SCN
BT
-191.24 588.625 Td
+191.24 618.1049999999999 Td
/F3.0 11 Tf
<4465736372697074696f6e446f6d61696e4576656e74> Tj
ET
@@ -56465,9 +56622,9 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 573.885 Td
+312.24 618.1049999999999 Td
/F3.0 11 Tf
-<ca2020202020202020202020> Tj
+<20> Tj
ET
0.000 0.000 0.000 SCN
@@ -56476,7 +56633,7 @@ ET
0.000 0.400 0.600 SCN
BT
-125.24000000000001 573.885 Td
+317.74 618.1049999999999 Td
/F3.0 11 Tf
<657874656e6473> Tj
ET
@@ -56487,7 +56644,7 @@ ET
0.200 0.200 0.200 SCN
BT
-163.74 573.885 Td
+356.24 618.1049999999999 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -56498,7 +56655,7 @@ ET
0.200 0.200 0.200 SCN
BT
-169.24 573.885 Td
+361.74 618.1049999999999 Td
/F3.0 11 Tf
<50726f7065727479446f6d61696e4576656e74> Tj
ET
@@ -56509,7 +56666,7 @@ ET
0.200 0.200 0.200 SCN
BT
-273.74 573.885 Td
+466.24 618.1049999999999 Td
/F3.0 11 Tf
<3c> Tj
ET
@@ -56520,7 +56677,7 @@ ET
0.000 0.467 0.533 SCN
BT
-279.24 573.885 Td
+471.74 618.1049999999999 Td
/F3.0 11 Tf
<537472696e67> Tj
ET
@@ -56531,7 +56688,7 @@ ET
0.200 0.200 0.200 SCN
BT
-312.24 573.885 Td
+504.74 618.1049999999999 Td
/F3.0 11 Tf
<3e> Tj
ET
@@ -56542,7 +56699,7 @@ ET
0.200 0.200 0.200 SCN
BT
-317.74 573.885 Td
+510.24 618.1049999999999 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -56553,7 +56710,7 @@ ET
0.200 0.200 0.200 SCN
BT
-323.24 573.885 Td
+515.74 618.1049999999999 Td
/F3.0 11 Tf
<7b> Tj
ET
@@ -56564,53 +56721,9 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 559.145 Td
-/F3.0 11 Tf
-<ca20202020202020> Tj
-ET
-
-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
-
-BT
-103.24000000000001 559.145 Td
-/F3.0 11 Tf
-<2e> Tj
-ET
-
-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
-
-BT
-108.74000000000001 559.145 Td
+521.24 618.1049999999999 Td
/F3.0 11 Tf
-<2e> Tj
-ET
-
-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
-
-BT
-114.24000000000001 559.145 Td
-/F3.0 11 Tf
-<2e> Tj
-ET
-
-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
-
-BT
-59.24 544.405 Td
-/F3.0 11 Tf
-<ca202020> Tj
+<20> Tj
ET
0.000 0.000 0.000 SCN
@@ -56619,7 +56732,7 @@ ET
0.200 0.200 0.200 SCN
BT
-81.24000000000001 544.405 Td
+526.74 618.1049999999999 Td
/F3.0 11 Tf
<7d> Tj
ET
@@ -56630,7 +56743,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 529.6650000000001 Td
+59.24 603.365 Td
/F3.0 11 Tf
<ca202020> Tj
ET
@@ -56641,7 +56754,7 @@ ET
0.600 0.600 1.000 SCN
BT
-81.24000000000001 529.6650000000001 Td
+81.24000000000001 603.365 Td
/F3.0 11 Tf
<4050726f7065727479> Tj
ET
@@ -56652,7 +56765,7 @@ ET
0.200 0.200 0.200 SCN
BT
-130.74 529.6650000000001 Td
+130.74 603.365 Td
/F3.0 11 Tf
<28> Tj
ET
@@ -56663,7 +56776,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 514.9250000000001 Td
+59.24 588.625 Td
/F3.0 11 Tf
<ca20202020202020> Tj
ET
@@ -56674,7 +56787,7 @@ ET
0.200 0.200 0.200 SCN
BT
-103.24000000000001 514.9250000000001 Td
+103.24000000000001 588.625 Td
/F3.0 11 Tf
<646f6d61696e4576656e74> Tj
ET
@@ -56685,7 +56798,7 @@ ET
0.200 0.200 0.200 SCN
BT
-163.74 514.9250000000001 Td
+163.74 588.625 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -56696,7 +56809,7 @@ ET
0.200 0.200 0.200 SCN
BT
-169.24 514.9250000000001 Td
+169.24 588.625 Td
/F3.0 11 Tf
<3d> Tj
ET
@@ -56707,7 +56820,7 @@ ET
0.200 0.200 0.200 SCN
BT
-174.74 514.9250000000001 Td
+174.74 588.625 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -56718,7 +56831,7 @@ ET
0.200 0.200 0.200 SCN
BT
-180.24 514.9250000000001 Td
+180.24 588.625 Td
/F3.0 11 Tf
<4465736372697074696f6e446f6d61696e4576656e74> Tj
ET
@@ -56729,7 +56842,7 @@ ET
0.200 0.200 0.200 SCN
BT
-301.24 514.9250000000001 Td
+301.24 588.625 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -56740,7 +56853,7 @@ ET
0.200 0.200 0.200 SCN
BT
-306.74 514.9250000000001 Td
+306.74 588.625 Td
/F3.0 11 Tf
<636c617373> Tj
ET
@@ -56751,7 +56864,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 500.18500000000006 Td
+59.24 573.885 Td
/F3.0 11 Tf
<ca202020> Tj
ET
@@ -56762,7 +56875,7 @@ ET
0.200 0.200 0.200 SCN
BT
-81.24000000000001 500.18500000000006 Td
+81.24000000000001 573.885 Td
/F3.0 11 Tf
<29> Tj
ET
@@ -56773,7 +56886,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 485.44500000000005 Td
+59.24 559.145 Td
/F3.0 11 Tf
<ca202020> Tj
ET
@@ -56784,7 +56897,7 @@ ET
0.000 0.400 0.600 SCN
BT
-81.24000000000001 485.44500000000005 Td
+81.24000000000001 559.145 Td
/F3.0 11 Tf
<7075626c6963> Tj
ET
@@ -56795,7 +56908,7 @@ ET
0.200 0.200 0.200 SCN
BT
-114.24000000000001 485.44500000000005 Td
+114.24000000000001 559.145 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -56806,7 +56919,7 @@ ET
0.000 0.467 0.533 SCN
BT
-119.74000000000001 485.44500000000005 Td
+119.74000000000001 559.145 Td
/F3.0 11 Tf
<537472696e67> Tj
ET
@@ -56817,7 +56930,7 @@ ET
0.200 0.200 0.200 SCN
BT
-152.74 485.44500000000005 Td
+152.74 559.145 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -56828,7 +56941,7 @@ ET
0.200 0.200 0.200 SCN
BT
-158.24 485.44500000000005 Td
+158.24 559.145 Td
/F3.0 11 Tf
<6765744465736372697074696f6e> Tj
ET
@@ -56839,7 +56952,7 @@ ET
0.200 0.200 0.200 SCN
BT
-235.24 485.44500000000005 Td
+235.24 559.145 Td
/F3.0 11 Tf
<28> Tj
ET
@@ -56850,7 +56963,7 @@ ET
0.200 0.200 0.200 SCN
BT
-240.74 485.44500000000005 Td
+240.74 559.145 Td
/F3.0 11 Tf
<29> Tj
ET
@@ -56861,7 +56974,7 @@ ET
0.200 0.200 0.200 SCN
BT
-246.24 485.44500000000005 Td
+246.24 559.145 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -56872,7 +56985,7 @@ ET
0.200 0.200 0.200 SCN
BT
-251.74 485.44500000000005 Td
+251.74 559.145 Td
/F3.0 11 Tf
<7b> Tj
ET
@@ -56883,7 +56996,7 @@ ET
0.200 0.200 0.200 SCN
BT
-257.24 485.44500000000005 Td
+257.24 559.145 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -56894,7 +57007,7 @@ ET
0.200 0.200 0.200 SCN
BT
-262.74 485.44500000000005 Td
+262.74 559.145 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -56905,7 +57018,7 @@ ET
0.200 0.200 0.200 SCN
BT
-268.24 485.44500000000005 Td
+268.24 559.145 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -56916,7 +57029,7 @@ ET
0.200 0.200 0.200 SCN
BT
-273.74 485.44500000000005 Td
+273.74 559.145 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -56927,7 +57040,7 @@ ET
0.200 0.200 0.200 SCN
BT
-279.24 485.44500000000005 Td
+279.24 559.145 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -56938,7 +57051,7 @@ ET
0.200 0.200 0.200 SCN
BT
-284.74 485.44500000000005 Td
+284.74 559.145 Td
/F3.0 11 Tf
<7d> Tj
ET
@@ -56949,7 +57062,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 470.70500000000004 Td
+59.24 544.405 Td
/F3.0 11 Tf
<ca202020> Tj
ET
@@ -56960,7 +57073,7 @@ ET
0.200 0.200 0.200 SCN
BT
-81.24000000000001 470.70500000000004 Td
+81.24000000000001 544.405 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -56971,7 +57084,7 @@ ET
0.200 0.200 0.200 SCN
BT
-86.74000000000001 470.70500000000004 Td
+86.74000000000001 544.405 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -56982,7 +57095,7 @@ ET
0.200 0.200 0.200 SCN
BT
-92.24000000000001 470.70500000000004 Td
+92.24000000000001 544.405 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -56993,7 +57106,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 455.96500000000003 Td
+59.24 529.665 Td
/F3.0 11 Tf
<7d> Tj
ET
@@ -57004,7 +57117,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24 418.08600000000007 Td
+48.24 491.786 Td
/F1.0 10.5 Tf
<41207665746f696e6720737562736372696265722063616e207468656e2073756273637269626520746f2074686520646f6d61696e206576656e747320616e64207665746f206163636573732c2065673a> Tj
ET
@@ -57013,28 +57126,28 @@ ET
0.000 0.000 0.000 scn
q
0.961 0.961 0.961 scn
-52.240 402.270 m
-543.040 402.270 l
-545.249 402.270 547.040 400.479 547.040 398.270 c
-547.040 236.870 l
-547.040 234.661 545.249 232.870 543.040 232.870 c
-52.240 232.870 l
-50.031 232.870 48.240 234.661 48.240 236.870 c
-48.240 398.270 l
-48.240 400.479 50.031 402.270 52.240 402.270 c
+52.240 475.970 m
+543.040 475.970 l
+545.249 475.970 547.040 474.179 547.040 471.970 c
+547.040 310.570 l
+547.040 308.361 545.249 306.570 543.040 306.570 c
+52.240 306.570 l
+50.031 306.570 48.240 308.361 48.240 310.570 c
+48.240 471.970 l
+48.240 474.179 50.031 475.970 52.240 475.970 c
h
f
0.800 0.800 0.800 SCN
0.75 w
-52.240 402.270 m
-543.040 402.270 l
-545.249 402.270 547.040 400.479 547.040 398.270 c
-547.040 236.870 l
-547.040 234.661 545.249 232.870 543.040 232.870 c
-52.240 232.870 l
-50.031 232.870 48.240 234.661 48.240 236.870 c
-48.240 398.270 l
-48.240 400.479 50.031 402.270 52.240 402.270 c
+52.240 475.970 m
+543.040 475.970 l
+545.249 475.970 547.040 474.179 547.040 471.970 c
+547.040 310.570 l
+547.040 308.361 545.249 306.570 543.040 306.570 c
+52.240 306.570 l
+50.031 306.570 48.240 308.361 48.240 310.570 c
+48.240 471.970 l
+48.240 474.179 50.031 475.970 52.240 475.970 c
h
S
Q
@@ -57042,7 +57155,7 @@ Q
0.600 0.600 1.000 SCN
BT
-59.24 379.4450000000001 Td
+59.24 453.14500000000004 Td
/F3.0 11 Tf
<40446f6d61696e4f626a656374> Tj
ET
@@ -57053,7 +57166,7 @@ ET
0.000 0.400 0.600 SCN
BT
-59.24 364.7050000000001 Td
+59.24 438.40500000000003 Td
/F3.0 11 Tf
<7075626c6963> Tj
ET
@@ -57064,7 +57177,7 @@ ET
0.200 0.200 0.200 SCN
BT
-92.24000000000001 364.7050000000001 Td
+92.24000000000001 438.40500000000003 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -57075,7 +57188,7 @@ ET
0.000 0.467 0.533 SCN
BT
-97.74000000000001 364.7050000000001 Td
+97.74000000000001 438.40500000000003 Td
/F3.0 11 Tf
<636c617373> Tj
ET
@@ -57086,7 +57199,7 @@ ET
0.200 0.200 0.200 SCN
BT
-125.24000000000001 364.7050000000001 Td
+125.24000000000001 438.40500000000003 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -57097,7 +57210,7 @@ ET
0.000 0.667 0.533 SCN
BT
-130.74 364.7050000000001 Td
+130.74 438.40500000000003 Td
/F3.0 11 Tf
<5665746f4f75744f664f6666696365486f757273> Tj
ET
@@ -57108,7 +57221,7 @@ ET
0.200 0.200 0.200 SCN
BT
-240.74 364.7050000000001 Td
+240.74 438.40500000000003 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -57119,7 +57232,7 @@ ET
0.200 0.200 0.200 SCN
BT
-246.24 364.7050000000001 Td
+246.24 438.40500000000003 Td
/F3.0 11 Tf
<7b> Tj
ET
@@ -57130,7 +57243,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 349.9650000000001 Td
+59.24 423.665 Td
/F3.0 11 Tf
<ca202020> Tj
ET
@@ -57141,7 +57254,7 @@ ET
0.600 0.600 1.000 SCN
BT
-81.24000000000001 349.9650000000001 Td
+81.24000000000001 423.665 Td
/F3.0 11 Tf
<40537562736372696265> Tj
ET
@@ -57152,7 +57265,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 335.2250000000001 Td
+59.24 408.925 Td
/F3.0 11 Tf
<ca202020> Tj
ET
@@ -57163,7 +57276,7 @@ ET
0.000 0.400 0.600 SCN
BT
-81.24000000000001 335.2250000000001 Td
+81.24000000000001 408.925 Td
/F3.0 11 Tf
<7075626c6963> Tj
ET
@@ -57174,7 +57287,7 @@ ET
0.200 0.200 0.200 SCN
BT
-114.24000000000001 335.2250000000001 Td
+114.24000000000001 408.925 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -57185,7 +57298,7 @@ ET
0.000 0.467 0.533 SCN
BT
-119.74000000000001 335.2250000000001 Td
+119.74000000000001 408.925 Td
/F3.0 11 Tf
<766f6964> Tj
ET
@@ -57196,7 +57309,7 @@ ET
0.200 0.200 0.200 SCN
BT
-141.74 335.2250000000001 Td
+141.74 408.925 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -57207,7 +57320,7 @@ ET
0.200 0.200 0.200 SCN
BT
-147.24 335.2250000000001 Td
+147.24 408.925 Td
/F3.0 11 Tf
<6f6e> Tj
ET
@@ -57218,7 +57331,7 @@ ET
0.200 0.200 0.200 SCN
BT
-158.24 335.2250000000001 Td
+158.24 408.925 Td
/F3.0 11 Tf
<28> Tj
ET
@@ -57229,7 +57342,7 @@ ET
0.200 0.200 0.200 SCN
BT
-163.74 335.2250000000001 Td
+163.74 408.925 Td
/F3.0 11 Tf
<546f446f4974656d> Tj
ET
@@ -57240,7 +57353,7 @@ ET
0.200 0.200 0.200 SCN
BT
-207.74 335.2250000000001 Td
+207.74 408.925 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -57251,7 +57364,7 @@ ET
0.200 0.200 0.200 SCN
BT
-213.24 335.2250000000001 Td
+213.24 408.925 Td
/F3.0 11 Tf
<50726f7065727479446f6d61696e4576656e74> Tj
ET
@@ -57262,7 +57375,7 @@ ET
0.200 0.200 0.200 SCN
BT
-317.74 335.2250000000001 Td
+317.74 408.925 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -57273,7 +57386,7 @@ ET
0.200 0.200 0.200 SCN
BT
-323.24 335.2250000000001 Td
+323.24 408.925 Td
/F3.0 11 Tf
<6576> Tj
ET
@@ -57284,7 +57397,7 @@ ET
0.200 0.200 0.200 SCN
BT
-334.24 335.2250000000001 Td
+334.24 408.925 Td
/F3.0 11 Tf
<29> Tj
ET
@@ -57295,7 +57408,7 @@ ET
0.200 0.200 0.200 SCN
BT
-339.74 335.2250000000001 Td
+339.74 408.925 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -57306,7 +57419,7 @@ ET
0.200 0.200 0.200 SCN
BT
-345.24 335.2250000000001 Td
+345.24 408.925 Td
/F3.0 11 Tf
<7b> Tj
ET
@@ -57317,7 +57430,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 320.48500000000007 Td
+59.24 394.185 Td
/F3.0 11 Tf
<ca20202020202020> Tj
ET
@@ -57328,7 +57441,7 @@ ET
0.000 0.400 0.600 SCN
BT
-103.24000000000001 320.48500000000007 Td
+103.24000000000001 394.185 Td
/F3.0 11 Tf
<6966> Tj
ET
@@ -57339,7 +57452,7 @@ ET
0.200 0.200 0.200 SCN
BT
-114.24000000000001 320.48500000000007 Td
+114.24000000000001 394.185 Td
/F3.0 11 Tf
<28> Tj
ET
@@ -57350,7 +57463,7 @@ ET
0.200 0.200 0.200 SCN
BT
-119.74000000000001 320.48500000000007 Td
+119.74000000000001 394.185 Td
/F3.0 11 Tf
<21> Tj
ET
@@ -57361,7 +57474,7 @@ ET
0.200 0.200 0.200 SCN
BT
-125.24000000000001 320.48500000000007 Td
+125.24000000000001 394.185 Td
/F3.0 11 Tf
<63616c656e64617253657276696365> Tj
ET
@@ -57372,7 +57485,7 @@ ET
0.200 0.200 0.200 SCN
BT
-207.74 320.48500000000007 Td
+207.74 394.185 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -57383,7 +57496,7 @@ ET
0.200 0.200 0.200 SCN
BT
-213.24 320.48500000000007 Td
+213.24 394.185 Td
/F3.0 11 Tf
<69734f6666696365486f757273> Tj
ET
@@ -57394,7 +57507,7 @@ ET
0.200 0.200 0.200 SCN
BT
-284.74 320.48500000000007 Td
+284.74 394.185 Td
/F3.0 11 Tf
<28> Tj
ET
@@ -57405,7 +57518,7 @@ ET
0.200 0.200 0.200 SCN
BT
-290.24 320.48500000000007 Td
+290.24 394.185 Td
/F3.0 11 Tf
<636c6f636b> Tj
ET
@@ -57416,7 +57529,7 @@ ET
0.200 0.200 0.200 SCN
BT
-317.74 320.48500000000007 Td
+317.74 394.185 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -57427,7 +57540,7 @@ ET
0.200 0.200 0.200 SCN
BT
-323.24 320.48500000000007 Td
+323.24 394.185 Td
/F3.0 11 Tf
<746f646179> Tj
ET
@@ -57438,7 +57551,7 @@ ET
0.200 0.200 0.200 SCN
BT
-350.74 320.48500000000007 Td
+350.74 394.185 Td
/F3.0 11 Tf
<28> Tj
ET
@@ -57449,7 +57562,7 @@ ET
0.200 0.200 0.200 SCN
BT
-356.24 320.48500000000007 Td
+356.24 394.185 Td
/F3.0 11 Tf
<29> Tj
ET
@@ -57460,7 +57573,7 @@ ET
0.200 0.200 0.200 SCN
BT
-361.74 320.48500000000007 Td
+361.74 394.185 Td
/F3.0 11 Tf
<29> Tj
ET
@@ -57471,7 +57584,7 @@ ET
0.200 0.200 0.200 SCN
BT
-367.24 320.48500000000007 Td
+367.24 394.185 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -57482,7 +57595,7 @@ ET
0.200 0.200 0.200 SCN
BT
-372.74 320.48500000000007 Td
+372.74 394.185 Td
/F3.0 11 Tf
<7b> Tj
ET
@@ -57493,7 +57606,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 305.7450000000001 Td
+59.24 379.44500000000005 Td
/F3.0 11 Tf
<ca2020202020202020202020> Tj
ET
@@ -57504,7 +57617,7 @@ ET
0.200 0.200 0.200 SCN
BT
-125.24000000000001 305.7450000000001 Td
+125.24000000000001 379.44500000000005 Td
/F3.0 11 Tf
<6576> Tj
ET
@@ -57515,7 +57628,7 @@ ET
0.200 0.200 0.200 SCN
BT
-136.24 305.7450000000001 Td
+136.24 379.44500000000005 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -57526,7 +57639,7 @@ ET
0.200 0.200 0.200 SCN
BT
-141.74 305.7450000000001 Td
+141.74 379.44500000000005 Td
/F3.0 11 Tf
<7665746f> Tj
ET
@@ -57537,7 +57650,7 @@ ET
0.200 0.200 0.200 SCN
BT
-163.74 305.7450000000001 Td
+163.74 379.44500000000005 Td
/F3.0 11 Tf
<28> Tj
ET
@@ -57548,7 +57661,7 @@ ET
0.800 0.200 0.000 SCN
BT
-169.24 305.7450000000001 Td
+169.24 379.44500000000005 Td
/F3.0 11 Tf
<22> Tj
ET
@@ -57559,7 +57672,7 @@ ET
0.800 0.200 0.000 SCN
BT
-174.74 305.7450000000001 Td
+174.74 379.44500000000005 Td
/F3.0 11 Tf
<43616e6e6f74206d6f64696679206f626a65637473206f757473696465206f66206f666669636520686f757273> Tj
ET
@@ -57570,7 +57683,7 @@ ET
0.800 0.200 0.000 SCN
BT
-422.24 305.7450000000001 Td
+422.24 379.44500000000005 Td
/F3.0 11 Tf
<22> Tj
ET
@@ -57581,7 +57694,7 @@ ET
0.200 0.200 0.200 SCN
BT
-427.74 305.7450000000001 Td
+427.74 379.44500000000005 Td
/F3.0 11 Tf
<29> Tj
ET
@@ -57592,7 +57705,7 @@ ET
0.200 0.200 0.200 SCN
BT
-433.24 305.7450000000001 Td
+433.24 379.44500000000005 Td
/F3.0 11 Tf
<3b> Tj
ET
@@ -57603,7 +57716,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 291.0050000000001 Td
+59.24 364.70500000000004 Td
/F3.0 11 Tf
<ca20202020202020> Tj
ET
@@ -57614,7 +57727,7 @@ ET
0.200 0.200 0.200 SCN
BT
-103.24000000000001 291.0050000000001 Td
+103.24000000000001 364.70500000000004 Td
/F3.0 11 Tf
<7d> Tj
ET
@@ -57625,7 +57738,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 276.2650000000001 Td
+59.24 349.96500000000003 Td
/F3.0 11 Tf
<ca202020> Tj
ET
@@ -57636,7 +57749,7 @@ ET
0.200 0.200 0.200 SCN
BT
-81.24000000000001 276.2650000000001 Td
+81.24000000000001 349.96500000000003 Td
/F3.0 11 Tf
<7d> Tj
ET
@@ -57647,7 +57760,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 261.5250000000001 Td
+59.24 335.225 Td
/F3.0 11 Tf
<ca202020> Tj
ET
@@ -57658,7 +57771,7 @@ ET
0.200 0.200 0.200 SCN
BT
-81.24000000000001 261.5250000000001 Td
+81.24000000000001 335.225 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -57669,7 +57782,7 @@ ET
0.200 0.200 0.200 SCN
BT
-86.74000000000001 261.5250000000001 Td
+86.74000000000001 335.225 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -57680,7 +57793,7 @@ ET
0.200 0.200 0.200 SCN
BT
-92.24000000000001 261.5250000000001 Td
+92.24000000000001 335.225 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -57691,7 +57804,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 246.7850000000001 Td
+59.24 320.485 Td
/F3.0 11 Tf
<7d> Tj
ET
@@ -57702,7 +57815,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24 208.90600000000012 Td
+48.24 282.60600000000005 Td
/F1.0 10.5 Tf
[<4f6276696f75736c79207468657265d57320616e20617766756c206c6f74206d6f726520626f696c6572706c61746520686572652c20627574207468657265d57320616c736f2061206c6f74206d6f726520666c65786962696c697479> 89.84375 <2e>] TJ
ET
@@ -57713,7 +57826,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24 174.40600000000012 Td
+48.24 248.10600000000005 Td
/F2.0 13 Tf
<322e322e332e20> Tj
ET
@@ -57724,7 +57837,7 @@ ET
0.694 0.129 0.275 SCN
BT
-84.83500000000001 174.40600000000012 Td
+84.83500000000001 248.10600000000005 Td
/F3.0 13 Tf
<67657449642829> Tj
ET
@@ -57737,7 +57850,7 @@ ET
0.897 Tw
BT
-48.24 147.8460000000001 Td
+48.24 221.54600000000005 Td
/F1.0 10.5 Tf
<54686520> Tj
ET
@@ -57752,7 +57865,7 @@ ET
0.897 Tw
BT
-70.55667647058823 147.8460000000001 Td
+70.55667647058823 221.54600000000005 Td
/F3.0 10.5 Tf
<67657449642829> Tj
ET
@@ -57767,7 +57880,7 @@ ET
0.897 Tw
BT
-107.30667647058823 147.8460000000001 Td
+107.30667647058823 221.54600000000005 Td
/F1.0 10.5 Tf
<206d6574686f64206170706c696573206f6e6c7920746f20646f6d61696e2073657276696365732c20616e64206973207573656420746f2070726f76696465206120756e6971756520616c69617320666f7220746865> Tj
ET
@@ -57780,7 +57893,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24 132.0660000000001 Td
+48.24 205.76600000000005 Td
/F1.0 10.5 Tf
<646f6d61696e2073657276696365d57320636c617373206e616d652e> Tj
ET
@@ -57793,7 +57906,7 @@ ET
0.205 Tw
BT
-48.24 104.28600000000009 Td
+48.24 177.98600000000005 Td
/F1.0 10.5 Tf
[<546869732076616c7565206973207573656420696e7465726e616c6c7920746f2067656e6572> 20.01953125 <617465206120737472696e6720726570726573656e746174696f6e206f6620616e2073657276696365206964656e74697479202874686520>] TJ
ET
@@ -57808,7 +57921,7 @@ ET
0.205 Tw
BT
-500.93923718261715 104.28600000000009 Td
+500.93923718261715 177.98600000000005 Td
/F3.0 10.5 Tf
<4f6964> Tj
ET
@@ -57823,7 +57936,7 @@ ET
0.205 Tw
BT
-516.6892371826171 104.28600000000009 Td
+516.6892371826171 177.98600000000005 Td
/F1.0 10.5 Tf
<292e2054686973> Tj
ET
@@ -57836,7 +57949,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24 88.50600000000009 Td
+48.24 162.20600000000005 Td
/F1.0 10.5 Tf
[<63616e2061707065617220696e207365766572> 20.01953125 <616c20636f6e74657874732c20696e636c7564696e673a>] TJ
ET
@@ -57849,7 +57962,7 @@ ET
0.200 0.200 0.200 SCN
BT
-56.88050000000001 60.726000000000084 Td
+56.88050000000001 134.42600000000004 Td
/F1.0 10.5 Tf
<a5> Tj
ET
@@ -57864,7 +57977,7 @@ ET
5.114 Tw
BT
-66.24000000000001 60.726000000000084 Td
+66.24000000000001 134.42600000000004 Td
/F1.0 10.5 Tf
<6173207468652076616c7565206f6620> Tj
ET
@@ -57879,7 +57992,7 @@ ET
5.114 Tw
BT
-161.62366666666668 60.726000000000084 Td
+161.62366666666668 134.42600000000004 Td
/F3.0 10.5 Tf
<426f6f6b6d61726b236765744f626a656374547970652829> Tj
ET
@@ -57894,7 +58007,7 @@ ET
5.114 Tw
BT
-287.6236666666667 60.726000000000084 Td
+287.6236666666667 134.42600000000004 Td
/F1.0 10.5 Tf
<20616e6420696e2074686520> Tj
ET
@@ -57909,7 +58022,7 @@ ET
5.114 Tw
BT
-364.1598333333333 60.726000000000084 Td
+364.1598333333333 134.42600000000004 Td
/F3.0 10.5 Tf
<746f537472696e672829> Tj
ET
@@ -57924,7 +58037,7 @@ ET
5.114 Tw
BT
-416.6598333333333 60.726000000000084 Td
+416.6598333333333 134.42600000000004 Td
/F1.0 10.5 Tf
<2076616c7565206f6620> Tj
ET
@@ -57939,7 +58052,7 @@ ET
5.114 Tw
BT
-477.6030833333333 60.726000000000084 Td
+477.6030833333333 134.42600000000004 Td
/F3.0 10.5 Tf
<426f6f6b6d61726b> Tj
ET
@@ -57954,7 +58067,7 @@ ET
5.114 Tw
BT
-519.6030833333333 60.726000000000084 Td
+519.6030833333333 134.42600000000004 Td
/F1.0 10.5 Tf
<2028736565> Tj
ET
@@ -57963,60 +58076,11 @@ ET
0.000 Tw
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-q
-0.000 0.000 0.000 scn
-0.000 0.000 0.000 SCN
-1 w
-0 J
-0 j
-[ ] 0 d
-/Stamp1 Do
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-BT
-49.24 14.388 Td
-/F1.0 9 Tf
-<3234> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-Q
-Q
-
-endstream
-endobj
-308 0 obj
-<< /Type /Page
-/Parent 3 0 R
-/MediaBox [0 0 595.28 841.89]
-/Contents 307 0 R
-/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F3.0 18 0 R
-/F1.0 8 0 R
-/F2.0 16 0 R
->>
-/XObject << /Stamp1 1049 0 R
->>
->>
->>
-endobj
-309 0 obj
-[308 0 R /XYZ 0 193.09000000000012 null]
-endobj
-310 0 obj
-<< /Length 19086
->>
-stream
-q
-/DeviceRGB cs
0.694 0.129 0.275 scn
-/DeviceRGB CS
0.694 0.129 0.275 SCN
BT
-66.24000000000001 794.6759999999999 Td
+66.24000000000001 118.64600000000004 Td
/F3.0 10.5 Tf
<426f6f6b6d61726b53657276696365> Tj
ET
@@ -58027,7 +58091,7 @@ ET
0.200 0.200 0.200 SCN
BT
-144.99 794.6759999999999 Td
+144.99 118.64600000000004 Td
/F1.0 10.5 Tf
<29> Tj
ET
@@ -58040,7 +58104,7 @@ ET
0.200 0.200 0.200 SCN
BT
-56.88050000000001 772.896 Td
+56.88050000000001 96.86600000000004 Td
/F1.0 10.5 Tf
<a5> Tj
ET
@@ -58053,7 +58117,7 @@ ET
0.200 0.200 0.200 SCN
BT
-66.24000000000001 772.896 Td
+66.24000000000001 96.86600000000004 Td
/F1.0 10.5 Tf
<696e207468652073657269616c697a6174696f6e206f6620> Tj
ET
@@ -58064,7 +58128,7 @@ ET
0.694 0.129 0.275 SCN
BT
-175.44 772.896 Td
+175.44 96.86600000000004 Td
/F3.0 10.5 Tf
<4f696444746f> Tj
ET
@@ -58075,7 +58139,7 @@ ET
0.200 0.200 0.200 SCN
BT
-206.94000000000003 772.896 Td
+206.94000000000003 96.86600000000004 Td
/F1.0 10.5 Tf
<20696e2074686520> Tj
ET
@@ -58086,7 +58150,7 @@ ET
0.259 0.545 0.792 SCN
BT
-241.19100000000003 772.896 Td
+241.19100000000003 96.86600000000004 Td
/F1.0 10.5 Tf
<636f6d6d616e64> Tj
ET
@@ -58097,7 +58161,7 @@ ET
0.200 0.200 0.200 SCN
BT
-291.34950000000003 772.896 Td
+291.34950000000003 96.86600000000004 Td
/F1.0 10.5 Tf
<20616e6420> Tj
ET
@@ -58108,7 +58172,7 @@ ET
0.259 0.545 0.792 SCN
BT
-315.8985 772.896 Td
+315.8985 96.86600000000004 Td
/F1.0 10.5 Tf
[<696e746572> 20.01953125 <616374696f6e>] TJ
ET
@@ -58119,7 +58183,7 @@ ET
0.200 0.200 0.200 SCN
BT
-371.01279492187507 772.896 Td
+371.01279492187507 96.86600000000004 Td
/F1.0 10.5 Tf
<20736368656d6173> Tj
ET
@@ -58132,7 +58196,7 @@ ET
0.200 0.200 0.200 SCN
BT
-56.88050000000001 751.116 Td
+56.88050000000001 75.08600000000004 Td
/F1.0 10.5 Tf
<a5> Tj
ET
@@ -58145,7 +58209,7 @@ ET
0.200 0.200 0.200 SCN
BT
-66.24000000000001 751.116 Td
+66.24000000000001 75.08600000000004 Td
/F1.0 10.5 Tf
<696e207468652055524c73206f662074686520> Tj
ET
@@ -58156,7 +58220,7 @@ ET
0.259 0.545 0.792 SCN
BT
-157.50600000000003 751.116 Td
+157.50600000000003 75.08600000000004 Td
/F1.0 10.5 Tf
<5265737466756c4f626a6563747320766965776572> Tj
ET
@@ -58169,7 +58233,7 @@ ET
0.200 0.200 0.200 SCN
BT
-56.88050000000001 729.336 Td
+56.88050000000001 53.30600000000004 Td
/F1.0 10.5 Tf
<a5> Tj
ET
@@ -58182,7 +58246,7 @@ ET
0.200 0.200 0.200 SCN
BT
-66.24000000000001 729.336 Td
+66.24000000000001 53.30600000000004 Td
/F1.0 10.5 Tf
<696e207468652055524c73206f662074686520> Tj
ET
@@ -58193,7 +58257,7 @@ ET
0.259 0.545 0.792 SCN
BT
-157.50600000000003 729.336 Td
+157.50600000000003 53.30600000000004 Td
/F1.0 10.5 Tf
[<5769636b> 20.01953125 <657420766965776572>] TJ
ET
@@ -58204,18 +58268,123 @@ ET
0.200 0.200 0.200 SCN
BT
-229.609294921875 729.336 Td
+229.609294921875 53.30600000000004 Td
/F1.0 10.5 Tf
[<20287370656369666963616c6c79> 89.84375 <2c20666f7220626f6f6b6d61726b> 20.01953125 <656420616374696f6e7329>] TJ
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
+q
+0.000 0.000 0.000 scn
+0.000 0.000 0.000 SCN
+1 w
+0 J
+0 j
+[ ] 0 d
+/Stamp1 Do
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
BT
-48.24000000000001 697.5060000000001 Td
+49.24 14.388 Td
+/F1.0 9 Tf
+<3234> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+Q
+Q
+
+endstream
+endobj
+314 0 obj
+<< /Type /Page
+/Parent 3 0 R
+/MediaBox [0 0 595.28 841.89]
+/Contents 313 0 R
+/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
+/Font << /F3.0 18 0 R
+/F1.0 8 0 R
+/F2.0 16 0 R
+>>
+/XObject << /Stamp1 1031 0 R
+>>
+>>
+/Annots [316 0 R 317 0 R 318 0 R 319 0 R 320 0 R]
+>>
+endobj
+315 0 obj
+[314 0 R /XYZ 0 266.7900000000001 null]
+endobj
+316 0 obj
+<< /Border [0 0 0]
+/A << /Type /Action
+/S /URI
+/URI (../rgsvc/rgsvc.pdf#_rgsvc_integration-api_BookmarkService)
+>>
+/Subtype /Link
+/Rect [66.24000000000001 117.17600000000004 144.99 127.67600000000004]
+/Type /Annot
+>>
+endobj
+317 0 obj
+<< /Border [0 0 0]
+/A << /Type /Action
+/S /URI
+/URI (../rgcms/rgcms.pdf#_rgcms_schema-cmd)
+>>
+/Subtype /Link
+/Rect [241.19100000000003 93.80000000000004 291.34950000000003 108.08000000000004]
+/Type /Annot
+>>
+endobj
+318 0 obj
+<< /Border [0 0 0]
+/A << /Type /Action
+/S /URI
+/URI (../rgcms/rgcms.pdf#_rgcms_schema-ixn)
+>>
+/Subtype /Link
+/Rect [315.8985 93.80000000000004 371.01279492187507 108.08000000000004]
+/Type /Annot
+>>
+endobj
+319 0 obj
+<< /Border [0 0 0]
+/A << /Type /Action
+/S /URI
+/URI (../ugvro/ugvro.pdf)
+>>
+/Subtype /Link
+/Rect [157.50600000000003 72.02000000000004 266.1705 86.30000000000004]
+/Type /Annot
+>>
+endobj
+320 0 obj
+<< /Border [0 0 0]
+/A << /Type /Action
+/S /URI
+/URI (../ugvw/ugvw.pdf)
+>>
+/Subtype /Link
+/Rect [157.50600000000003 50.24000000000004 229.609294921875 64.52000000000004]
+/Type /Annot
+>>
+endobj
+321 0 obj
+<< /Length 20976
+>>
+stream
+q
+/DeviceRGB cs
+0.200 0.200 0.200 scn
+/DeviceRGB CS
+0.200 0.200 0.200 SCN
+
+BT
+48.24000000000001 794.6759999999999 Td
/F2.0 10.5 Tf
<4578616d706c65> Tj
ET
@@ -58226,7 +58395,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24000000000001 671.6760000000002 Td
+48.24000000000001 768.846 Td
/F1.0 10.5 Tf
[<46> 40.0390625 <6f72206578616d706c653a>] TJ
ET
@@ -58235,28 +58404,28 @@ ET
0.000 0.000 0.000 scn
q
0.961 0.961 0.961 scn
-52.240 655.860 m
-543.040 655.860 l
-545.249 655.860 547.040 654.069 547.040 651.860 c
-547.040 564.160 l
-547.040 561.951 545.249 560.160 543.040 560.160 c
-52.240 560.160 l
-50.031 560.160 48.240 561.951 48.240 564.160 c
-48.240 651.860 l
-48.240 654.069 50.031 655.860 52.240 655.860 c
+52.240 753.030 m
+543.040 753.030 l
+545.249 753.030 547.040 751.239 547.040 749.030 c
+547.040 661.330 l
+547.040 659.121 545.249 657.330 543.040 657.330 c
+52.240 657.330 l
+50.031 657.330 48.240 659.121 48.240 661.330 c
+48.240 749.030 l
+48.240 751.239 50.031 753.030 52.240 753.030 c
h
f
0.800 0.800 0.800 SCN
0.75 w
-52.240 655.860 m
-543.040 655.860 l
-545.249 655.860 547.040 654.069 547.040 651.860 c
-547.040 564.160 l
-547.040 561.951 545.249 560.160 543.040 560.160 c
-52.240 560.160 l
-50.031 560.160 48.240 561.951 48.240 564.160 c
-48.240 651.860 l
-48.240 654.069 50.031 655.860 52.240 655.860 c
+52.240 753.030 m
+543.040 753.030 l
+545.249 753.030 547.040 751.239 547.040 749.030 c
+547.040 661.330 l
+547.040 659.121 545.249 657.330 543.040 657.330 c
+52.240 657.330 l
+50.031 657.330 48.240 659.121 48.240 661.330 c
+48.240 749.030 l
+48.240 751.239 50.031 753.030 52.240 753.030 c
h
S
Q
@@ -58264,7 +58433,7 @@ Q
0.600 0.600 1.000 SCN
BT
-59.24000000000001 633.0350000000002 Td
+59.24000000000001 730.205 Td
/F3.0 11 Tf
<40446f6d61696e53657276696365> Tj
ET
@@ -58275,7 +58444,7 @@ ET
0.000 0.400 0.600 SCN
BT
-59.24000000000001 618.2950000000002 Td
+59.24000000000001 715.465 Td
/F3.0 11 Tf
<7075626c6963> Tj
ET
@@ -58286,7 +58455,7 @@ ET
0.200 0.200 0.200 SCN
BT
-92.24000000000001 618.2950000000002 Td
+92.24000000000001 715.465 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -58297,7 +58466,7 @@ ET
0.000 0.467 0.533 SCN
BT
-97.74000000000001 618.2950000000002 Td
+97.74000000000001 715.465 Td
/F3.0 11 Tf
<636c617373> Tj
ET
@@ -58308,7 +58477,7 @@ ET
0.200 0.200 0.200 SCN
BT
-125.24000000000001 618.2950000000002 Td
+125.24000000000001 715.465 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -58319,7 +58488,7 @@ ET
0.000 0.667 0.533 SCN
BT
-130.74 618.2950000000002 Td
+130.74 715.465 Td
/F3.0 11 Tf
<4f726465724d656e75> Tj
ET
@@ -58330,7 +58499,7 @@ ET
0.200 0.200 0.200 SCN
BT
-180.24 618.2950000000002 Td
+180.24 715.465 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -58341,7 +58510,7 @@ ET
0.200 0.200 0.200 SCN
BT
-185.74 618.2950000000002 Td
+185.74 715.465 Td
/F3.0 11 Tf
<7b> Tj
ET
@@ -58352,7 +58521,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24000000000001 603.5550000000003 Td
+59.24000000000001 700.7250000000001 Td
/F3.0 11 Tf
<ca202020> Tj
ET
@@ -58363,7 +58532,7 @@ ET
0.200 0.200 0.200 SCN
BT
-81.24000000000001 603.5550000000003 Td
+81.24000000000001 700.7250000000001 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -58374,7 +58543,7 @@ ET
0.200 0.200 0.200 SCN
BT
-86.74000000000001 603.5550000000003 Td
+86.74000000000001 700.7250000000001 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -58385,7 +58554,7 @@ ET
0.200 0.200 0.200 SCN
BT
-92.24000000000001 603.5550000000003 Td
+92.24000000000001 700.7250000000001 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -58396,7 +58565,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24000000000001 588.8150000000003 Td
+59.24000000000001 685.9850000000001 Td
/F3.0 11 Tf
<ca202020> Tj
ET
@@ -58407,7 +58576,7 @@ ET
0.200 0.200 0.200 SCN
BT
-81.24000000000001 588.8150000000003 Td
+81.24000000000001 685.9850000000001 Td
/F3.0 11 Tf
<7075626c6963> Tj
ET
@@ -58418,7 +58587,7 @@ ET
0.200 0.200 0.200 SCN
BT
-114.24000000000001 588.8150000000003 Td
+114.24000000000001 685.9850000000001 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -58429,7 +58598,7 @@ ET
0.000 0.467 0.533 SCN
BT
-119.74000000000001 588.8150000000003 Td
+119.74000000000001 685.9850000000001 Td
/F3.0 11 Tf
<537472696e67> Tj
ET
@@ -58440,7 +58609,7 @@ ET
0.200 0.200 0.200 SCN
BT
-152.74 588.8150000000003 Td
+152.74 685.9850000000001 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -58451,7 +58620,7 @@ ET
0.200 0.200 0.200 SCN
BT
-158.24 588.8150000000003 Td
+158.24 685.9850000000001 Td
/F3.0 11 Tf
<6765744964> Tj
ET
@@ -58462,7 +58631,7 @@ ET
0.200 0.200 0.200 SCN
BT
-185.74 588.8150000000003 Td
+185.74 685.9850000000001 Td
/F3.0 11 Tf
<28> Tj
ET
@@ -58473,7 +58642,7 @@ ET
0.200 0.200 0.200 SCN
BT
-191.24 588.8150000000003 Td
+191.24 685.9850000000001 Td
/F3.0 11 Tf
<29> Tj
ET
@@ -58484,7 +58653,7 @@ ET
0.200 0.200 0.200 SCN
BT
-196.74 588.8150000000003 Td
+196.74 685.9850000000001 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -58495,7 +58664,7 @@ ET
0.200 0.200 0.200 SCN
BT
-202.24 588.8150000000003 Td
+202.24 685.985000000000
<TRUNCATED>
[19/39] isis-site git commit: ISIS-1810: updates docs for 2.0.0-M1
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/274edd1d/content/versions/SNAPSHOT/elasticlunr/index.json
----------------------------------------------------------------------
diff --git a/content/versions/SNAPSHOT/elasticlunr/index.json b/content/versions/SNAPSHOT/elasticlunr/index.json
index 5cde563..e8bd10a 100644
--- a/content/versions/SNAPSHOT/elasticlunr/index.json
+++ b/content/versions/SNAPSHOT/elasticlunr/index.json
@@ -1 +1 @@
-{"version":"0.9.5","fields":["title","body","description","url"],"ref":"id","documentStore":{"docs":{"372886":{"title":"Rows, full-width cols, and tabs","url":"guides/ugvw/ugvw.html#_rows_full_width_cols_and_tabs","body":"Rows, full-width cols, and tabs The example layout consists of three rows: a row for the object/icon, a row containing a properties, and a row containing collections. In all three cases the row contains a single column spanning the full width of the page. For the property and collection rows, the column contains a tab group. This corresponds to the following XML: You will notice that one of the columns has an unreferencedActions attribute, while one of the tabGroups has a similar unreferencedCollections attribute. This topic is discussed in more detail below. ","description":" The example layout consists of three rows: a row for the object/icon, a row containing a properties, and a row containing collections. In all three cases the row contains a single column s
panning the full width of the page. For the property and collection rows, the column contains a","id":372886},"2646929":{"title":"Apache Isis vs …","url":"guides/ugfun/ugfun.html#_ugfun_core-concepts_apache-isis-vs","body":"Apache Isis vs … Many other frameworks promise rapid application development and provide automatically generated user interfaces, so how do they compare to Apache Isis? ","description":" Many other frameworks promise rapid application development and provide automatically generated user interfaces, so how do they compare to Apache Isis? ","id":2646929},"3836440":{"title":"Running","url":"guides/dg/dg.html#__dg_ide_intellij_running","body":"Running Let’s see how to run both the app and the tests. ","description":" Let’s see how to run both the app and the tests. ","id":3836440},"11600575":{"title":"Using Contributions","url":"pages/tg/tg.html#_using_contributions","body":"Using Contributions ","description":"","id":11600575},"12196042":{"title":"Te
rtiary Menu","url":"guides/ugvw/ugvw.html#_tertiary_menu","body":"Tertiary Menu Domain services' actions can be associated with the tertiary menu using the same @DomainServiceLayout annotation, but be aware that the @DomainServiceLayout#name() attribute will be ignored (there is only one effective menu). For example, the updateEpochDate(…) and listAllSettings(…) actions come from the following service: Because the number of items on the tertiary menu is expected to be small and most will pertain to the current user, the viewer does not place dividers between actions from different services on the tertiary menu. ","description":" Domain services' actions can be associated with the tertiary menu using the same @DomainServiceLayout annotation, but be aware that the @DomainServiceLayout#name() attribute will be ignored (there is only one effective menu). ","id":12196042},"12649581":{"title":"Mark the version as released","url":"guides/cgcom/cgcom.html#_mark_the_version_as_r
eleased","body":"Mark the version as released In JIRA, go to the administration section for the Apache Isis project and update the version as being released. In the Kanban view this will have the effect of marking all tickets as released (clearing the \"done\" column). ","description":" In JIRA, go to the administration section for the Apache Isis project and update the version as being released. ","id":12649581},"13573617":{"title":"hide…()","url":"guides/rgcms/rgcms.html#_rgcms_methods_prefixes_hide","body":"hide…() The hide…() supporting method is called for properties, collections and actions. It allows the property/collection to be completely hidden from view. It’s comparatively rare for properties or collections to be imperatively hidden from view, but actions are sometimes hidden or shown visible (as opposed to being just disabled, ie greyed out). The signature of the supporting method is simply: Returning true will hide the property, collection or acti
on, returning false leaves it visible. For example, to hide an action: Or, to hide a property: ","description":" The hide…() supporting method is called for properties, collections and actions. It allows the property/collection to be completely hidden from view. ","id":13573617},"14290952":{"title":"Vetoing Visibility","url":"guides/htg.html#_ugbtb_hints-and-tips_vetoing-visibility","body":"Vetoing Visibility eg if included an addon such as auditing or security. solution is to write a domain event subscriber that vetoes the visibility All the addons actions inherit from common base classes so this can be as broad-brush or fine-grained as required ","description":" eg if included an addon such as auditing or security. ","id":14290952},"14971197":{"title":"Suppressing 'remember me'","url":"guides/ugvw/ugvw.html#_ugvw_configuration-properties_suppressing-remember-me","body":"Suppressing 'remember me' The 'remember me' checkbox on the login page can be suppressed, if required
, by setting a configuration flag. ","description":" The 'remember me' checkbox on the login page can be suppressed, if required, by setting a configuration flag. ","id":14971197},"16629694":{"title":"allowLateRegistration","url":"migration-notes/migration-notes.html#__code_allowlateregistration_code","body":"allowLateRegistration One possible issue is that (as per ISIS-830) the EventBusService is now initialized as one of the first domain services; this is to ensure that any object lifecycle events caused by domain services initializing themselves can be posted on the event bus for subscribers. The typical case for such lifecycle events to occur is from domain services that seed reference data; one such example can be found in the (non-ASF) Incode Platform's security module. In previous releases, the ordering of initialization for the EventBusService was undefined (but would typically be towards the \"end\" of the list of services. What this meant in practice is that it generally
didn’t matter whether (domain service) subscribers were initialized before or after seed services. Now, though, because the EventBusService is initialized early on, it proactively checks that all subscribers have been registered before any event posts occur (so that no events get missed). If any subscriber attempts to register after at least one event has been posted, then the service will fail fast and the framework will not start. The error looks something like: To ensure that subscriber domain services are initialized before \"seed\" domain services, the @DomainServiceLayout#menuOrder() attribute can be used. Normally this attribute is just used to order UI-visible services on the menu bars, but it also is used internally to sequence the internal list of services being initialized. Alternatively, you can disable this checking within the EventBusService using: If you do that, be aware that not all subscribers may not receive some events generated by other domain services.
For more details, see the EventBusService man page. ","description":" One possible issue is that (as per ISIS-830) the EventBusService is now initialized as one of the first domain services; this is to ensure that any object lifecycle events caused by domain services initializing themselves can be posted on the event bus for subscribers. The typical case for such","id":16629694},"17000573":{"title":"ObjectCreatedEvent","url":"guides/rgcms/rgcms.html#_rgcms_classes_lifecycleevent_ObjectCreatedEvent","body":"ObjectCreatedEvent Subclass of AbstractLifecycleEvent, broadcast when an object is first instantiated using the DomainObjectContainer's #newTransientInstance(…) method. ObjectCreatedEvent.Default is the concrete implementation that is used. ","description":" Subclass of AbstractLifecycleEvent, broadcast when an object is first instantiated using the DomainObjectContainer's #newTransientInstance(…) method. ","id":17000573},"17618894":{"title":"New Feature","url":"releas
e-notes/release-notes.html#_new_feature_20","body":"New Feature ","description":"","id":17618894},"18445041":{"title":"Verifying Releases","url":"downloads.html#_verifying_releases","body":"Verifying Releases ","description":"","id":18445041},"19254915":{"title":"API & Implementation","url":"guides/rgsvc/rgsvc.html#_api_implementation_7","body":"API & Implementation The CommandContext request-scoped service defines the following very simple API: This class (o.a.i.applib.services.CommandContext) is also the default implementation. Under normal circumstances there shouldn’t be any need to replace this implementation with another. But if you do need to for some reason, then subclass and use @DomainServiceLayout#menuOrder() (as explained in the introduction to this guide). The Command type referenced above is in fact an interface, defined as: ","description":" The CommandContext request-scoped service defines the following very simple API: ","id":19254915},"21190750":{"title":"Run
the archetype","url":"pages/tg/tg.html#_run_the_archetype","body":"Run the archetype ","description":"","id":21190750},"21212015":{"title":"Key features","url":"pages/powered-by/powered-by.html#_key_features","body":"Key features ","description":"","id":21212015},"21857601":{"title":"Other Guides","url":"guides/cgcom/cgcom.html#_other_guides","body":"Other Guides Apache Isis documentation is broken out into a number of user, reference and \"supporting procedures\" guides. The user guides available are: The reference guides are: The remaining guides are: This guide provides guidance for Apache Isis' own committers. ","description":" Apache Isis documentation is broken out into a number of user, reference and \"supporting procedures\" guides. ","id":21857601},"22342496":{"title":"Deploy","url":"guides/cgcom/cgcom.html#__cgcom_cutting-a-release_releasing-core_deploy","body":"Deploy Previously the release procedures used mvn release:prepare and mvn release:perform. These are howe
ver not compatible with ${revision} that we now use for CI/CD. We therefore just use mvn deploy directly, activating the (inherited) apache-release profile that, amongst other things, brings in the gpg plugin for code signing. To build and deploy and tag, we use: using your own GPG passphrase, of course. ","description":" Previously the release procedures used mvn release:prepare and mvn release:perform. These are however not compatible with ${revision} that we now use for CI/CD. ","id":22342496},"23125949":{"title":"Editing","url":"guides/dg/dg.html#__dg_ide_intellij_hints-and-tips_editing","body":"Editing ","description":"","id":23125949},"23524101":{"title":"Collections","url":"guides/ugvw/ugvw.html#_collections","body":"Collections In the final row the collections are placed in tabs, simply one collection per tab. This corresponds to the following XML: As with properties, actions can be associated with collections; this indicates that they should be rendered in the collecti
on’s header. ","description":" In the final row the collections are placed in tabs, simply one collection per tab. This corresponds to the following XML: ","id":23524101},"26509816":{"title":"Commit changes","url":"guides/cgcom/cgcom.html#__cgcom_cutting-a-release_releasing-core_commit-changes","body":"Commit changes Commit any changes from the preceding steps: ","description":" Commit any changes from the preceding steps: ","id":26509816},"27806498":{"title":"renderedAsDayBefore()","url":"guides/rgant/rgant.html#_rgant-ParameterLayout_renderedAsDayBefore","body":"renderedAsDayBefore() The renderedAsDayBefore() attribute applies only to date parameters whereby the date will be rendered as the day before the value actually held in the domain object. It is ignored for parameters of other types. This attribute is also supported for properties. This behaviour might at first glance appear odd, but the rationale is to support the use case of a sequence of instances that represent adj
acent intervals of time. In such cases there would typically be startDate and endDate properties, eg for all of Q2. Storing this as a half-closed interval — eg [1-Apr-2015, 1-July-2015) — can substantially simplify internal algorithms; the endDate of one interval will correspond to the startDate of the next. However, from an end-user perspective the requirement may be to render the interval as a fully closed interval; eg the end date should be shown as 30-Jun-2015. This attribute therefore bridges the gap; it presents the information in a way that makes sense to an end-user, but also stores the domain object in a way that is easy work with internally. For example: ","description":" The renderedAsDayBefore() attribute applies only to date parameters whereby the date will be rendered as the day before the value actually held in the domain object. It is ignored for parameters of other types. This attribute is also supported for properties. ","id":27806498},"31312523":{"title":"D
eclarative style","url":"guides/htg.html#_declarative_style_3","body":"Declarative style To render an object with a particular CSS, use @DomainObjectLayout#cssClass(). When the domain object is rendered on its own page, this CSS class will appear on a top-level <div>. Or, when the domain object is rendered as a row in a collection, then the CSS class will appear in a <div> wrapped by the <tr> of the row. One possible use case would be to render the most important object types with a subtle background colour: Customers shown in light green, or Orders shown in a light pink, for example. ","description":" To render an object with a particular CSS, use @DomainObjectLayout#cssClass(). ","id":31312523},"31857620":{"title":"Interacting with the services","url":"guides/rgsvc/rgsvc.html#_interacting_with_the_services","body":"Interacting with the services Typically domain objects will have little need to interact with the CommandContext and Command directly; what is more useful is that t
hese are persisted in support of the various use cases identified above. One case however where a domain object might want to obtain the Command is to determine whether it has been invoked in the foreground, or in the background. It can do this using the getExecutedIn() method: Although not often needed, this then allows the domain object to access the Command object through the CommandContext service. To expand th above example: If run in the background, it might then notify the user (eg by email) if all work is done. This leads us onto a related point, distinguishing the current effective user vs the originating \"real\" user. When running in the foreground, the current user can be obtained from the UserService, using: If running in the background, however, then the current user will be the credentials of the background process, for example as run by a Quartz scheduler job. The domain object can still obtain the original (\"effective\") user that caused the job to be created
, using: ","description":" Typically domain objects will have little need to interact with the CommandContext and Command directly; what is more useful is that these are persisted in support of the various use cases identified above. ","id":31857620},"31966407":{"title":"Icons","url":"guides/htg.html#_icons","body":"Icons Action icons can be specified in several ways. One option is to use the @ActionLayout#cssClassFa(). For example: Alternatively, you can specify these hints dynamically in the Xxx.layout.xml for the entity: Rather than annotating every action with @ActionLayout#cssClassFa() and @ActionLayout#cssClass() you can instead specify the UI hint globally using regular expressions. Not only does this save a lot of boilerplate/editing, it helps ensure consistency across all actions. To declare fa classes globally, use the configuration property isis.reflector.facet.cssClassFa.patterns (a comma separated list of key:value pairs). For example: Here: For example, \"fa-pl
us\" is applied to all action members called \"newXxx\" ","description":" Action icons can be specified in several ways. ","id":31966407},"36571775":{"title":"runtime-legacy","url":"migration-notes/migration-notes.html#_runtime_legacy","body":"runtime-legacy ","description":"","id":36571775},"36734123":{"title":"Bug","url":"release-notes/release-notes.html#_bug_8","body":"Bug ","description":"","id":36734123},"39248326":{"title":"Runtime vs Noop implementation","url":"guides/rgfis/rgfis.html#_runtime_vs_noop_implementation","body":"Runtime vs Noop implementation The framework provides two implementations: The …Default implementation takes priority over the …Noop implementation. ","description":" The framework provides two implementations: ","id":39248326},"39290887":{"title":"Implementation","url":"guides/rgsvc/rgsvc.html#_implementation_22","body":"Implementation The core framework provides a default implementation of this service (o.a.i.core.metamodel.services.contain
er.DomainObjectContainerDefault). ","description":" The core framework provides a default implementation of this service (o.a.i.core.metamodel.services.container.DomainObjectContainerDefault). ","id":39290887},"42240053":{"title":"Screenshots","url":"guides/ugvw/ugvw.html#_screenshots_9","body":"Screenshots With 'password reset' not suppressed (the default): and with the link suppressed: ","description":" With 'password reset' not suppressed (the default): ","id":42240053},"44483327":{"title":"New Feature","url":"release-notes/release-notes.html#_new_feature_17","body":"New Feature ","description":"","id":44483327},"45128293":{"title":"getConfigurationProperties()","url":"guides/rgcms/rgcms.html#__rgcms_classes_AppManifest-bootstrapping_api_getConfigurationProperties","body":"getConfigurationProperties() This method allow arbitrary other configuration properties to be overridden. One common use case is in conjunction with the getFixtures() method, discussed above: ","description"
:" This method allow arbitrary other configuration properties to be overridden. One common use case is in conjunction with the getFixtures() method, discussed above: ","id":45128293},"45847666":{"title":"Recreate the archetype","url":"guides/cgcom/cgcom.html#__cgcom_cutting-a-release_releasing-the-helloworld-archetype_create-the-archetype","body":"Recreate the archetype Make sure you are in the correct directory and environment variables are correct. To recreate the helloworld archetype: Then, run the script (which also builds the archetype once generated) and then switch to the archetype’s directory: The script automatically commits its changes. If you wish use git log and git diff (or a tool such as SourceTree) to review changes made. ","description":" Make sure you are in the correct directory and environment variables are correct. ","id":45847666},"57327287":{"title":"cssClassFa()","url":"guides/rgant/rgant.html#_rgant-ViewModelLayout_cssClassFa","body":"cssClassFa() The
cssClassFa() attribute is used to specify the name of a Font Awesome icon name, to be rendered as the domain object’s icon. These attribute can also be applied to domain objects to specify the object’s icon, and to actions to specify an icon for the action’s representation as a button or menu item. If necessary the icon specified can be overridden by a particular object instance using the iconName() method. For example: There can be multiple \"fa-\" classes, eg to mirror or rotate the icon. There is no need to include the mandatory fa \"marker\" CSS class; it will be automatically added to the list. The fa- prefix can also be omitted from the class names; it will be prepended to each if required. The related cssClassFaPosition() attribute is currently unused for domain objects; the icon is always rendered to the left. ","description":" The cssClassFa() attribute is used to specify the name of a Font Awesome icon name, to be rendered as the domain object’s icon. ","id":5
7327287},"62314289":{"title":"Menu Bars Layout","url":"guides/ugvw/ugvw.html#_ugvw_menubars-layout","body":"Menu Bars Layout ","description":"","id":62314289},"64932464":{"title":"Other Guides","url":"guides/ugtst/ugtst.html#_other_guides","body":"Other Guides Apache Isis documentation is broken out into a number of user, reference and \"supporting procedures\" guides. The user guides available are: The reference guides are: The remaining guides are: ","description":" Apache Isis documentation is broken out into a number of user, reference and \"supporting procedures\" guides. ","id":64932464},"66604001":{"title":"@Programmatic","url":"guides/rgant/rgant.html#_rgant-Programmatic","body":"@Programmatic ","description":"","id":66604001},"68441589":{"title":"License headers","url":"guides/cgcom/cgcom.html#__cgcom_cutting-a-release_releasing-core_license-headers","body":"License headers The Apache Release Audit Tool RAT (from the Apache Creadur project) checks for missing license h
eader files. The parent pom.xml of each releasable module specifies the RAT Maven plugin, with a number of custom exclusions. To run the RAT tool, use: where rat.numUnapprovedLicenses property is set to a high figure, temporarily overriding the default value of 0. This will allow the command to run over all submodules, rather than failing after the first one. The command writes out a target\\rat.txt for each submodule. missing license notes are indicated using the key !???. The for command collates all the errors. Investigate and fix any reported violations, typically by either: To add missing headers, use the groovy script addmissinglicenses.groovy (in the scripts directory) to automatically insert missing headers for certain file types. The actual files checked are those with extensions specified in the line def fileEndings = [\".java\", \".htm\"]: (If the -x is omitted then the script is run in \"dry run\" mode). Once you’ve fixed all issues, confirm once more that apache-
rat-plugin no longer reports any license violations, this time leaving the rat.numUnapprovedLicenses property to its default, 0: ","description":" The Apache Release Audit Tool RAT (from the Apache Creadur project) checks for missing license header files. The parent pom.xml of each releasable module specifies the RAT Maven plugin, with a number of custom exclusions. ","id":68441589},"73703450":{"title":"New Feature","url":"release-notes/release-notes.html#_new_feature_29","body":"New Feature ","description":"","id":73703450},"74705826":{"title":"How to implement a spellchecker?","url":"guides/htg.html#_ugbtb_hints-and-tips_how-to-implement-a-spellchecker","body":"How to implement a spellchecker? From this thread on the Apache Isis users mailing list: One way to implement is to use the event bus: if if the change is made through an edit, you can use @Property#domainEvent(). You’ll need some way to know which fields should be spell checked. Two ways spring to mind: And you’ll
(obviously) also need some sort of spell checker implementation to call. ","description":" From this thread on the Apache Isis users mailing list: ","id":74705826},"75054401":{"title":"Supporting Method Prefixes","url":"guides/rgcms/rgcms.html#_rgcms_methods_prefixes","body":"Supporting Method Prefixes Supporting methods are those that are associated with properties, collections and actions, providing additional imperative business rule checking and behaviour to be performed when the user interacts with those object members. This association is performed by name matching. Thus, a property called \"firstName\", derived from a method getFirstName() may have supporting methods hideFirstName(), disableFirstName() and validateFirstName(). Supporting methods are, therefore, each characterized by their own particular prefix. The table below lists the method prefixes that are recognized as part of Apache Isis' default programming model. ","description":" Supporting methods are those tha
t are associated with properties, collections and actions, providing additional imperative business rule checking and behaviour to be performed when the user interacts with those object members. ","id":75054401},"77231561":{"title":"Interaction Execution","url":"guides/rgcms/rgcms.html#_rgcms_schema-ixn","body":"Interaction Execution The interaction (\"ixn\") schema defines the serialized form of an action invocation or a property edit. In fact, it actually defines a call-graph of such executions for those cases where the WrapperFactory is used to execute sub-actions/property edits. Each execution identifies the target object, the member to invoke, and the arguments. It also captures metrics about the execution, and the result of the execution (eg return value of an action invocation). ","description":" The interaction (\"ixn\") schema defines the serialized form of an action invocation or a property edit. In fact, it actually defines a call-graph of such executions for those case
s where the WrapperFactory is used to execute sub-actions/property edits. ","id":77231561},"78112488":{"title":"Screencast","url":"guides/ugvw/ugvw.html#_screencast","body":"Screencast This screencast describes the feature. ","description":" This screencast describes the feature. ","id":78112488},"78624086":{"title":"Other Guides","url":"guides/ugsec/ugsec.html#_other_guides","body":"Other Guides Apache Isis documentation is broken out into a number of user, reference and \"supporting procedures\" guides. The user guides available are: The reference guides are: The remaining guides are: ","description":" Apache Isis documentation is broken out into a number of user, reference and \"supporting procedures\" guides. ","id":78624086},"80534397":{"title":"ContentMappingService","url":"guides/rgsvc/rgsvc.html#_rgsvc_presentation-layer-spi_ContentMappingService","body":"ContentMappingService The ContentMappingService supports the (default implementation of the) ContentNegotiationServ
ice enabling the RestfulObjects viewer to represent domain objects in some other format as specified by the HTTP Accept header. See ContentNegotiationService for further discussion. ","description":" The ContentMappingService supports the (default implementation of the) ContentNegotiationService enabling the RestfulObjects viewer to represent domain objects in some other format as specified by the HTTP Accept header. ","id":80534397},"83803344":{"title":"MessageService","url":"guides/rgsvc/rgsvc.html#_rgsvc_application-layer-api_MessageService","body":"MessageService The MessageService allows domain objects to raise information, warning or error messages. These messages can either be simple strings, or can be translated. ","description":" The MessageService allows domain objects to raise information, warning or error messages. These messages can either be simple strings, or can be translated. ","id":83803344},"83933647":{"title":"Persistence Concerns","url":"guides/ugbtb/ugbtb.htm
l#_persistence_concerns","body":"Persistence Concerns ","description":"","id":83933647},"85931482":{"title":"Task","url":"release-notes/release-notes.html#_task_24","body":"Task ","description":"","id":85931482},"87271564":{"title":"2004:","url":"pages/articles-and-presentations/articles-and-presentations.html#_2004","body":"2004: ","description":"","id":87271564},"90561824":{"title":"Wicket Viewer","url":"release-notes/release-notes.html#_wicket_viewer_8","body":"Wicket Viewer ","description":"","id":90561824},"90935214":{"title":"Wicket Viewer","url":"release-notes/release-notes.html#_wicket_viewer_10","body":"Wicket Viewer ","description":"","id":90935214},"91902412":{"title":"The issue in more detail","url":"guides/ugodn/ugodn.html#_the_issue_in_more_detail","body":"The issue in more detail Consider these entities (yuml.me/b8681268): In the course of a transaction, the Agreement entity is loaded into memory (not necessarily modified), and then new AgreementRoles are associated
to it. All these entities implement Comparable using ObjectContracts, and the implementation of AgreementRole's (simplified) is: while Agreement's is implemented as: and Party's is similarly implemented as: DataNucleus’s persistence-by-reachability algorithm adds the AgreementRole instances into a SortedSet, which causes AgreementRole#compareTo() to fire: In other words, in figuring out whether AgreementRole requires the persistence-by-reachability algorithm to run, it causes the adjacent associated entity Party to also be retrieved. ","description":" Consider these entities (yuml.me/b8681268): ","id":91902412},"92467660":{"title":"API and Usage","url":"guides/ugtst/ugtst.html#_ugtst_fixture-scripts_api-and-usage","body":"API and Usage There are two main parts to using fixture scripts: the FixtureScripts domain service class, and the FixtureScript view model class: Let’s look at FixtureScripts domain service in more detail first. ","description":" There are two main part
s to using fixture scripts: the FixtureScripts domain service class, and the FixtureScript view model class: ","id":92467660},"96583162":{"title":"Configure toolchains plugin","url":"guides/cgcom/cgcom.html#_configure_toolchains_plugin","body":"Configure toolchains plugin Apache Isis releases are built using Java 7, enforced using the maven toolchains plugin. Ensure that Java 7 is installed and the toolchains plugin is configured, as described in the contributors' guide. ","description":" Apache Isis releases are built using Java 7, enforced using the maven toolchains plugin. Ensure that Java 7 is installed and the toolchains plugin is configured, as described in the contributors' guide. ","id":96583162},"99090360":{"title":"Running the App","url":"guides/ugfun/ugfun.html#__ugfun_getting-started_simpleapp-archetype_running-the-app","body":"Running the App The simpleapp archetype generates a single WAR file, configured to run both the Wicket viewer and the Restful Objects viewer. T
he archetype also configures the DataNucleus/JDO Objectstore to use an in-memory HSQLDB connection. Once you’ve built the app, you can run the WAR in a variety of ways. ","description":" The simpleapp archetype generates a single WAR file, configured to run both the Wicket viewer and the Restful Objects viewer. The archetype also configures the DataNucleus/JDO Objectstore to use an in-memory HSQLDB connection. ","id":99090360},"100682258":{"title":"Update dependencies","url":"guides/cgcom/cgcom.html#_update_dependencies","body":"Update dependencies With the release complete, now is a good time to bump versions of dependencies (so that there is a full release cycle to identify any possible issues). You will probably want to create a new JIRA ticket for these updates (or if minor then use the \"catch-all\" JIRA ticket raised earlier for the next release). ","description":" With the release complete, now is a good time to bump versions of dependencies (so that there is a full rele
ase cycle to identify any possible issues). ","id":100682258},"102347041":{"title":"Bug","url":"release-notes/release-notes.html#_bug_10","body":"Bug ","description":"","id":102347041},"104167755":{"title":"How to implement a spellchecker?","url":"guides/ugbtb/ugbtb.html#_ugbtb_hints-and-tips_how-to-implement-a-spellchecker","body":"How to implement a spellchecker? From this thread on the Apache Isis users mailing list: One way to implement is to use the event bus: if if the change is made through an edit, you can use @Property#domainEvent(). You’ll need some way to know which fields should be spell checked. Two ways spring to mind: And you’ll (obviously) also need some sort of spell checker implementation to call. ","description":" From this thread on the Apache Isis users mailing list: ","id":104167755},"105480253":{"title":"Visitor","url":"guides/ugbtb/ugbtb.html#__code_visitor_code","body":"Visitor More often than not, you’ll want to visit every element in the metamo
del, and so for this you can instead subclass from MetaModelValidatorVisiting.Visitor: You can then create your custom validator by subclassing MetaModelValidatorComposite and adding the visiting validator: If you have more than one rule then each can live in its own visitor. ","description":" More often than not, you’ll want to visit every element in the metamodel, and so for this you can instead subclass from MetaModelValidatorVisiting.Visitor: ","id":105480253},"106558909":{"title":"contributedAs()","url":"guides/rgant/rgant.html#_rgant-ActionLayout_contributedAs","body":"contributedAs() For a domain service action that can be contributed, the contributedAs() attribute determines how it is contributed: as an action or as an association (ie a property or collection). The distinction between property or collection is automatic: if the action returns a java.util.Collection (or subtype) then the action is contributed as a collection; otherwise it is contributed as a property.
For a domain service action to be contributed, the domain services must have a nature nature of either VIEW or VIEW_CONTRIBUTIONS_ONLY, and the action must have safe action semantics, and takes a single argument, namely the contributee domain object. For example: It’s also possible to use the attribute to suppress the action completely: In such cases, though, it would probably make more sense to annotate the action as either hidden or indeed @Programmatic. ","description":" For a domain service action that can be contributed, the contributedAs() attribute determines how it is contributed: as an action or as an association (ie a property or collection). ","id":106558909},"106606865":{"title":"Using the Wicket Viewer","url":"guides/rgcfg/rgcfg.html#_using_the_wicket_viewer","body":"Using the Wicket Viewer Most of the you’re likely to run Apache Isis using the Wicket viewer. In this case Apache Isis' \"deployment type\" concept maps to Wicket’s \"configuration\" concept: Wic
ket’s mechanism for specifying the \"configuration\" is to use a context parameter in web.xml; Apache Isis automatically infers its own deployment type from this. In other words: ","description":" Most of the you’re likely to run Apache Isis using the Wicket viewer. In this case Apache Isis' \"deployment type\" concept maps to Wicket’s \"configuration\" concept: ","id":106606865},"108815435":{"title":"unchanging()","url":"guides/rgant/rgant.html#_rgant-PropertyLayout_unchanging","body":"unchanging() The unchanging() attribute is used to indicate that the value held by the property never changes over time, even when other properties of the object do change. Setting this attribute to true is used as a hint to the viewer to not redraw the property after an AJAX update of some other property/ies of the object have changed. This is primarily for performance, eg can improve the user experience when rendering PDFs/blobs. Note that for this to work, the viewer will also ensure that
none of the property’s parent component (such as a tab group panel) are re-rendered. For example: ","description":" The unchanging() attribute is used to indicate that the value held by the property never changes over time, even when other properties of the object do change. ","id":108815435},"109833874":{"title":"Persistable","url":"guides/rgcms/rgcms.html#_rgcms_classes_mixins_Persistable","body":"Persistable All domain entities automatically implement the DataNucleus Persistable role interface as a result of the enhancer process (the fully qualified class name is org.datanucleus.enhancement.Persistable). So as a developer you do not need to write any code to obtain the mixins that contribute to this interface. These mixin properties/actions are all associated with the \"Metadata\" fieldset. A number of other mixins also contribute properties or actions to the \"Metadata\" fieldset. ","description":" All domain entities automatically implement the DataNucleus Persistable rol
e interface as a result of the enhancer process (the fully qualified class name is org.datanucleus.enhancement.Persistable). So as a developer you do not need to write any code to obtain the mixins that contribute to this interface. ","id":109833874},"112375674":{"title":"Auditing","url":"migration-notes/migration-notes.html#_auditing","body":"Auditing The AuditingService SPI service has been deprecated, instead replaced by the AuditerService. There can be more than one implementation of this new SPI, and a framework-provided implementation (AuditerServiceLogging) will log to a file. The (non-ASF) Incode Platform's audit module also implements the new SPI. ","description":" The AuditingService SPI service has been deprecated, instead replaced by the AuditerService. ","id":112375674},"113098816":{"title":"DataNucleus Object Store","url":"guides/htg.html#_datanucleus_object_store","body":"DataNucleus Object Store ","description":"","id":113098816},"115229271":{"title":"Domain Entiti
es","url":"guides/ugfun/ugfun.html#_ugfun_programming-model_domain-entities","body":"Domain Entities Entities are persistent domain objects, with their persistence handled by JDO/DataNucleus. As such, they are mapped to a persistent object store, typically an RDBMS, with DataNucleus taking care of both lazy loading and also the persisting of modified (\"dirty\") objects. Domain entities are generally decorated with both DataNucleus and Apache Isis annotations. Let’s look at some of the most commonly-used annotations. To start with, entities are flagged as being \"persistence capable\", indicating how JDO/DataNucleus should manage their identity: All domain entities will have some sort of mandatory key properties. The example below is a very simple case, where the entity is identified by a name property: It’s also common for domain entities to have queries annotated on them. These are used by repository domain services to query for instances of the entity: DataNucleus provi
des several APIs for defining queries, including entirely programmatic and type-safe APIs; but JDOQL is very similar to SQL and so easily learnt. The corresponding repository method for the above query is: ","description":" Entities are persistent domain objects, with their persistence handled by JDO/DataNucleus. As such, they are mapped to a persistent object store, typically an RDBMS, with DataNucleus taking care of both lazy loading and also the persisting of modified (\"dirty\") objects. ","id":115229271},"121574190":{"title":"Related Services","url":"guides/rgsvc/rgsvc.html#_related_services_18","body":"Related Services The ActionInteractionContext service allows bulk actions to co-ordinate with each other. The QueryResultsCache is useful for caching the results of expensive method calls. ","description":" The ActionInteractionContext service allows bulk actions to co-ordinate with each other. ","id":121574190},"121879267":{"title":"Wicket Viewer","url":"release-notes/releas
e-notes.html#_wicket_viewer_2","body":"Wicket Viewer ","description":"","id":121879267},"122762699":{"title":"Contributee","url":"guides/rgcms/rgcms.html#_rgcms_classes_contributee","body":"Contributee The interfaces listed in this chapter act as contributees; they allow domain services to contribute actions/properties/collections to any domain objects that implement these interfaces. ","description":" The interfaces listed in this chapter act as contributees; they allow domain services to contribute actions/properties/collections to any domain objects that implement these interfaces. ","id":122762699},"125299345":{"title":"Example","url":"guides/rgant/rgant.html#_example_2","body":"Example This example is taken from the (non-ASF) Isis addons' todoapp: ","description":" This example is taken from the (non-ASF) Isis addons' todoapp: ","id":125299345},"125961908":{"title":"Do it!","url":"pages/tg/tg.html#_do_it","body":"Do it! ","description":"","id":125961908},"134804772":{"title":
"How to handle void/null results","url":"guides/ugbtb/ugbtb.html#_ugbtb_hints-and-tips_how-to-handle-void-and-null-results","body":"How to handle void/null results From this thread on the Apache Isis users mailing list: One way to implement this idea is to provide a custom implementation of the RoutingService SPI domain service. The default implementation will either return the current object (if not null), else the home page (as defined by @HomePage) if one exists. The following custom implementation refines this to use the breadcrumbs (available in the Wicket viewer) to return the first non-deleted domain object found in the list of breadcrumbs: Note that the above implementation uses Java 8, so if you are using Java 7 then you’ll need to backport accordingly. ","description":" From this thread on the Apache Isis users mailing list: ","id":134804772},"144529895":{"title":"Improvement","url":"release-notes/release-notes.html#_improvement_44","body":"Improvement ","description
":"","id":144529895},"153666205":{"title":"Implementation","url":"guides/rgsvc/rgsvc.html#_implementation_17","body":"Implementation The core framework provides a default implementation of this service (o.a.i.core.metamodel.services.title.TitleServiceDefault). ","description":" The core framework provides a default implementation of this service (o.a.i.core.metamodel.services.title.TitleServiceDefault). ","id":153666205},"155655500":{"title":"@PrimaryKey (javax.jdo)","url":"guides/rgant/rgant.html#_rgant-PrimaryKey","body":"@PrimaryKey (javax.jdo) ","description":"","id":155655500},"158069558":{"title":"Usability: Defaults","url":"pages/tg/tg.html#_usability_defaults","body":"Usability: Defaults ","description":"","id":158069558},"158897592":{"title":"Refactoring","url":"guides/dg/dg.html#__dg_ide_intellij_hints-and-tips_refactoring","body":"Refactoring Loads of good stuff on the Refactor menu; most used are: If you can’t remember all those shortcuts, just use ctrl-shift-alt-T
(might want to rebind that to something else!) and get a context-sensitive list of refactorings available for the currently selected object ","description":" Loads of good stuff on the Refactor menu; most used are: ","id":158897592},"159072030":{"title":"(non-ASF) Incode Platform","url":"migration-notes/migration-notes.html#_migration-notes_1.14.0-to-1.15.0_incode-platform","body":"(non-ASF) Incode Platform The various (non-ASF) Isis Addons and Incode Catalog have also been combined into a single \"Incode Platform\". While each module can still be consumed individually, the new platform versions consistently (a change in any one module will result in a re-release of all). This should make these modules easier to consume, and easier to maintain/develop. All the modules remain open source, still licensed under the ASF v2.0 license. As of this release, none of the groupIds or artifactIds have changed. They will be rationalized/made consistent in a future release; most probably to c
oincide with v2.0.0 of the framework. ","description":" The various (non-ASF) Isis Addons and Incode Catalog have also been combined into a single \"Incode Platform\". ","id":159072030},"160872749":{"title":"Related Services","url":"guides/rgfis/rgfis.html#_related_services","body":"Related Services The default implementation of ContentNegotiationService delegates to ContentMappingService (if present) to convert domain entities into a stable form (eg DTO). The ContentNegotiationService is itself called by the (default implementation of) RepresentationService. ","description":" The default implementation of ContentNegotiationService delegates to ContentMappingService (if present) to convert domain entities into a stable form (eg DTO). ","id":160872749},"163456888":{"title":"Dependency upgrade","url":"release-notes/release-notes.html#_dependency_upgrade_9","body":"Dependency upgrade ","description":"","id":163456888},"163915714":{"title":"web.xml","url":"migration-notes/migration-no
tes.html#_web_xml","body":"web.xml In the web.xml, the \"isis.viewers\" context-param is now ignored. Instead the viewer_wicket.properties and viewer_restfulobjects.properties will both be loaded if present (but neither need be present). ","description":" In the web.xml, the \"isis.viewers\" context-param is now ignored. Instead the viewer_wicket.properties and viewer_restfulobjects.properties will both be loaded if present (but neither need be present). ","id":163915714},"165602306":{"title":"GridLoaderService","url":"guides/rgsvc/rgsvc.html#_rgsvc_presentation-layer-spi_GridLoaderService","body":"GridLoaderService The GridLoaderService provides the ability to load the XML layout (grid) for a domain class. ","description":" The GridLoaderService provides the ability to load the XML layout (grid) for a domain class. ","id":165602306},"165750333":{"title":"loaded()","url":"guides/rgcms/rgcms.html#_rgcms_methods_lifecycle_loaded","body":"loaded() The loaded() lifecycle callback met
hod is called when a (persistent) object has just been loaded from the object store. ","description":" The loaded() lifecycle callback method is called when a (persistent) object has just been loaded from the object store. ","id":165750333},"166045728":{"title":"Sanity Check","url":"guides/cgcom/cgcom.html#_sanity_check_2","body":"Sanity Check Ensure that the framework builds ok using the same command that your CI server is set up to execute (see section above). ","description":" Ensure that the framework builds ok using the same command that your CI server is set up to execute (see section above). ","id":166045728},"166899251":{"title":"Installing and Setting up","url":"guides/dg/dg.html#__dg_ide_intellij_installing","body":"Installing and Setting up This section covers installation and setup. These notes/screenshots were prepared using IntelliJ Community Edition 14.1.x, but are believed to be compatible with more recent versions/other editions of the IDE. ","description":" This
section covers installation and setup. These notes/screenshots were prepared using IntelliJ Community Edition 14.1.x, but are believed to be compatible with more recent versions/other editions of the IDE. ","id":166899251},"167039338":{"title":"Task","url":"release-notes/release-notes.html#_task_14","body":"Task ","description":"","id":167039338},"169081251":{"title":"Interaction","url":"guides/rgsvc/rgsvc.html#__code_interaction_code","body":"Interaction The public API of the Interaction class consists of: This class is concrete (is also the implementation). ","description":" The public API of the Interaction class consists of: ","id":169081251},"174738887":{"title":"Related functionality","url":"guides/ugvw/ugvw.html#_related_functionality_2","body":"Related functionality The Recent Pages also lists recently visited pages, selected from a drop-down. ","description":" The Recent Pages also lists recently visited pages, selected from a drop-down. ","id":174738887},"175028546":{"t
itle":"Implementation","url":"guides/rgsvc/rgsvc.html#_implementation_5","body":"Implementation The framework provides a default implementation of this service, namely GridServiceDefault. ","description":" The framework provides a default implementation of this service, namely GridServiceDefault. ","id":175028546},"175197970":{"title":"Performance tuning","url":"pages/tg/tg.html#_performance_tuning","body":"Performance tuning ","description":"","id":175197970},"175636232":{"title":"RepositoryService","url":"guides/rgsvc/rgsvc.html#_rgsvc_persistence-layer-api_RepositoryService","body":"RepositoryService The RepositoryService collects together methods for creating, persisting and searching for entities from the underlying persistence store. It acts as an abstraction over the JDO/DataNucleus objectstore. You can use it during prototyping to write naive queries (find all rows, then filter using the Guava Predicate API, or you can use it to call JDO named queries using JDOQL. As an
alternative, you could also use JDO typesafe queries through the IsisJdoSupport service. ","description":" The RepositoryService collects together methods for creating, persisting and searching for entities from the underlying persistence store. It acts as an abstraction over the JDO/DataNucleus objectstore. ","id":175636232},"176767338":{"title":"Command and Events","url":"guides/rgsvc/rgsvc.html#__rgsvc_intro_commands-and-events","body":"Command and Events A good number of the domain services manage the execution of action invocations/property edits, along with the state of domain objects that are modified as a result of these. These services capture information which can then be used for various purposes, most notably for auditing or for publishing events, or for deferring execution such that the execution be performed in the background at some later date. The diagram below shows how these services fit together. The outline boxes are services while the coloured boxes represent
data structures - defined in the applib and therefore accessible to domain applications - which hold various information about the executions. To explain: Implementations of CommandService can use the Command#getMemento() method to obtain a XML equivalent of that Command, reified using the cmd.xsd schema. This can be converted back into a CommandDto using the CommandDtoUtils utility class (part of the applib). Similarly, implementations of PublisherService can use the InteractionDtoUtils utility class to obtain a InteractionDto representing the interaction, either just for a single execution or for the entire call-graph. This can be converted into XML in a similar fashion. Likewise, the PublishedObjects class passed to the PublisherService at the end of the interaction provides the PublishedObjects#getDto() method which returns a ChangesDto instance. This can be converted into XML using the ChangesDtoUtils utility class. One final point: multiple PublisherService implementation
s are supported because different implementations may have different responsibilities. For example, the (non-ASF) Incode Platform's publishmq module is responsible for publishing messages onto an ActiveMQ event bus, for inter-system communication. However, the SPI can also be used for profiling; each execution within the call-graph contains metrics of the number of objects loaded or modified as a result of that execution, and thus could be used for application profiling. The framework provides a default PublisherServiceLogging implementation that logs this using SLF4J. ","description":" A good number of the domain services manage the execution of action invocations/property edits, along with the state of domain objects that are modified as a result of these. These services capture information which can then be used for various purposes, most notably for auditing or for publishing events","id":176767338},"178125062":{"title":"domainEvent()","url":"guides/rgant/rgant.html#_rgant-Actio
n_domainEvent","body":"domainEvent() Whenever a domain object (or list of domain objects) is to be rendered, the framework fires off multiple domain events for every property, collection and action of the domain object. In the cases of the domain object’s actions, the events that are fired are: Subscribers subscribe through the EventBusService using either Guava or Axon Framework annotations and can influence each of these phases. By default the event raised is ActionDomainEvent.Default. For example: The domainEvent() attribute allows a custom subclass to be emitted allowing more precise subscriptions (to those subclasses) to be defined instead. This attribute is also supported for collections and properties. For example: The benefit is that subscribers can be more targeted as to the events that they subscribe to. ","description":" Whenever a domain object (or list of domain objects) is to be rendered, the framework fires off multiple domain events for every property, collec
tion and action of the domain object. In the cases of the domain object’s actions, the events that are fired are: ","id":178125062},"180783343":{"title":"TranslatableException","url":"guides/ugbtb/ugbtb.html#__code_translatableexception_code","body":"TranslatableException Another mechanism by which messages can be rendered to the user are as the result of exception messages thrown and recognized by an ExceptionRecognizer. In this case, if the exception implements TranslatableException, then the message will automatically be translated before being rendered. The TranslatableException itself takes the form: ","description":" Another mechanism by which messages can be rendered to the user are as the result of exception messages thrown and recognized by an ExceptionRecognizer. ","id":180783343},"183226640":{"title":"updatedLifecycleEvent()","url":"guides/rgant/rgant.html#_rgant-DomainObject_updatedLifecycleEvent","body":"updatedLifecycleEvent() Whenever a (persistent) domain object
has been modified and has been updated in the database, an \"updated\" lifecycle event is fired. Subscribers subscribe through the EventBusService and can use the event to obtain a reference to the domain object. By default the event raised is ObjectUpdatedEvent.Default. For example: The purpose of the updatedLifecycleEvent() attribute is to allows a custom subclass to be emitted instead. A similar attribute is available for other lifecycle events. For example: The benefit is that subscribers can be more targeted as to the events that they subscribe to. ","description":" Whenever a (persistent) domain object has been modified and has been updated in the database, an \"updated\" lifecycle event is fired. ","id":183226640},"188123644":{"title":"2013","url":"pages/articles-and-presentations/articles-and-presentations.html#_2013","body":"2013 ","description":"","id":188123644},"189180810":{"title":"HoldsUpdatedAt","url":"guides/rgcms/rgcms.html#_rgcms_classes_roles_HoldsUpdatedAt"
,"body":"HoldsUpdatedAt The HoldsUpdatedAt role interface allows the (framework-provided) TimestampService to update each object with the current timestamp whenever it is modified in a transaction. The interface is defined as: The current time is obtained from the ClockService. Entities that implement this interface often also implement HoldsUpdatedBy role interface; as a convenience the Timestampable interface combines the two roles. ","description":" The HoldsUpdatedAt role interface allows the (framework-provided) TimestampService to update each object with the current timestamp whenever it is modified in a transaction. ","id":189180810},"191180113":{"title":"persistence.xml","url":"guides/ugodn/ugodn.html#_ugodn_configuring_persistence-xml","body":"persistence.xml DataNucleus will for itself also and read the META-INF/persistence.xml. In theory it can hold mappings and even connection strings. However, with Apache Isis we tend to use annotations instead and externalize conn
ection strings. so its definition is extremely simply, specifying just the name of the \"persistence unit\". Here’s the one provided by the SimpleApp archetype: Normally all one needs to do is to change the persistence-unit name. See DataNucleus' documentation on persistence.xml to learn more. ","description":" DataNucleus will for itself also and read the META-INF/persistence.xml. In theory it can hold mappings and even connection strings. However, with Apache Isis we tend to use annotations instead and externalize connection strings. so its definition is extremely simply, specifying just the name of the \"persistence unit","id":191180113},"193219460":{"title":"API","url":"guides/rgsvc/rgsvc.html#_rgsvc_metadata-api_MetamodelService_api","body":"API The API defined by the service is: ","description":" The API defined by the service is: ","id":193219460},"193237835":{"title":"Core","url":"release-notes/release-notes.html#_core_8","body":"Core ","description":"","id":193237835}
,"194608562":{"title":"SPI","url":"guides/rgsvc/rgsvc.html#_spi_19","body":"SPI It is also possible to define use some other underlying event bus implementation, by implementing the EventBusImplementation SPI: As is probably obvious, the EventBusService just delegates down to these method calls when its own similarly named methods are called. If you do provide your own implementation of this SPI, be aware that your subscribers will need to use whatever convention is required (eg different annotations) such that the events are correctly routed through to your subscribers. If you have written your own implementation of the EventBusServiceImplementation SPI, then specify instead its fully-qualified class name: ","description":" It is also possible to define use some other underlying event bus implementation, by implementing the EventBusImplementation SPI: ","id":194608562},"195374240":{"title":"Update the LDAP committee (if a PMC member)","url":"guides/cgcom/cgcom.html#_update_the_
ldap_committee_if_a_pmc_member","body":"Update the LDAP committee (if a PMC member) (Assuming that the new committer is a PMC member), also add them as to the PMC committee. This takes two steps: The new committer does not officially become a member of the PMC until the ASF records have been updated. ","description":" (Assuming that the new committer is a PMC member), also add them as to the PMC committee. This takes two steps: ","id":195374240},"195848147":{"title":"ICLA, obtain new account","url":"guides/cgcom/cgcom.html#_icla_obtain_new_account","body":"ICLA, obtain new account If required (that is, if the committer is not already a committer for a different ASF project), then ask them to complete an ICLA. As a result of this, they should also get an @apache.org user name. More info can be found in the ASF new committers guide. ","description":" If required (that is, if the committer is not already a committer for a different ASF project), then ask them to complete an ICLA. A
s a result of this, they should also get an @apache.org user name. ","id":195848147},"196560907":{"title":"XJC profile","url":"guides/rgmvn/rgmvn.html#__rgmvn_xsd_xsd-submodule_xjc-profile","body":"XJC profile The xjc profile reads the XSD generated by the xsd goal, and from it generates Java DTOs. Note that this isn’t round-tripping: the original view model is only for use within the Isis app, whereas the DTO generated from the XSDs is for use in a standalone context, eg in a Java subscriber on an event bus. The xjc profile is defined as: The referenced catalog.xml file instructs the xjc plugin how to resolve referenced schema locations. Only a reference for the Apache Isis common schema is likely to be needed: ","description":" The xjc profile reads the XSD generated by the xsd goal, and from it generates Java DTOs. Note that this isn’t round-tripping: the original view model is only for use within the Isis app, whereas the DTO generated from the XSDs is for use in a standa
lone context","id":196560907},"198329644":{"title":"Strings (Length)","url":"guides/ugfun/ugfun.html#__ugfun_programming-model_properties_datatypes_strings","body":"Strings (Length) By default JDO/DataNucleus will map string properties to a VARCHAR(255). To limit the length, use the @Column(length=…) annotation. For example: This is a good example of a case where Apache Isis infers domain semantics from the JDO annotation. ","description":" By default JDO/DataNucleus will map string properties to a VARCHAR(255). To limit the length, use the @Column(length=…) annotation. ","id":198329644},"198382465":{"title":"Actions","url":"pages/tg/tg.html#_actions","body":"Actions ","description":"","id":198382465},"201216196":{"title":"GitLab","url":"guides/ugfun/ugfun.html#_gitlab","body":"GitLab Create a git repository \"myapp\" in GitLab. Using Settings > CI/CD, specify the following Secret Variables: Finally, push a copy of the generated application to this repository using t
he instructions provided by GitLab. This will kick off a pipeline that will build the image and push to DockerHub. The tag name is based on a combination of the date, the branch and the git shaId. ","description":" Create a git repository \"myapp\" in GitLab. ","id":201216196},"203208629":{"title":"New Feature","url":"release-notes/release-notes.html#_new_feature_18","body":"New Feature ","description":"","id":203208629},"203740710":{"title":"RoutingService","url":"guides/rgsvc/rgsvc.html#_rgsvc_presentation-layer-spi_RoutingService","body":"RoutingService The RoutingService provides the ability to return (and therefore render) an alternative object from an action invocation. There are two primary use cases: Currently the routing service is used only by the Wicket viewer; it is ignored by the Restful Objects viewer. ","description":" The RoutingService provides the ability to return (and therefore render) an alternative object from an action invocation. ","id":203740710},"20445
2611":{"title":"Related services","url":"guides/rgsvc/rgsvc.html#_related_services_15","body":"Related services The ConfigurationServiceMenu exposes the allConfigurationProperties action in the user interface. ","description":" The ConfigurationServiceMenu exposes the allConfigurationProperties action in the user interface. ","id":204452611},"207811701":{"title":"API","url":"guides/rgsvc/rgsvc.html#_api_2","body":"API The API of TitleService is: ","description":" The API of TitleService is: ","id":207811701},"209853740":{"title":"To run","url":"guides/rgmvn/rgmvn.html#_to_run","body":"To run The plugin is activated by default, so is run simply using: This will run any tests, and then also - because the plugin is activated by the isis-validate property and bound to the test phase, will run the plugin’s validate goal. If for any reason you want to disable the validation, use: ","description":" The plugin is activated by default, so is run simply using: ","id":209853740},"213642
269":{"title":"Moving on","url":"guides/ugfun/ugfun.html#__ugfun_getting-started_helloworld-archetype_moving-on","body":"Moving on When you are ready to start working on your own app, we don’t recommend building on top of the helloworld app. Instead, we suggest that you start with the simpleapp archetype instead. Although a little more complex, it provides more structure and tests, all of which will help you as your application grows. ","description":" When you are ready to start working on your own app, we don’t recommend building on top of the helloworld app. ","id":213642269},"216231183":{"title":"Raising a pull request","url":"guides/dg/dg.html#_raising_a_pull_request","body":"Raising a pull request If you have your own fork, you can now simply push the changes you’ve made locally to your fork: This will create a corresponding branch in the remote github repo. If you use gitk --all, you’ll also see a remotes/origin/ISIS-123-blobs branch. Then, use github to raise a
pull request. Pull requests sent to the Apache GitHub repositories will forward a pull request e-mail to the dev mailing list. You’ll probably want to sign up to the dev mailing list first before issuing your first pull request (though that isn’t mandatory). The process to raise the pull request, broadly speaking: ","description":" If you have your own fork, you can now simply push the changes you’ve made locally to your fork: ","id":216231183},"220685197":{"title":"AbstractSubscriber","url":"guides/rgcms/rgcms.html#_rgcms_classes_super_AbstractSubscriber","body":"AbstractSubscriber This is a convenience superclass for creating subscriber domain services on the EventBusService. It uses @PostConstruct and @PreDestroy callbacks to automatically register/unregister itself with the EventBusService. It’s important that subscribers register before any domain services that might emit events on the EventBusService. For example, the (non-ASF) Incode Platform security module provid
es a domain service that automatically seeds certain domain entities; these will generate lifecycle events and so any subscribers must be registered before such seed services. The easiest way to do this is to use the @DomainServiceLayout#menuOrder() attribute. As a convenience, the AbstractSubscriber specifies this attribute. ","description":" This is a convenience superclass for creating subscriber domain services on the EventBusService. It uses @PostConstruct and @PreDestroy callbacks to automatically register/unregister itself with the EventBusService. ","id":220685197},"222371586":{"title":"Nullability","url":"guides/rgant/rgant.html#_rgant-Column_allowsNull","body":"Nullability The allowsNull() attribute is used to specify if a property is mandatory or is optional. For example: Isis also provides @Property#optionality() attribute. If both are specified, Apache Isis will check when it initializes for any contradictions, and will fail-fast with an appropriate error message in
the log if there are. You should also be aware that in the lack of either the @Column#allowsNull() or the @Property#optionality() attributes, that the JDO and Apache Isis defaults differ. Apache Isis rule is straight-forward: properties are assumed to be required. JDO on the other hand specifies that only primitive types are mandatory; everything else is assumed to be optional. Therefore a lack of either annotation can also trigger the fail-fast validation check. In the vast majority of cases you should be fine just to add the @Column#allowsNull() attribute to the getter. But see the documentation for @Property#optionality() attribute for discussion on one or two minor edge cases. ","description":" The allowsNull() attribute is used to specify if a property is mandatory or is optional. ","id":222371586},"224301547":{"title":"IsisWebAppBootstrapper","url":"guides/ugbtb/ugbtb.html#__code_isiswebappbootstrapper_code","body":"IsisWebAppBootstrapper The IsisWebAppBootstrapper servlet
context listener bootstraps the shared (global) metadata for the Apache Isis framework. This listener is not required (indeed must not be configured) if the Wicket viewer is in use. Its definition is: Its context parameters are: ","description":" The IsisWebAppBootstrapper servlet context listener bootstraps the shared (global) metadata for the Apache Isis framework. This listener is not required (indeed must not be configured) if the Wicket viewer is in use. ","id":224301547},"227377078":{"title":"Initialization","url":"guides/ugfun/ugfun.html#_ugfun_programming-model_domain-services_initialization","body":"Initialization Services can optionally declare lifecycle callbacks to initialize them (when the app is deployed) and to shut them down (when the app is undeployed). An Apache Isis session is available when initialization occurs (so services can interact with the object store, for example). The framework will call any public method annotated with @PostConstruct with either
no arguments of an argument of type Map<String,String>. In the latter case, the framework passes in the configuration (isis.properties and any other component-specific configuration files). Shutdown is similar; the framework will call any method annotated with @PreDestroy. ","description":" Services can optionally declare lifecycle callbacks to initialize them (when the app is deployed) and to shut them down (when the app is undeployed). ","id":227377078},"228550183":{"title":"Policies","url":"guides/cgcom/cgcom.html#_cgcom_policies","body":"Policies ","description":"","id":228550183},"229025509":{"title":"Remove references to isis-viewer-wicket parent pom.","url":"migration-notes/migration-notes.html#_remove_references_to_code_isis_viewer_wicket_code_parent_pom","body":"Remove references to isis-viewer-wicket parent pom. In earlier releases the Wicket viewer defined its own parent pom.xml for dependency management and its dependencies and to declare the various submodules that ma
ke up the viewer. This pom.xml has now been incorporated into the parent pom.xml for the Core framework. Therefore, in the parent pom.xml of your own domain applications, remove: ","description":" In earlier releases the Wicket viewer defined its own parent pom.xml for dependency management and its dependencies and to declare the various submodules that make up the viewer. This pom.xml has now been incorporated into the parent pom.xml for the Core framework. ","id":229025509},"230599582":{"title":"AuditingServiceInternal","url":"guides/rgfis/rgfis.html#_rgfis_persistence-layer_AuditingServiceInternal","body":"AuditingServiceInternal The (internal) AuditingServiceInternal domain service acts as an internal facade to any registered AuditerService service(s). It is responsible for obtaining the details of all changes to domain objects within an interaction, and then to call the configured AuditerService(s) to actually create audit entries of those changes. ","description":" The (inte
rnal) AuditingServiceInternal domain service acts as an internal facade to any registered AuditerService service(s). It is responsible for obtaining the details of all changes to domain objects within an interaction, and then to call the configured AuditerService(s) to actually create audit entries of those changes. ","id":230599582},"232471644":{"title":"Registering Subscribers","url":"guides/rgsvc/rgsvc.html#_registering_subscribers","body":"Registering Subscribers The register() method should be called in the @PostConstruct lifecycle method. It is valid and probably the least confusing to readers to also \"unregister\" in the @PreDestroy lifecycle method (though as noted above, unregistering is actually a no-op). For example: This works for both singleton (application-scoped) and also @RequestScoped domain services. ","description":" The register() method should be called in the @PostConstruct lifecycle method. It is valid and probably the least confusing to readers to also \"
unregister\" in the @PreDestroy lifecycle method (though as noted above, unregistering is actually a no-op). ","id":232471644},"238546442":{"title":"rebuildMetamodel()","url":"guides/rgcms/rgcms.html#__rgcms_classes_mixins_Object_rebuildMetamodel","body":"rebuildMetamodel() The Object_rebuildMetamodel mixin provides the ability to discard the current internal metamodel data (an instance of ObjectSpecification) for the domain class of the rendered object, and recreate from code and other sources (most notably, layout XML data). It has the following signature: ","description":" The Object_rebuildMetamodel mixin provides the ability to discard the current internal metamodel data (an instance of ObjectSpecification) for the domain class of the rendered object, and recreate from code and other sources (most notably, layout XML data). It has the following signature: ","id":238546442},"238979657":{"title":"New Feature","url":"release-notes/release-notes.html#_new_feature_22","body":"New F
eature ","description":"","id":238979657},"240026998":{"title":"Improvement","url":"release-notes/release-notes.html#_improvement_14","body":"Improvement ","description":"","id":240026998},"242030985":{"title":"1.4.0","url":"release-notes/release-notes.html#_release-notes_1.4.0","body":"1.4.0 ","description":"","id":242030985},"243439147":{"title":"hidden()","url":"guides/rgant/rgant.html#_rgant-Property_hidden","body":"hidden() Properties can be hidden at the domain-level, indicating that they are not visible to the end-user. This attribute can also be applied to actions and collections. For example: The acceptable values for the where parameter are: For example, if a property is annotated with @Title, then normally this should be hidden from all tables. Annotating with @Property(where=Where.NOWHERE) overrides this. ","description":" Properties can be hidden at the domain-level, indicating that they are not visible to the end-user. This attribute can also be applied to actions
and collections. ","id":243439147},"243876171":{"title":"Task","url":"release-notes/release-notes.html#_task_28","body":"Task ","description":"","id":243876171},"244520152":{"title":"SessionLoggingService","url":"guides/rgsvc/rgsvc.html#_rgsvc_presentation-layer-spi_SessionLoggingService","body":"SessionLoggingService The SessionLoggingService defines an SPI to keep track of (typically: to log) the current sessions that are using the application. ","description":" The SessionLoggingService defines an SPI to keep track of (typically: to log) the current sessions that are using the application. ","id":244520152},"246409050":{"title":"Using system properties","url":"guides/ugbtb/ugbtb.html#_using_system_properties","body":"Using system properties The servlet context initializer will search for any system properties called isis.xxx and if present will use them as overrides. Thus, an alternative option for a Docker image is to bootstrap the servlet container (Tomcat, Jetty) with appro
priate system properties set up. For example, with Tomcat this can be done by writing into the conf/catalina.properties file (see for example this stackoverflow post). The Docker’s ENTRYPOINT therefore just needs to parse the Docker container’s own command line arguments and use to create this file. ","description":" The servlet context initializer will search for any system properties called isis.xxx and if present will use them as overrides. ","id":246409050},"251015067":{"title":"myapp-dom Module","url":"migration-notes/migration-notes.html#__code_myapp_dom_code_module","body":"myapp-dom Module In your myapp-dom module (containing definitions of your persistent entities and domain services), create an empty class to represent the module. This should be at the root package for the domain, eg: Since there is no requirement to actually instantiate this class (it merely provides the location of the myapp.dom package), we give it a private constructor. If you have any other mo
dules where you have either domain services or entities, similarly create an empty \"module\" class. ","description":" In your myapp-dom module (containing definitions of your persistent entities and domain services), create an empty class to represent the module. This should be at the root package for the domain, eg: ","id":251015067},"255768608":{"title":"Multi-tenancy support","url":"pages/isis-in-pictures/isis-in-pictures.html#_multi_tenancy_support","body":"Multi-tenancy support One significant feature of the (non-ASF) Incode Platform's security module is the ability to associate users and objects with a \"tenancy\". The todoapp uses this feature so that different users' list of todo items are kept separate from one another. A user with administrator is able to switch their own \"tenancy\" to the tenancy of some other user, in order to access the objects in that tenancy: For more details, see the (non-ASF) Incode Platform's security module README. ","description":" One signif
icant feature of the (non-ASF) Incode Platform's security module is the ability to associate users and objects with a \"tenancy\". The todoapp uses this feature so that different users' list of todo items are kept separate from one another. A user with administrator is able to switch","id":255768608},"257661017":{"title":"AppManifest (bootstrapping)","url":"guides/rgcms/rgcms.html#_rgcms_classes_AppManifest-bootstrapping","body":"AppManifest (bootstrapping) This section describes how to implement the AppManifest interface to bootstrap both an Apache Isis web application, and also its integration tests. ","description":" This section describes how to implement the AppManifest interface to bootstrap both an Apache Isis web application, and also its integration tests. ","id":257661017},"259202548":{"title":"Run-as","url":"guides/htg.html#_ugsec_hints-and-tips_run-as","body":"Run-as This hint shows how to temporarily change the current user as reported by Shiro. This can be useful to
support \"Run As\", for example. The heavy lifting is done in ShiroService: This could be exposed in the UI using a simple RunAsService, for example: Credits: adapted from this gist. ","description":" This hint shows how to temporarily change the current user as reported by Shiro. This can be useful to support \"Run As\", for example. ","id":259202548},"259358868":{"title":"Hints and Tips","url":"guides/ugodn/ugodn.html#_ugodn_hints-and-tips","body":"Hints and Tips ","description":"","id":259358868},"266250802":{"title":"Implementation","url":"guides/rgsvc/rgsvc.html#_implementation_2","body":"Implementation There is no default implementation of this service. The (non-ASF) Isis addons' kitchensink app provides an example implementation: which is rendered as: ","description":" There is no default implementation of this service. ","id":266250802},"267695496":{"title":"Building Apache Isis","url":"guides/dg/dg.html#_dg_building-isis","body":"Building Apache Isis ","description":"
","id":267695496},"273843820":{"title":"Simulated UI (WrapperFactory)","url":"guides/ugtst/ugtst.html#_simulated_ui_code_wrapperfactory_code","body":"Simulated UI (WrapperFactory) When we talk about integration tests/specs here, we mean tests that exercise the domain object logic, through to the actual database. But we also want the tests to exercise the app from the users’s perspective, which means including the user interface. For most other frameworks that would require having to test the application in a very heavy weight/fragile fashion using a tool such as Selenium, driving a web browser to navigate . In this regard though, Apache Isis has a significant trick up its sleeve. Because Apache Isis implements the naked objects pattern, it means that the UI is generated automatically from declared domain-objects, -views and -services. This therefore allows for other implementations of the UI. The WrapperFactory domain service allows a test to wrap domain objects and thus to int
eract with said objects \"as if\" through the UI: If the test invokes an action that is disabled, then the wrapper will throw an appropriate exception. If the action is ok to invoke, it delegates through. What this means is that an Isis application can be tested end-to-end without having to deploy it onto a webserver; the whole app can be tested while running in-memory. Although integration tests re (necessarily) slower than unit tests, they are not any harder to write (in fact, in some respects they are easier). ","description":" When we talk about integration tests/specs here, we mean tests that exercise the domain object logic, through to the actual database. But we also want the tests to exercise the app from the users’s perspective, which means including the user interface. ","id":273843820},"273985863":{"title":"addTo…() (deprecated)","url":"guides/rgcms/rgcms.html#_rgcms_methods_prefixes_addTo","body":"addTo…() (deprecated) The addTo…() supporting method i
s called whenever an object is added to a collection. Its purpose is to allow additional business logic to be performed. For example: See also removeFrom…()` ","description":" The addTo…() supporting method is called whenever an object is added to a collection. Its purpose is to allow additional business logic to be performed. ","id":273985863},"278859977":{"title":"promptStyle()","url":"guides/rgant/rgant.html#_rgant-PropertyLayout_promptStyle","body":"promptStyle() The promptStyle() attribute is used to specify whether, when editing a domain object property, the new value for the property is prompted by way of a dialog box, or is prompted using an inline panel (replacing the property on the page). If the attribute is not set, then the value of the configuration property isis.viewer.wicket.promptStyle is used. If this is itself not set, then an inline prompt is used. For example: Alternatively, the promptStyle() can be specified using file-based layouts. ","descript
ion":" The promptStyle() attribute is used to specify whether, when editing a domain object property, the new value for the property is prompted by way of a dialog box, or is prompted using an inline panel (replacing the property on the page). ","id":278859977},"278890330":{"title":"Build a domain app","url":"pages/tg/tg.html#_build_a_domain_app","body":"Build a domain app ","description":"","id":278890330},"278999912":{"title":"Integration API","url":"guides/rgsvc/rgsvc.html#_rgsvc_integration-api","body":"Integration API ","description":"","id":278999912},"285898371":{"title":"ObjectUpdatedEvent","url":"guides/rgcms/rgcms.html#_rgcms_classes_lifecycleevent_ObjectUpdatedEvent","body":"ObjectUpdatedEvent Subclass of AbstractLifecycleEvent, broadcast when an object has just been updated in the database. This is done either explicitly when the current transaction is flushed using the DomainObjectContainer's #flush(…) method, else is done implicitly when the transaction commits a
t the end of the user request. ObjectUpdatedEvent.Default is the concrete implementation that is used. ","description":" Subclass of AbstractLifecycleEvent, broadcast when an object has just been updated in the database. This is done either explicitly when the current transaction is flushed using the DomainObjectContainer's #flush(…) method, else is done implicitly when the transaction commits at the end of the user request. ","id":285898371},"286919998":{"title":"Install Project Lombok","url":"guides/dg/dg.html#__dg_ide_eclipse_configure-lombok","body":"Install Project Lombok The SimpleApp archetype uses Project Lombok annotations (@Getter and @Setter and so on) to reduce the boilerplate. For Eclipse IDE this requires an installation step: Then restart Eclipse. ","description":" The SimpleApp archetype uses Project Lombok annotations (@Getter and @Setter and so on) to reduce the boilerplate. For Eclipse IDE this requires an installation step: ","id":286919998},"288377989":{
"title":"Philosophy and Architecture","url":"guides/ugfun/ugfun.html#_ugfun_core-concepts_philosophy","body":"Philosophy and Architecture This section describes some of the core ideas and architectural patterns upon which Apache Isis builds. ","description":" This section describes some of the core ideas and architectural patterns upon which Apache Isis builds. ","id":288377989},"288392697":{"title":"User Experience","url":"guides/ugvw/ugvw.html#_user_experience_3","body":"User Experience The copy URL dialog is typically obtained by clicking on the icon. Alternatively, alt+] will also open the dialog. It can be closed with either OK or the Esc key. ","description":" The copy URL dialog is typically obtained by clicking on the icon. ","id":288392697},"291813215":{"title":"Raising events programmatically","url":"guides/rgant/rgant.html#_raising_events_programmatically","body":"Raising events programmatically Normally events are only raised for interactions through the UI. However,
events can be raised programmatically either by calling the EventBusService API directly, or by emulating the UI by wrapping the target object using the WrapperFactory domain service. ","description":" Normally events are only raised for interactions through the UI. However, events can be raised programmatically either by calling the EventBusService API directly, or by emulating the UI by wrapping the target object using the WrapperFactory domain service. ","id":291813215},"292881794":{"title":"FixtureScript","url":"guides/ugtst/ugtst.html#_ugtst_fixture-scripts_api-and-usage_FixtureScript","body":"FixtureScript A fixture script is ultimately just a block of code that can be executed, so it’s up to you how you implement it to set up the system. However, we strongly recommend that you use it to invoke actions on business objects, in essence to replay what a real-life user would have done. That way, the fixture script will remain valid even if the underlying implementation of the
system changes in the future. For example, here’s a fixture script called RecreateSimpleObjects. (This used to be part of the SimpleApp archetype, though the archetype now ships with a more sophisticated design, discussed below): Because this script has exposed a \"number\" property, it’s possible to set this from within the UI. For example: When this is executed, the framework will parse the text and attempt to reflectively set the corresponding properties on the fixture result. So, in this case, when the fixture script is executed we actually get 6 objects created. ","description":" A fixture script is ultimately just a block of code that can be executed, so it’s up to you how you implement it to set up the system. However, we strongly recommend that you use it to invoke actions on business objects, in essence to replay what a real","id":292881794},"293860175":{"title":"Usage","url":"guides/rgsvc/rgsvc.html#_usage_10","body":"Usage The most common use-case is for bulk ac
tions that act upon multiple objects in a list. The (same) Scratchpad service is injected into each of these objects, and so they can use pass information. For example, the Isis addons example todoapp (not ASF) demonstrates how the Scratchpad service can be used to calculate the total cost of the selected `ToDoItem`s: A more complex example could use a view model to enable bulk updates to a set of objects. The view model’s job is to gather track of the items to be updated: The bulk action in the objects simply adds the selected item to the view model: If using the Wicket viewer, the ToDoItemBulkUpdate view model returned from the last action invoked will be displayed. Thereafter this view model can be used to perform a bulk update of the \"enlisted\" items. ","description":" The most common use-case is for bulk actions that act upon multiple objects in a list. The (same) Scratchpad service is injected into each of these objects, and so they can use pass information. ","id":293
860175},"295225295":{"title":"updatingLifecycleEvent()","url":"guides/rgant/rgant.html#_rgant-DomainObject_updatingLifecycleEvent","body":"updatingLifecycleEvent() Whenever a (persistent) domain object has been modified and is about to be updated to the database, an \"updating\" lifecycle event is fired. Subscribers subscribe through the EventBusService and can use the event to obtain a reference to the domain object. The subscriber could then, for example, update the object, or it could use it maintain an external datastore. One possible application is to maintain a full-text search database using Apache Lucene or similar. By default the event raised is ObjectUpdatingEvent.Default. For example: The purpose of the updatingLifecycleEvent() attribute is to allows a custom subclass to be emitted instead. A similar attribute is available for other lifecycle events. For example: The benefit is that subscribers can be more targeted as to the events that they subscribe to. ","descrip
tion":" Whenever a (persistent) domain object has been modified and is about to be updated to the database, an \"updating\" lifecycle event is fired. ","id":295225295},"295564393":{"title":"FactoryService","url":"guides/rgsvc/rgsvc.html#_rgsvc_core-domain-api_FactoryService","body":"FactoryService The FactoryService collects together methods for instantiating domain objects. ","description":" The FactoryService collects together methods for instantiating domain objects. ","id":295564393},"296009132":{"title":"Underlying Technology","url":"pages/powered-by/powered-by.html#_underlying_technology","body":"Underlying Technology With regard to the underlying technology, CQNZ™ is a mobile application served by a web application using RESTful web services. The core, the CQNZ application server, is built on Apache Isis framework, which is hosted on a cloud service provider, configured for high availability, load balancing and fail-over with highly elastic scalability, prepared to scale
from 1 server to tens, hundreds or even thousands of application servers running on Apache Isis. The client is a cross-platform mobile application now available on Apple Store and Google Play in the US, Mexico and Europe. ","description":" With regard to the underlying technology, CQNZ™ is a mobile application served by a web application using RESTful web services. The core, the CQNZ application server, is built on Apache Isis framework, which is hosted on a cloud service provider, configured for high availability, load balancing and fail-over with","id":296009132},"297314780":{"title":"Bug","url":"release-notes/release-notes.html#_bug_11","body":"Bug ","description":"","id":297314780},"298365005":{"title":"Command","url":"guides/rgcms/rgcms.html#_rgcms_schema-cmd","body":"Command The command (\"cmd\") schema defines the serialized form of the intention to invoke an action or to edit a property. It can be supplemented with optional timings capturing the actual invocation of a com
mand (introduced to support the replication of commands in a master/slave arrangement). ","description":" The command (\"cmd\") schema defines the serialized form of the intention to invoke an action or to edit a property. It can be supplemented with optional timings capturing the actual invocation of a command (introduced to support the replication of commands in a master/slave arrangement). ","id":298365005},"299154153":{"title":"Screenshots","url":"guides/ugvw/ugvw.html#_screenshots_5","body":"Screen
<TRUNCATED>
[14/39] isis-site git commit: ISIS-1810: updates docs for 2.0.0-M1
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/274edd1d/content/versions/SNAPSHOT/guides/rgcfg/rgcfg.pdf
----------------------------------------------------------------------
diff --git a/content/versions/SNAPSHOT/guides/rgcfg/rgcfg.pdf b/content/versions/SNAPSHOT/guides/rgcfg/rgcfg.pdf
index 5609f91..1071280 100644
--- a/content/versions/SNAPSHOT/guides/rgcfg/rgcfg.pdf
+++ b/content/versions/SNAPSHOT/guides/rgcfg/rgcfg.pdf
@@ -4,8 +4,8 @@
<< /Title <feff0043006f0072006500200043006f006e0066006900672019006e002000500072006f0070006500720074006900650073>
/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:20180812182428+01'00')
-/ModDate (D:20180812182428+01'00')
+/CreationDate (D:20180814003807+02'00')
+/ModDate (D:20180814003807+02'00')
>>
endobj
2 0 obj
http://git-wip-us.apache.org/repos/asf/isis-site/blob/274edd1d/content/versions/SNAPSHOT/guides/rgcms/rgcms.html
----------------------------------------------------------------------
diff --git a/content/versions/SNAPSHOT/guides/rgcms/rgcms.html b/content/versions/SNAPSHOT/guides/rgcms/rgcms.html
index 296e499..7d9da36 100644
--- a/content/versions/SNAPSHOT/guides/rgcms/rgcms.html
+++ b/content/versions/SNAPSHOT/guides/rgcms/rgcms.html
@@ -1153,7 +1153,7 @@ table.CodeRay td.code>pre{padding:0}
<p>The <code>default…()</code> supporting method is called for action parameters to return the initial argument value. This may be some sensible default (eg today’s date, or 0 or 1), or — for an action that is modifying the state of an object — might default to the current value of a corresponding property.</p>
</div>
<div class="paragraph">
- <p>The method is <em>also</em> called for properties in the case when an object is newly instantiated using <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_DomainObjectContainer"><code>DomainObjectContainer#newTransientInstance(…)</code></a>. This is a much less common use case. If a default is not specified then properties are initialized to a default based on their type (eg 0 or <code>false</code>).</p>
+ <p>The method is <em>also</em> called for properties in the case when an object is newly instantiated using <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_RepositoryService"><code>RepositoryService#instantiate(…)</code></a> or <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_FactoryService"><code>FactoryService#instantiate(…)</code></a>. This is a much less common use case. If a default is not specified then properties are initialized to a default based on their type (eg 0 or <code>false</code>).</p>
</div>
<div class="paragraph">
<p>The signature of the supporting method depends on whether it is for an action parameter or a property.</p>
@@ -1294,7 +1294,7 @@ table.CodeRay td.code>pre{padding:0}
<p>There are, in fact, two other ways to set properties of a newly instantiated object to default values.</p>
</div>
<div class="paragraph">
- <p>The first is to use the <a href="../rgcms/rgcms.html#_rgcms_methods_lifecycle_created"><code>created()</code></a> callback, called by the framework when <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_DomainObjectContainer"><code>DomainObjectContainer#newTransientInstance(…)</code></a> is called. This method is called after any dependencies have been injected into the service.</p>
+ <p>The first is to use the <a href="../rgcms/rgcms.html#_rgcms_methods_lifecycle_created"><code>created()</code></a> callback, called by the framework when <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_RepositoryService"><code>RepositoryService#instantiate(…)</code></a> or <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_FactoryService"><code>FactoryService#instantiate(…)</code></a> is called. This method is called after any services have been injected into the domain object.</p>
</div>
<div class="paragraph">
<p>The second is more straightforward: simply initialize properties in the constructor. However, this cannot use any injected services as they will not have been initialized.</p>
@@ -2190,9 +2190,7 @@ table.CodeRay td.code>pre{padding:0}
<pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="directive">final</span> <span class="type">class</span> <span class="class">ToDoAppDomainModule</span> {
<span class="directive">private</span> ToDoAppDomainModule(){}
<span class="directive">public</span> <span class="directive">abstract</span> <span class="directive">static</span> <span class="type">class</span> <span class="class">PropertyDomainEvent</span><S,T>
- <span class="directive">extends</span> org.apache.isis.applib.events.domain.PropertyDomainEvent<S,T> {
- ...
- }
+ <span class="directive">extends</span> org.apache.isis.applib.events.domain.PropertyDomainEvent<S,T> { }
...
}</code></pre>
</div>
@@ -2203,10 +2201,7 @@ table.CodeRay td.code>pre{padding:0}
<div class="listingblock">
<div class="content">
<pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">class</span> <span class="class">ToDoItem</span> ... {
- <span class="directive">public</span> <span class="directive">static</span> <span class="type">class</span> <span class="class">DescriptionDomainEvent</span>
- <span class="directive">extends</span> PropertyDomainEvent<<span class="predefined-type">String</span>> {
- ...
- }
+ <span class="directive">public</span> <span class="directive">static</span> <span class="type">class</span> <span class="class">DescriptionDomainEvent</span> <span class="directive">extends</span> PropertyDomainEvent<<span class="predefined-type">String</span>> { }
<span class="annotation">@Property</span>(
domainEvent = DescriptionDomainEvent.class
)
@@ -2574,20 +2569,14 @@ table.CodeRay td.code>pre{padding:0}
<td class="icon"> <i class="fa icon-warning" title="Warning"></i> </td>
<td class="content">
<div class="paragraph">
- <p>Note that these callbacks are fired by Apache Isis rather than JDO. In the future we may deprecate them because there are better mechanisms available using listeners/subscribers:</p>
- </div>
- <div class="ulist">
- <ul>
- <li> <p>in Isis 1.9.0 and earlier, you may therefore want to consider using the JDO API directly to set up a lifecycle listener; see <a href="../rgcms/rgcms.html#_rgcms_methods_lifecycle_jdo-api">here</a> for further discussion.</p> </li>
- <li> <p>alternatively, you can use a subscriber for the <a href="../rgcms/rgcms.html#_rgcms_classes_lifecycleevent">lifecycle event</a>s fired in Isis.</p> </li>
- </ul>
+ <p>Note that these callbacks are fired by Apache Isis rather than JDO. In the future we may deprecate them because there are better mechanisms available using a subscriber for the <a href="../rgcms/rgcms.html#_rgcms_classes_lifecycleevent">lifecycle event</a>s.</p>
</div> </td>
</tr>
</tbody>
</table>
</div>
<div class="paragraph">
- <p>The lifecycle callback methods supported by Isis are:</p>
+ <p>The lifecycle callback methods supported by Apache Isis are:</p>
</div>
<table class="tableblock frame-all grid-all spread">
<caption class="title">
@@ -2609,7 +2598,7 @@ table.CodeRay td.code>pre{padding:0}
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p>called when an object has just been created using <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_DomainObjectContainer"><code>newTransientInstance()</code></a></p>
+ <p>called when an object has just been created using <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_FactoryService"><code>FactoryService#instantiate(..)</code></a> or <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_RepositoryService"><code>RepositoryService#instantiate(…)</code></a></p>
</div>
</div></td>
</tr>
@@ -2678,84 +2667,6 @@ table.CodeRay td.code>pre{padding:0}
</tr>
</tbody>
</table>
- <div class="paragraph">
- <p>Some lifecycle methods have been deprecated:</p>
- </div>
- <table class="tableblock frame-all grid-all spread">
- <caption class="title">
- Table 4. Deprecated lifecycle methods
- </caption>
- <colgroup>
- <col style="width: 20%;">
- <col style="width: 80%;">
- </colgroup>
- <thead>
- <tr>
- <th class="tableblock halign-left valign-top">Method</th>
- <th class="tableblock halign-left valign-top">Notes</th>
- </tr>
- </thead>
- <tbody>
- <tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><code>deleted()</code></p></td>
- <td class="tableblock halign-left valign-top">
- <div>
- <div class="paragraph">
- <p>Replaced by <a href="../rgcms/rgcms.html#_rgcms_methods_lifecycle_removed"><code>removed()</code></a></p>
- </div>
- </div></td>
- </tr>
- <tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><code>deleting()</code></p></td>
- <td class="tableblock halign-left valign-top">
- <div>
- <div class="paragraph">
- <p>Replaced by <a href="../rgcms/rgcms.html#_rgcms_methods_lifecycle_removing"><code>removing()</code></a></p>
- </div>
- </div></td>
- </tr>
- <tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><code>loading()</code></p></td>
- <td class="tableblock halign-left valign-top">
- <div>
- <div class="paragraph">
- <p>callback for when the (persistent) object is just about to be loaded from the object store.<br></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>This method is never called.</p>
- </div> </td>
- </tr>
- </tbody>
- </table>
- </div>
- </div></td>
- </tr>
- <tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><code>saved()</code></p></td>
- <td class="tableblock halign-left valign-top">
- <div>
- <div class="paragraph">
- <p>Replaced by <a href="../rgcms/rgcms.html#_rgcms_methods_lifecycle_persisted"><code>persisted()</code></a></p>
- </div>
- </div></td>
- </tr>
- <tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><code>saving()</code></p></td>
- <td class="tableblock halign-left valign-top">
- <div>
- <div class="paragraph">
- <p>Replaced by <a href="../rgcms/rgcms.html#_rgcms_methods_lifecycle_persisting"><code>persisting()</code></a></p>
- </div>
- </div></td>
- </tr>
- </tbody>
- </table>
<div class="sect3">
<h4 id="_rgcms_methods_lifecycle_created">2.3.1. <code>created()</code></h4>
<div class="btn-group" style="float: right; font-size: small; padding: 6px; margin-top: -55px; ">
@@ -2769,7 +2680,7 @@ table.CodeRay td.code>pre{padding:0}
</ul>
</div>
<div class="paragraph">
- <p>The <code>created()</code> lifecycle callback method is called when an object has just been created using <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_DomainObjectContainer"><code>newTransientInstance()</code></a></p>
+ <p>The <code>created()</code> lifecycle callback method is called when an object has just been created using <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_RepositoryService"><code>RepositoryService#instantiate(…)</code></a> or <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_FactoryService"><code>FactoryService#instantiate(…)</code></a></p>
</div>
<div class="admonitionblock tip">
<table>
@@ -3565,7 +3476,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
<table class="tableblock frame-all grid-all spread">
<caption class="title">
- Table 5. Convenience Superclasses
+ Table 4. Convenience Superclasses
</caption>
<colgroup>
<col style="width: 25%;">
@@ -3583,39 +3494,6 @@ table.CodeRay td.code>pre{padding:0}
</thead>
<tbody>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="../rgcms/rgcms.html#_rgcms_classes_super_AbstractContainedObject"><code>o.a.i.applib.</code><br> <code>AbstractContainedObject</code></a></p></td>
- <td class="tableblock halign-left valign-top">
- <div>
- <div class="paragraph">
- <p><code>o.a.i.core</code><br> <code>isis-core-applib</code></p>
- </div>
- </div></td>
- <td class="tableblock halign-left valign-top"><p class="tableblock">(abstract class)</p></td>
- <td class="tableblock halign-left valign-top"></td>
- </tr>
- <tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="../rgcms/rgcms.html#_rgcms_classes_super_AbstractDomainObject"><code>o.a.i.applib.</code><br> <code>AbstractDomainObject</code></a></p></td>
- <td class="tableblock halign-left valign-top">
- <div>
- <div class="paragraph">
- <p><code>o.a.i.core</code><br> <code>isis-core-applib</code></p>
- </div>
- </div></td>
- <td class="tableblock halign-left valign-top"><p class="tableblock">(abstract class)</p></td>
- <td class="tableblock halign-left valign-top"></td>
- </tr>
- <tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="../rgcms/rgcms.html#_rgcms_classes_super_AbstractFactoryAndRepository"><code>o.a.i.applib.</code><br> <code>AbstractFactoryAndRepository</code></a></p></td>
- <td class="tableblock halign-left valign-top">
- <div>
- <div class="paragraph">
- <p><code>o.a.i.core</code><br> <code>isis-core-applib</code></p>
- </div>
- </div></td>
- <td class="tableblock halign-left valign-top"><p class="tableblock">(abstract class)</p></td>
- <td class="tableblock halign-left valign-top"></td>
- </tr>
- <tr>
<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="../rgcms/rgcms.html#_rgcms_classes_super_AbstractService"><code>o.a.i.applib.</code><br> <code>AbstractService</code></a></p></td>
<td class="tableblock halign-left valign-top">
<div>
@@ -3667,98 +3545,13 @@ table.CodeRay td.code>pre{padding:0}
<p><code>o.a.i.core</code><br> <code>isis-core-applib</code></p>
</div>
</div></td>
- <td class="tableblock halign-left valign-top"><p class="tableblock">(abstract class).<br> <code>FixtureScriptsDefault</code> is a default implementation that is used when the alternative <a href="../rgsvc/rgsvc.html#_rgsvc_api_FixtureScriptsSpecificationProvider"><code>FixtureScriptsSpecificationProvider</code></a> is provided (and no other implementation of <code>FixtureScripts</code> was found).</p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock">(abstract class).<br> <code>FixtureScriptsDefault</code> is a default implementation that is used when the alternative <a href="../rgsvc/rgsvc.html#_rgsvc_testing_FixtureScriptsSpecificationProvider"><code>FixtureScriptsSpecificationProvider</code></a> is provided (and no other implementation of <code>FixtureScripts</code> was found).</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">depends on:<br> <code>ClassDiscoveryService</code></p></td>
</tr>
</tbody>
</table>
<div class="sect3">
- <h4 id="_rgcms_classes_super_AbstractContainedObject">3.2.1. <code>AbstractContainedObject</code></h4>
- <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="https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_classes_super_AbstractContainedObject.adoc""><i class="fa fa-pencil-square-o"></i> 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/rgcms/_rgcms_classes_super_AbstractContainedObject.adoc" target="_blank"><i class="fa fa-pencil-square-o fa-fw" aria-hidden="true"></i> Edit</a></li>
- <li><a href="https://github.com/apache/isis/commits/master/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_classes_super_AbstractContainedObject.adoc" target="_blank"><i class="fa fa-clock-o fa-fw" aria-hidden="true"></i> History</a></li>
- <li><a href="https://github.com/apache/isis/raw/master/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_classes_super_AbstractContainedObject.adoc" target="_blank"><i class="fa fa-file-text-o fa-fw" aria-hidden="true"></i> Raw</a></li>
- <li><a href="https://github.com/apache/isis/blame/master/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_classes_super_AbstractContainedObject.adoc" target="_blank"><i class="fa fa-hand-o-right fa-fw" aria-hidden="true"></i> Blame</a></li>
- </ul>
- </div>
- <div class="paragraph">
- <p>This class is a convenience superclass for domain objects and services, providing general purpose methods for interacting with the framework. These include:</p>
- </div>
- <div class="ulist">
- <ul>
- <li> <p><code>allMatches(Query)</code> - search for all objects matching the specified <code>Query</code>.<br></p>
- <div class="paragraph">
- <p>+ Note that this, and other similar methods (eg <code>firstMatch(…)</code>, <code>uniqueMatch(…)</code>) will automatically flush the current transaction.</p>
- </div> </li>
- <li> <p><code>newTransientInstance(Class)</code> - to create a new instance of an object, with any services injected into it</p> </li>
- <li> <p><code>persistIfNotAlready(Object)</code> - to persist an object<br></p>
- <div class="paragraph">
- <p>In fact, the object is queued up to be persisted, and is only actually persisted either when the transaction commits, or when the transaction is flushed (typically when a query is performed).</p>
- </div> </li>
- <li> <p><code>warnUser(String)</code> - generate a warning to the user</p> </li>
- <li> <p><code>getContainer()</code> - which returns the <code>DomainObjectContainer</code></p> </li>
- </ul>
- </div>
- <div class="paragraph">
- <p>Each of these methods simply delegates to an equivalent method in <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_DomainObjectContainer"><code>DomainObjectContainer</code></a>.</p>
- </div>
- <div class="admonitionblock tip">
- <table>
- <tbody>
- <tr>
- <td class="icon"> <i class="fa icon-tip" title="Tip"></i> </td>
- <td class="content">
- <div class="paragraph">
- <p>In practice we find that there’s little to gain from subclassing; it’s easier/less obscure to simply inject <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_DomainObjectContainer"><code>DomainObjectContainer</code></a> into a simple pojo class.</p>
- </div> </td>
- </tr>
- </tbody>
- </table>
- </div>
- </div>
- <div class="sect3">
- <h4 id="_rgcms_classes_super_AbstractDomainObject">3.2.2. <code>AbstractDomainObject</code></h4>
- <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="https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_classes_super_AbstractDomainObject.adoc""><i class="fa fa-pencil-square-o"></i> 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/rgcms/_rgcms_classes_super_AbstractDomainObject.adoc" target="_blank"><i class="fa fa-pencil-square-o fa-fw" aria-hidden="true"></i> Edit</a></li>
- <li><a href="https://github.com/apache/isis/commits/master/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_classes_super_AbstractDomainObject.adoc" target="_blank"><i class="fa fa-clock-o fa-fw" aria-hidden="true"></i> History</a></li>
- <li><a href="https://github.com/apache/isis/raw/master/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_classes_super_AbstractDomainObject.adoc" target="_blank"><i class="fa fa-file-text-o fa-fw" aria-hidden="true"></i> Raw</a></li>
- <li><a href="https://github.com/apache/isis/blame/master/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_classes_super_AbstractDomainObject.adoc" target="_blank"><i class="fa fa-hand-o-right fa-fw" aria-hidden="true"></i> Blame</a></li>
- </ul>
- </div>
- <div class="paragraph">
- <p>This class extends <a href="../rgcms/rgcms.html#_rgcms_classes_super_AbstractContainedObject"><code>AbstractContainedObject</code></a>, adding in convenience methods for managing the persistence lifecycle of the object instance.</p>
- </div>
- <div class="paragraph">
- <p>Each of these methods, eg <code>isPersistent(…)</code>, delegates to an equivalent method in <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_DomainObjectContainer"><code>DomainObjectContainer</code></a>.</p>
- </div>
- </div>
- <div class="sect3">
- <h4 id="_rgcms_classes_super_AbstractFactoryAndRepository">3.2.3. <code>AbstractFactoryAndRepository</code></h4>
- <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="https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_classes_super_AbstractFactoryAndRepository.adoc""><i class="fa fa-pencil-square-o"></i> 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/rgcms/_rgcms_classes_super_AbstractFactoryAndRepository.adoc" target="_blank"><i class="fa fa-pencil-square-o fa-fw" aria-hidden="true"></i> Edit</a></li>
- <li><a href="https://github.com/apache/isis/commits/master/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_classes_super_AbstractFactoryAndRepository.adoc" target="_blank"><i class="fa fa-clock-o fa-fw" aria-hidden="true"></i> History</a></li>
- <li><a href="https://github.com/apache/isis/raw/master/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_classes_super_AbstractFactoryAndRepository.adoc" target="_blank"><i class="fa fa-file-text-o fa-fw" aria-hidden="true"></i> Raw</a></li>
- <li><a href="https://github.com/apache/isis/blame/master/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_classes_super_AbstractFactoryAndRepository.adoc" target="_blank"><i class="fa fa-hand-o-right fa-fw" aria-hidden="true"></i> Blame</a></li>
- </ul>
- </div>
- <div class="paragraph">
- <p>This class extends <a href="../rgcms/rgcms.html#_rgcms_classes_super_AbstractContainedObject"><code>AbstractContainedObject</code></a>. Its intent was to be a convenience subclass for services acting as either a repository or a factory, however note that all of the methods that it defines are now deprecated.</p>
- </div>
- <div class="paragraph">
- <p>Instead, indicate that a service is repository using the <a href="../rgant/rgant.html#_rgant-DomainService_repositoryFor"><code>@DomainService#repositoryFor()</code></a> attribute.</p>
- </div>
- </div>
- <div class="sect3">
- <h4 id="_rgcms_classes_super_AbstractService">3.2.4. <code>AbstractService</code></h4>
+ <h4 id="_rgcms_classes_super_AbstractService">3.2.1. <code>AbstractService</code></h4>
<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="https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_classes_super_AbstractService.adoc""><i class="fa fa-pencil-square-o"></i> 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>
@@ -3770,14 +3563,14 @@ table.CodeRay td.code>pre{padding:0}
</ul>
</div>
<div class="paragraph">
- <p>This class extends <a href="../rgcms/rgcms.html#_rgcms_classes_super_AbstractContainedObject"><code>AbstractContainedObject</code></a>, adding in an implementation of <code>getId()</code> based upon the classes name.</p>
+ <p>This class provides an implementation of the optional <code>getId()</code> method for domain services, based upon the classes name.</p>
</div>
<div class="paragraph">
- <p>In practice there is little to gain from subclassing; simply inject <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_DomainObjectContainer"><code>DomainObjectContainer</code></a> for broadly equivalent functionality.</p>
+ <p>In practice there is little to gain from subclassing. Instead annotated with <a href="../rgant/rgant.html#_rgant_DomainService"><code>@DomainService</code></a> and specify its <a href="../rgant/rgant.html#_rgant_DomainService_objectType"><code>#objectType()</code></a></p>
</div>
</div>
<div class="sect3">
- <h4 id="_rgcms_classes_super_AbstractSubscriber">3.2.5. <code>AbstractSubscriber</code></h4>
+ <h4 id="_rgcms_classes_super_AbstractSubscriber">3.2.2. <code>AbstractSubscriber</code></h4>
<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="https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_classes_super_AbstractSubscriber.adoc""><i class="fa fa-pencil-square-o"></i> 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>
@@ -3799,7 +3592,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect3">
- <h4 id="_rgcms_classes_super_AbstractViewModel">3.2.6. <code>AbstractViewModel</code></h4>
+ <h4 id="_rgcms_classes_super_AbstractViewModel">3.2.3. <code>AbstractViewModel</code></h4>
<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="https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_classes_super_AbstractViewModel.adoc""><i class="fa fa-pencil-square-o"></i> 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>
@@ -3811,7 +3604,7 @@ table.CodeRay td.code>pre{padding:0}
</ul>
</div>
<div class="paragraph">
- <p>This class extends <a href="../rgcms/rgcms.html#_rgcms_classes_super_AbstractContainedObject"><code>AbstractContainedObject</code></a>, also implementing the <a href="../rgcms/rgcms.html#_rgcms_classes_super_ViewModel"><code>ViewModel</code></a> interface. In and of itself it provides no new behaviour.</p>
+ <p>This class simply implements the <a href="../rgcms/rgcms.html#_rgcms_classes_super_ViewModel"><code>ViewModel</code></a> interface, however the methods are still abstract. In and of itself it provides no new behaviour.</p>
</div>
<div class="admonitionblock tip">
<table>
@@ -3820,7 +3613,7 @@ table.CodeRay td.code>pre{padding:0}
<td class="icon"> <i class="fa icon-tip" title="Tip"></i> </td>
<td class="content">
<div class="paragraph">
- <p>As an alternative, consider simply annotating the view model class with {@link org.apache.isis.applib.annotation.ViewModel}.</p>
+ <p>As an alternative, consider simply annotating the view model class with {@link org.apache.isis.applib.annotation.ViewModel} annotation.</p>
</div> </td>
</tr>
</tbody>
@@ -3828,7 +3621,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect3">
- <h4 id="_rgcms_classes_super_FixtureScript">3.2.7. <code>FixtureScript</code></h4>
+ <h4 id="_rgcms_classes_super_FixtureScript">3.2.4. <code>FixtureScript</code></h4>
<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="https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_classes_super_FixtureScript.adoc""><i class="fa fa-pencil-square-o"></i> 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>
@@ -3858,7 +3651,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect3">
- <h4 id="_rgcms_classes_super_FixtureScripts">3.2.8. <code>FixtureScripts</code></h4>
+ <h4 id="_rgcms_classes_super_FixtureScripts">3.2.5. <code>FixtureScripts</code></h4>
<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="https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_classes_super_FixtureScripts.adoc""><i class="fa fa-pencil-square-o"></i> 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>
@@ -3903,7 +3696,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
<table class="tableblock frame-all grid-all spread">
<caption class="title">
- Table 6. Domain Event Classes
+ Table 5. Domain Event Classes
</caption>
<colgroup>
<col style="width: 25%;">
@@ -4406,7 +4199,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
<table class="tableblock frame-all grid-all spread">
<caption class="title">
- Table 7. UI Event Classes
+ Table 6. UI Event Classes
</caption>
<colgroup>
<col style="width: 25%;">
@@ -4593,7 +4386,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
<table class="tableblock frame-all grid-all spread">
<caption class="title">
- Table 8. Lifecycle Event Classes
+ Table 7. Lifecycle Event Classes
</caption>
<colgroup>
<col style="width: 25%;">
@@ -4630,7 +4423,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">(abstract class).<br> <code>ObjectCreatedEvent.Default</code> is the concrete implementation that is used.</p></td>
- <td class="tableblock halign-left valign-top"><p class="tableblock">Broadcast when an object is first instantiated using the <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_DomainObjectContainer_object-creation-api"><code>DomainObjectContainer</code></a>'s <code>#newTransientInstance(…)</code> method.</p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock">Broadcast when an object is first instantiated using the <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_FactoryService"><code>FactoryService</code></a>'s <code>#instantiate(…)</code> method.</p></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="../rgcms/rgcms.html#_rgcms_classes_lifecycleevent_ObjectLoadedDomainEvent"><code>o.a.i.applib.</code><br> <code>ObjectLoadedEvent</code></a></p></td>
@@ -4652,7 +4445,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">(abstract class).<br> <code>ObjectPersistedEvent.Default</code> is the concrete implementation that is used.</p></td>
- <td class="tableblock halign-left valign-top"><p class="tableblock">Broadcast when an object is first saved (inserted) into the database using the <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_DomainObjectContainer_object-persistence-api"><code>DomainObjectContainer</code></a>'s <code>#persist(…)</code> method.</p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock">Broadcast when an object is first saved (inserted) into the database using the <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_RepositoryService"><code>RepositoryService</code></a>'s <code>#persist(…)</code> method.</p></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="../rgcms/rgcms.html#_rgcms_classes_lifecycleevent_ObjectPersistingDomainEvent"><code>o.a.i.applib.</code><br> <code>ObjectPersistingEvent</code></a></p></td>
@@ -4663,7 +4456,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">(abstract class).<br> <code>ObjectPersistingEvent.Default</code> is the concrete implementation that is used.</p></td>
- <td class="tableblock halign-left valign-top"><p class="tableblock">Broadcast when an object is about to be saved (inserted) into the database using the <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_DomainObjectContainer_object-persistence-api"><code>DomainObjectContainer</code></a>'s <code>#persist(…)</code> method.</p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock">Broadcast when an object is about to be saved (inserted) into the database using the <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_RepositoryService"><code>RepositoryService</code></a>'s <code>#persist(…)</code> method.</p></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="../rgcms/rgcms.html#_rgcms_classes_lifecycleevent_ObjectRemovingDomainEvent"><code>o.a.i.applib.</code><br> <code>ObjectRemovingEvent</code></a></p></td>
@@ -4674,7 +4467,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">(abstract class).<br> <code>ObjectRemovingEvent.Default</code> is the concrete implementation that is used.</p></td>
- <td class="tableblock halign-left valign-top"><p class="tableblock">Broadcast when an object is about to be deleted from the database using the <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_DomainObjectContainer_object-persistence-api"><code>DomainObjectContainer</code></a>'s <code>#remove(…)</code> method.</p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock">Broadcast when an object is about to be deleted from the database using the <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_RepositoryService"><code>RepositoryService</code></a>'s <code>#remove(…)</code> method.</p></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="../rgcms/rgcms.html#_rgcms_classes_lifecycleevent_ObjectUpdatedDomainEvent"><code>o.a.i.applib.</code><br> <code>ObjectUpdatedEvent</code></a></p></td>
@@ -4685,7 +4478,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">(abstract class).<br> <code>ObjectUpdatedEvent.Default</code> is the concrete implementation that is used.</p></td>
- <td class="tableblock halign-left valign-top"><p class="tableblock">Broadcast when an object has just been updated in the database. This is done either explicitly when the current transaction is flushed using the <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_DomainObjectContainer_object-persistence-api"><code>DomainObjectContainer</code></a>'s <code>#flush(…)</code> method, else is done implicitly when the transaction commits at the end of the user request.</p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock">Broadcast when an object has just been updated in the database. This is done either explicitly when the current transaction is flushed using the <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_RepositoryService"><code>RepositoryService</code></a>'s <code>#flush(…)</code> method, else is done implicitly when the transaction commits at the end of the user request.</p></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="../rgcms/rgcms.html#_rgcms_classes_lifecycleevent_ObjectUpdatingDomainEvent"><code>o.a.i.applib.</code><br> <code>ObjectUpdatingEvent</code></a></p></td>
@@ -4696,7 +4489,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">(abstract class).<br> <code>ObjectUpdatingEvent.Default</code> is the concrete implementation that is used.</p></td>
- <td class="tableblock halign-left valign-top"><p class="tableblock">Broadcast when an object is about to be updated in the database. This is done either explicitly when the current transaction is flushed using the <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_DomainObjectContainer_object-persistence-api"><code>DomainObjectContainer</code></a>'s <code>#flush(…)</code> method, else is done implicitly when the transaction commits at the end of the user request.</p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock">Broadcast when an object is about to be updated in the database. This is done either explicitly when the current transaction is flushed using the <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_RepositoryService"><code>RepositoryService</code></a>'s <code>#flush(…)</code> method, else is done implicitly when the transaction commits at the end of the user request.</p></td>
</tr>
</tbody>
</table>
@@ -4743,23 +4536,10 @@ table.CodeRay td.code>pre{padding:0}
</ul>
</div>
<div class="paragraph">
- <p>Subclass of <a href="../rgcms/rgcms.html#_rgcms_classes_lifecycleevent_AbstractLifecycleEvent"><code>AbstractLifecycleEvent</code></a>, broadcast when an object is first instantiated using the <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_DomainObjectContainer_object-creation-api"><code>DomainObjectContainer</code></a>'s <code>#newTransientInstance(…)</code> method.</p>
+ <p>Subclass of <a href="../rgcms/rgcms.html#_rgcms_classes_lifecycleevent_AbstractLifecycleEvent"><code>AbstractLifecycleEvent</code></a>, broadcast when an object is first instantiated using the <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_FactoryService"><code>FactoryServuce</code></a>'s <code>#instantiate(…)</code> method.</p>
</div>
<div class="paragraph">
- <p><code>ObjectCreatedEvent.Default</code> is the concrete implementation that is used.</p>
- </div>
- <div class="admonitionblock note">
- <table>
- <tbody>
- <tr>
- <td class="icon"> <i class="fa icon-note" title="Note"></i> </td>
- <td class="content">
- <div class="paragraph">
- <p>In the future this may be generalized to allow arbitrary subclasses to be broadcast, see ISIS-803.</p>
- </div> </td>
- </tr>
- </tbody>
- </table>
+ <p><code>ObjectCreatedEvent.Default</code> is the implementation that is used by default, but this can be overridden using <a href="../rgant/rgant.html#_rgant_DomainObject_createdLifecycleEvent"><code>@DomainObject#createdLifecycleEvent()</code></a>.</p>
</div>
</div>
<div class="sect3">
@@ -4807,23 +4587,10 @@ table.CodeRay td.code>pre{padding:0}
</ul>
</div>
<div class="paragraph">
- <p>Subclass of <a href="../rgcms/rgcms.html#_rgcms_classes_lifecycleevent_AbstractLifecycleEvent"><code>AbstractLifecycleEvent</code></a>, broadcast when an object is first saved (inserted) into the database using the <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_DomainObjectContainer_object-persistence-api"><code>DomainObjectContainer</code></a>'s <code>#persist(…)</code> method.</p>
+ <p>Subclass of <a href="../rgcms/rgcms.html#_rgcms_classes_lifecycleevent_AbstractLifecycleEvent"><code>AbstractLifecycleEvent</code></a>, broadcast when an object is first saved (inserted) into the database using the <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_RepositoryService"><code>RepositoryService</code></a>'s <code>#persist(…)</code> method.</p>
</div>
<div class="paragraph">
- <p><code>ObjectPersistedEvent.Default</code> is the concrete implementation that is used.</p>
- </div>
- <div class="admonitionblock note">
- <table>
- <tbody>
- <tr>
- <td class="icon"> <i class="fa icon-note" title="Note"></i> </td>
- <td class="content">
- <div class="paragraph">
- <p>In the future this may be generalized to allow arbitrary subclasses to be broadcast, see ISIS-803.</p>
- </div> </td>
- </tr>
- </tbody>
- </table>
+ <p><code>ObjectPersistedEvent.Default</code> is the implementation that is used by default, but this can be overridden using <a href="../rgant/rgant.html#_rgant_DomainObject_persistedLifecycleEvent"><code>@DomainObject#persistedLifecycleEvent()</code></a>.</p>
</div>
</div>
<div class="sect3">
@@ -4839,23 +4606,10 @@ table.CodeRay td.code>pre{padding:0}
</ul>
</div>
<div class="paragraph">
- <p>Subclass of <a href="../rgcms/rgcms.html#_rgcms_classes_lifecycleevent_AbstractLifecycleEvent"><code>AbstractLifecycleEvent</code></a>, broadcast when an object is about to be saved (inserted) into the database using the <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_DomainObjectContainer_object-persistence-api"><code>DomainObjectContainer</code></a>'s <code>#persist(…)</code> method.</p>
+ <p>Subclass of <a href="../rgcms/rgcms.html#_rgcms_classes_lifecycleevent_AbstractLifecycleEvent"><code>AbstractLifecycleEvent</code></a>, broadcast when an object is about to be saved (inserted) into the database using the <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_RepositoryService"><code>RepositoryService</code></a>'s <code>#persist(…)</code> method.</p>
</div>
<div class="paragraph">
- <p><code>ObjectPersistingEvent.Default</code> is the concrete implementation that is used.</p>
- </div>
- <div class="admonitionblock note">
- <table>
- <tbody>
- <tr>
- <td class="icon"> <i class="fa icon-note" title="Note"></i> </td>
- <td class="content">
- <div class="paragraph">
- <p>In the future this may be generalized to allow arbitrary subclasses to be broadcast, see ISIS-803.</p>
- </div> </td>
- </tr>
- </tbody>
- </table>
+ <p><code>ObjectPersistingEvent.Default</code> is the implementation that is used by default, but this can be overridden using <a href="../rgant/rgant.html#_rgant_DomainObject_persistingLifecycleEvent"><code>@DomainObject#persistingLifecycleEvent()</code></a>.</p>
</div>
</div>
<div class="sect3">
@@ -4871,23 +4625,10 @@ table.CodeRay td.code>pre{padding:0}
</ul>
</div>
<div class="paragraph">
- <p>Subclass of <a href="../rgcms/rgcms.html#_rgcms_classes_lifecycleevent_AbstractLifecycleEvent"><code>AbstractLifecycleEvent</code></a>, broadcast when an object is about to be deleted from the database using the <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_DomainObjectContainer_object-persistence-api"><code>DomainObjectContainer</code></a>'s <code>#remove(…)</code> method.</p>
+ <p>Subclass of <a href="../rgcms/rgcms.html#_rgcms_classes_lifecycleevent_AbstractLifecycleEvent"><code>AbstractLifecycleEvent</code></a>, broadcast when an object is about to be deleted from the database using the <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_RepositoryService"><code>RepositoryService</code></a>'s <code>#remove(…)</code> method.</p>
</div>
<div class="paragraph">
- <p><code>ObjectRemovingEvent.Default</code> is the concrete implementation that is used.</p>
- </div>
- <div class="admonitionblock note">
- <table>
- <tbody>
- <tr>
- <td class="icon"> <i class="fa icon-note" title="Note"></i> </td>
- <td class="content">
- <div class="paragraph">
- <p>In the future this may be generalized to allow arbitrary subclasses to be broadcast, see ISIS-803.</p>
- </div> </td>
- </tr>
- </tbody>
- </table>
+ <p><code>ObjectRemovingEvent.Default</code> is the implementation that is used by default, but this can be overridden using <a href="../rgant/rgant.html#_rgant_DomainObject_removingLifecycleEvent"><code>@DomainObject#removingLifecycleEvent()</code></a>.</p>
</div>
</div>
<div class="sect3">
@@ -4903,23 +4644,10 @@ table.CodeRay td.code>pre{padding:0}
</ul>
</div>
<div class="paragraph">
- <p>Subclass of <a href="../rgcms/rgcms.html#_rgcms_classes_lifecycleevent_AbstractLifecycleEvent"><code>AbstractLifecycleEvent</code></a>, broadcast when an object has just been updated in the database. This is done either explicitly when the current transaction is flushed using the <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_DomainObjectContainer_object-persistence-api"><code>DomainObjectContainer</code></a>'s <code>#flush(…)</code> method, else is done implicitly when the transaction commits at the end of the user request.</p>
+ <p>Subclass of <a href="../rgcms/rgcms.html#_rgcms_classes_lifecycleevent_AbstractLifecycleEvent"><code>AbstractLifecycleEvent</code></a>, broadcast when an object has just been updated in the database. This is done either explicitly when the current transaction is flushed using the <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_RepositoryService"><code>RepositoryService</code></a>'s <code>#flush(…)</code> method, else is done implicitly when the transaction commits at the end of the user request.</p>
</div>
<div class="paragraph">
- <p><code>ObjectUpdatedEvent.Default</code> is the concrete implementation that is used.</p>
- </div>
- <div class="admonitionblock note">
- <table>
- <tbody>
- <tr>
- <td class="icon"> <i class="fa icon-note" title="Note"></i> </td>
- <td class="content">
- <div class="paragraph">
- <p>In the future this may be generalized to allow arbitrary subclasses to be broadcast, see ISIS-803.</p>
- </div> </td>
- </tr>
- </tbody>
- </table>
+ <p><code>ObjectUpdatedEvent.Default</code> is the implementation that is used by default, but this can be overridden using <a href="../rgant/rgant.html#_rgant_DomainObject_updatedLifecycleEvent"><code>@DomainObject#updatedLifecycleEvent()</code></a>.</p>
</div>
</div>
<div class="sect3">
@@ -4935,23 +4663,10 @@ table.CodeRay td.code>pre{padding:0}
</ul>
</div>
<div class="paragraph">
- <p>Subclass of <a href="../rgcms/rgcms.html#_rgcms_classes_lifecycleevent_AbstractLifecycleEvent"><code>AbstractLifecycleEvent</code></a>, broadcast when an object is about to be updated in the database. This is done either explicitly when the current transaction is flushed using the <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_DomainObjectContainer_object-persistence-api"><code>DomainObjectContainer</code></a>'s <code>#flush(…)</code> method, else is done implicitly when the transaction commits at the end of the user request.</p>
+ <p>Subclass of <a href="../rgcms/rgcms.html#_rgcms_classes_lifecycleevent_AbstractLifecycleEvent"><code>AbstractLifecycleEvent</code></a>, broadcast when an object is about to be updated in the database. This is done either explicitly when the current transaction is flushed using the <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_RepositoryService"><code>RepositoryService</code></a>'s <code>#flush(…)</code> method, else is done implicitly when the transaction commits at the end of the user request.</p>
</div>
<div class="paragraph">
- <p><code>ObjectUpdatingEvent.Default</code> is the concrete implementation that is used.</p>
- </div>
- <div class="admonitionblock note">
- <table>
- <tbody>
- <tr>
- <td class="icon"> <i class="fa icon-note" title="Note"></i> </td>
- <td class="content">
- <div class="paragraph">
- <p>In the future this may be generalized to allow arbitrary subclasses to be broadcast, see ISIS-803.</p>
- </div> </td>
- </tr>
- </tbody>
- </table>
+ <p><code>ObjectUpdatingEvent.Default</code> is the implementation that is used by default, but this can be overridden using <a href="../rgant/rgant.html#_rgant_DomainObject_updatingLifecycleEvent"><code>@DomainObject#updatingLifecycleEvent()</code></a>.</p>
</div>
</div>
</div>
@@ -5743,7 +5458,7 @@ table.CodeRay td.code>pre{padding:0}
</table>
</div>
<div class="paragraph">
- <p>Modules in the (non-ASF) <a href="http://platform.incode.org" target="_blank">Incode Platform</a> that either have domain entity that implement and/or services that contribute this interface are:</p>
+ <p>Modules in the (non-ASF) <a href="http://platform.incode.org" target="_blank">Incode Platform</a> that have domain entity/ies that implement this interface, and/or services that contribute this interface are:</p>
</div>
<div class="ulist">
<ul>
[35/39] isis-site git commit: ISIS-1810: updates docs for 2.0.0-M1
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/274edd1d/content/versions/2.0.0-M1/guides/cgcom/cgcom.pdf
----------------------------------------------------------------------
diff --git a/content/versions/2.0.0-M1/guides/cgcom/cgcom.pdf b/content/versions/2.0.0-M1/guides/cgcom/cgcom.pdf
index bedb767..2d27106 100644
--- a/content/versions/2.0.0-M1/guides/cgcom/cgcom.pdf
+++ b/content/versions/2.0.0-M1/guides/cgcom/cgcom.pdf
@@ -4,8 +4,8 @@
<< /Title (Committers' Guide)
/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:20180812182249+01'00')
-/ModDate (D:20180812182249+01'00')
+/CreationDate (D:20180814003630+02'00')
+/ModDate (D:20180814003630+02'00')
>>
endobj
2 0 obj
http://git-wip-us.apache.org/repos/asf/isis-site/blob/274edd1d/content/versions/2.0.0-M1/guides/dg/dg.html
----------------------------------------------------------------------
diff --git a/content/versions/2.0.0-M1/guides/dg/dg.html b/content/versions/2.0.0-M1/guides/dg/dg.html
index ce5118e..e1d2c68 100644
--- a/content/versions/2.0.0-M1/guides/dg/dg.html
+++ b/content/versions/2.0.0-M1/guides/dg/dg.html
@@ -5090,11 +5090,11 @@ xxx
</div></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><code>xref:../rgsvc/rgsvc.adoc#_rgsvc_api_xxx[`xxx</code>]` </p><p class="tableblock">a hyperlink to the "man page" for an (API) domain service within the reference guide for domain services, where: </p><p class="tableblock">* <code>xxx</code> is the domain service (eg <code>DomainObjectContainer</code>) </p><p class="tableblock">for example: </p><p class="tableblock"><code>xref:../rgsvc/rgsvc.adoc#_rgsvc_core-domain-api_DomainObjectContainer[`DomainObjectContainer</code>]`</p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><code>xref:../rgsvc/rgsvc.adoc#_rgsvc_api_xxx[`xxx</code>]` </p><p class="tableblock">a hyperlink to the "man page" for an (API) domain service within the reference guide for domain services, where: </p><p class="tableblock">* <code>xxx</code> is the domain service (eg <code>RepositoryService</code>) </p><p class="tableblock">for example: </p><p class="tableblock"><code>xref:../rgsvc/rgsvc.adoc#_rgsvc_core-domain-api_RepositoryService[`RepositoryService</code>]`</p></td>
<td class="tableblock halign-left valign-top">
<div>
<div class="paragraph">
- <p><a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_DomainObjectContainer"><code>DomainObjectContainer</code></a></p>
+ <p><a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_RepositoryService"><code>RepositoryService</code></a></p>
</div>
</div></td>
<td class="tableblock halign-left valign-top">
http://git-wip-us.apache.org/repos/asf/isis-site/blob/274edd1d/content/versions/2.0.0-M1/guides/dg/dg.pdf
----------------------------------------------------------------------
diff --git a/content/versions/2.0.0-M1/guides/dg/dg.pdf b/content/versions/2.0.0-M1/guides/dg/dg.pdf
index 33948a4..b0579cb 100644
--- a/content/versions/2.0.0-M1/guides/dg/dg.pdf
+++ b/content/versions/2.0.0-M1/guides/dg/dg.pdf
@@ -4,8 +4,8 @@
<< /Title (Developers' Guide)
/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:20180812182306+01'00')
-/ModDate (D:20180812182306+01'00')
+/CreationDate (D:20180814003647+02'00')
+/ModDate (D:20180814003647+02'00')
>>
endobj
2 0 obj
@@ -64929,7 +64929,7 @@ endobj
>>
endobj
651 0 obj
-<< /Length 7487
+<< /Length 7322
>>
stream
q
@@ -64947,15 +64947,15 @@ f
f
0.000 0.000 0.000 scn
1.000 1.000 1.000 scn
-48.240 378.579 71.257 404.031 re
+48.240 390.024 71.257 392.586 re
f
0.000 0.000 0.000 scn
1.000 1.000 1.000 scn
-119.497 378.579 285.028 404.031 re
+119.497 390.024 285.028 392.586 re
f
0.000 0.000 0.000 scn
1.000 1.000 1.000 scn
-404.525 378.579 142.515 404.031 re
+404.525 390.024 142.515 392.586 re
f
0.000 0.000 0.000 scn
0.5 w
@@ -65072,20 +65072,20 @@ S
[ ] 0 d
0.5 w
0.867 0.867 0.867 SCN
-48.240 378.579 m
-119.497 378.579 l
+48.240 390.024 m
+119.497 390.024 l
S
[ ] 0 d
0.5 w
0.867 0.867 0.867 SCN
48.240 782.860 m
-48.240 378.329 l
+48.240 389.774 l
S
[ ] 0 d
0.5 w
0.867 0.867 0.867 SCN
119.497 782.860 m
-119.497 378.329 l
+119.497 389.774 l
S
[ ] 0 d
1 w
@@ -65262,7 +65262,7 @@ ET
BT
51.24 520.5119999999997 Td
/F5.0 10.5 Tf
-<446f6d61696e4f626a656374> Tj
+<5265706f7369746f72795365> Tj
ET
0.000 0.000 0.000 SCN
@@ -65273,23 +65273,23 @@ ET
BT
51.24 506.23199999999963 Td
/F5.0 10.5 Tf
-<436f6e7461696e6572> Tj
+<7276696365> Tj
ET
0.000 0.000 0.000 SCN
0.200 0.200 0.200 scn
BT
-98.49000000000001 506.23199999999963 Td
+77.49000000000001 506.23199999999963 Td
/F1.0 10.5 Tf
-<29> Tj
+<2920666f72> Tj
ET
BT
51.24 491.95199999999966 Td
/F1.0 10.5 Tf
-<666f72206578616d706c653a> Tj
+<6578616d706c653a> Tj
ET
0.694 0.129 0.275 scn
@@ -65342,7 +65342,7 @@ ET
BT
51.24 434.7269999999997 Td
/F5.0 10.5 Tf
-<2d6170695f446f6d61696e4f> Tj
+<2d6170695f5265706f736974> Tj
ET
0.000 0.000 0.000 SCN
@@ -65353,7 +65353,7 @@ ET
BT
51.24 423.2819999999997 Td
/F5.0 10.5 Tf
-<626a656374436f6e7461696e> Tj
+<6f7279536572766963655b60> Tj
ET
0.000 0.000 0.000 SCN
@@ -65364,7 +65364,7 @@ ET
BT
51.24 411.8369999999997 Td
/F5.0 10.5 Tf
-<65725b60446f6d61696e4f62> Tj
+<5265706f7369746f72795365> Tj
ET
0.000 0.000 0.000 SCN
@@ -65373,27 +65373,16 @@ ET
0.694 0.129 0.275 SCN
BT
-51.24 400.3919999999997 Td
+51.24 397.5569999999997 Td
/F5.0 10.5 Tf
-<6a656374436f6e7461696e65> Tj
+<7276696365> Tj
ET
0.000 0.000 0.000 SCN
0.200 0.200 0.200 scn
-0.694 0.129 0.275 scn
-0.694 0.129 0.275 SCN
BT
-51.24 386.11199999999974 Td
-/F5.0 10.5 Tf
-<72> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-
-BT
-56.49 386.11199999999974 Td
+77.49000000000001 397.5569999999997 Td
/F1.0 10.5 Tf
<5d60> Tj
ET
@@ -65407,20 +65396,20 @@ S
[ ] 0 d
0.5 w
0.867 0.867 0.867 SCN
-119.497 378.579 m
-404.525 378.579 l
+119.497 390.024 m
+404.525 390.024 l
S
[ ] 0 d
0.5 w
0.867 0.867 0.867 SCN
119.497 782.860 m
-119.497 378.329 l
+119.497 389.774 l
S
[ ] 0 d
0.5 w
0.867 0.867 0.867 SCN
404.525 782.860 m
-404.525 378.329 l
+404.525 389.774 l
S
[ ] 0 d
1 w
@@ -65432,7 +65421,7 @@ S
BT
122.4970716 769.0469999999997 Td
/F5.0 10.5 Tf
-<446f6d61696e4f626a656374436f6e7461696e6572> Tj
+<5265706f7369746f727953657276696365> Tj
ET
0.000 0.000 0.000 SCN
@@ -65446,20 +65435,20 @@ S
[ ] 0 d
0.5 w
0.867 0.867 0.867 SCN
-404.525 378.579 m
-547.040 378.579 l
+404.525 390.024 m
+547.040 390.024 l
S
[ ] 0 d
0.5 w
0.867 0.867 0.867 SCN
404.525 782.860 m
-404.525 378.329 l
+404.525 389.774 l
S
[ ] 0 d
0.5 w
0.867 0.867 0.867 SCN
547.040 782.860 m
-547.040 378.329 l
+547.040 389.774 l
S
[ ] 0 d
1 w
@@ -65521,15 +65510,15 @@ endobj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
-/URI (../rgsvc/rgsvc.pdf#_rgsvc_core-domain-api_DomainObjectContainer)
+/URI (../rgsvc/rgsvc.pdf#_rgsvc_core-domain-api_RepositoryService)
>>
/Subtype /Link
-/Rect [122.4970716 767.5769999999997 232.7470716 778.0769999999997]
+/Rect [122.4970716 767.5769999999997 211.7470716 778.0769999999997]
/Type /Annot
>>
endobj
654 0 obj
-<< /Length 11850
+<< /Length 12115
>>
stream
q
@@ -65707,7 +65696,7 @@ S
0.694 0.129 0.275 SCN
BT
-51.24 769.0470000000001 Td
+51.24 769.0470000000006 Td
/F5.0 10.5 Tf
<787265663a2e2e2f72677376> Tj
ET
@@ -65718,7 +65707,7 @@ ET
0.694 0.129 0.275 SCN
BT
-51.24 757.6020000000001 Td
+51.24 757.6020000000005 Td
/F5.0 10.5 Tf
<632f72677376632e61646f63> Tj
ET
@@ -65729,7 +65718,7 @@ ET
0.694 0.129 0.275 SCN
BT
-51.24 746.1570000000002 Td
+51.24 746.1570000000006 Td
/F5.0 10.5 Tf
<235f72677376635f7370695f> Tj
ET
@@ -65740,7 +65729,7 @@ ET
0.694 0.129 0.275 SCN
BT
-51.24 731.8770000000002 Td
+51.24 731.8770000000006 Td
/F5.0 10.5 Tf
<7878785b60787878> Tj
ET
@@ -65749,84 +65738,84 @@ ET
0.200 0.200 0.200 scn
BT
-93.24000000000001 731.8770000000002 Td
+93.24000000000001 731.8770000000006 Td
/F1.0 10.5 Tf
<5d602061> Tj
ET
BT
-51.24 717.5970000000001 Td
+51.24 717.5970000000005 Td
/F1.0 10.5 Tf
[<68> 20.01953125 <797065726c696e6b20746f>] TJ
ET
BT
-51.24 703.3170000000001 Td
+51.24 703.3170000000006 Td
/F1.0 10.5 Tf
<74686520226d616e> Tj
ET
BT
-51.24 689.037 Td
+51.24 689.0370000000005 Td
/F1.0 10.5 Tf
<706167652220666f7220616e> Tj
ET
BT
-51.24 674.7570000000001 Td
+51.24 674.7570000000005 Td
/F1.0 10.5 Tf
<285350492920646f6d61696e> Tj
ET
BT
-51.24 660.4770000000001 Td
+51.24 660.4770000000005 Td
/F1.0 10.5 Tf
<73657276696365> Tj
ET
BT
-51.24 646.1970000000001 Td
+51.24 646.1970000000006 Td
/F1.0 10.5 Tf
<77697468696e20746865> Tj
ET
BT
-51.24 631.9170000000001 Td
+51.24 631.9170000000006 Td
/F1.0 10.5 Tf
<7265666572656e6365> Tj
ET
BT
-51.24 617.6370000000002 Td
+51.24 617.6370000000006 Td
/F1.0 10.5 Tf
<677569646520666f72> Tj
ET
BT
-51.24 603.3570000000001 Td
+51.24 603.3570000000005 Td
/F1.0 10.5 Tf
<646f6d61696e> Tj
ET
BT
-51.24 589.0770000000001 Td
+51.24 589.0770000000006 Td
/F1.0 10.5 Tf
<73657276696365732c> Tj
ET
BT
-51.24 574.7970000000001 Td
+51.24 574.7970000000006 Td
/F1.0 10.5 Tf
<77686572653a202a20> Tj
ET
@@ -65835,7 +65824,7 @@ ET
0.694 0.129 0.275 SCN
BT
-96.81 574.7970000000001 Td
+96.81 574.7970000000006 Td
/F5.0 10.5 Tf
<787878> Tj
ET
@@ -65844,26 +65833,26 @@ ET
0.200 0.200 0.200 scn
BT
-112.56 574.7970000000001 Td
+112.56 574.7970000000006 Td
ET
BT
-51.24 560.517 Td
+51.24 560.5170000000005 Td
/F1.0 10.5 Tf
<697320746865> Tj
ET
BT
-51.24 546.2370000000001 Td
+51.24 546.2370000000005 Td
/F1.0 10.5 Tf
<646f6d61696e> Tj
ET
BT
-51.24 531.9570000000001 Td
+51.24 531.9570000000006 Td
/F1.0 10.5 Tf
<7365727669636520286567> Tj
ET
@@ -65872,7 +65861,7 @@ ET
0.694 0.129 0.275 SCN
BT
-51.24 520.5120000000002 Td
+51.24 520.5120000000006 Td
/F5.0 10.5 Tf
<436f6e74656e744d61707069> Tj
ET
@@ -65883,7 +65872,7 @@ ET
0.694 0.129 0.275 SCN
BT
-51.24 506.2320000000001 Td
+51.24 506.23200000000054 Td
/F5.0 10.5 Tf
<6e6753657276696365> Tj
ET
@@ -65892,14 +65881,14 @@ ET
0.200 0.200 0.200 scn
BT
-98.49000000000001 506.2320000000001 Td
+98.49000000000001 506.23200000000054 Td
/F1.0 10.5 Tf
<29> Tj
ET
BT
-51.24 491.9520000000001 Td
+51.24 491.95200000000057 Td
/F1.0 10.5 Tf
<666f72206578616d706c653a> Tj
ET
@@ -65908,7 +65897,7 @@ ET
0.694 0.129 0.275 SCN
BT
-51.24 480.5070000000001 Td
+51.24 480.5070000000006 Td
/F5.0 10.5 Tf
<787265663a2e2e2f72677376> Tj
ET
@@ -65919,7 +65908,7 @@ ET
0.694 0.129 0.275 SCN
BT
-51.24 469.0620000000001 Td
+51.24 469.0620000000006 Td
/F5.0 10.5 Tf
<632f72677376632e61646f63> Tj
ET
@@ -65930,7 +65919,7 @@ ET
0.694 0.129 0.275 SCN
BT
-51.24 457.61700000000013 Td
+51.24 457.6170000000006 Td
/F5.0 10.5 Tf
<235f72677376635f70726573> Tj
ET
@@ -65941,7 +65930,7 @@ ET
0.694 0.129 0.275 SCN
BT
-51.24 446.17200000000014 Td
+51.24 446.1720000000006 Td
/F5.0 10.5 Tf
<656e746174696f6e2d> Tj
ET
@@ -65952,7 +65941,7 @@ ET
0.694 0.129 0.275 SCN
BT
-51.24 434.72700000000015 Td
+51.24 434.7270000000006 Td
/F5.0 10.5 Tf
<6c617965722d> Tj
ET
@@ -65963,7 +65952,7 @@ ET
0.694 0.129 0.275 SCN
BT
-51.24 423.28200000000015 Td
+51.24 423.2820000000006 Td
/F5.0 10.5 Tf
<7370695f436f6e74656e744d> Tj
ET
@@ -65974,7 +65963,7 @@ ET
0.694 0.129 0.275 SCN
BT
-51.24 411.83700000000016 Td
+51.24 411.8370000000006 Td
/F5.0 10.5 Tf
<617070696e67536572766963> Tj
ET
@@ -65985,7 +65974,7 @@ ET
0.694 0.129 0.275 SCN
BT
-51.24 400.39200000000017 Td
+51.24 400.3920000000006 Td
/F5.0 10.5 Tf
<655b60436f6e74656e744d61> Tj
ET
@@ -65996,7 +65985,7 @@ ET
0.694 0.129 0.275 SCN
BT
-51.24 388.9470000000002 Td
+51.24 388.9470000000006 Td
/F5.0 10.5 Tf
<7070696e6753657276696365> Tj
ET
@@ -66005,7 +65994,7 @@ ET
0.200 0.200 0.200 scn
BT
-51.24 374.66700000000014 Td
+51.24 374.6670000000006 Td
/F1.0 10.5 Tf
<5d60> Tj
ET
@@ -66042,7 +66031,7 @@ S
0.694 0.129 0.275 SCN
BT
-122.4970716 769.0470000000001 Td
+122.4970716 769.0470000000006 Td
/F5.0 10.5 Tf
<436f6e74656e744d617070696e6753657276696365> Tj
ET
@@ -66081,7 +66070,7 @@ S
0.694 0.129 0.275 SCN
BT
-407.52535800000004 769.0470000000001 Td
+407.52535800000004 769.0470000000006 Td
/F5.0 10.5 Tf
<6164756766756e> Tj
ET
@@ -66120,7 +66109,7 @@ S
0.694 0.129 0.275 SCN
BT
-51.24 353.571 Td
+51.24 353.5710000000005 Td
/F5.0 10.5 Tf
<787265663a2e2e2f75676675> Tj
ET
@@ -66131,7 +66120,7 @@ ET
0.694 0.129 0.275 SCN
BT
-51.24 342.126 Td
+51.24 342.12600000000043 Td
/F5.0 10.5 Tf
<6e2f756766756e2e61646f63> Tj
ET
@@ -66142,7 +66131,7 @@ ET
0.694 0.129 0.275 SCN
BT
-51.24 327.846 Td
+51.24 327.84600000000046 Td
/F5.0 10.5 Tf
<237878785b7474745d> Tj
ET
@@ -66151,56 +66140,56 @@ ET
0.200 0.200 0.200 scn
BT
-98.49000000000001 327.846 Td
+98.49000000000001 327.84600000000046 Td
/F1.0 10.5 Tf
<2061> Tj
ET
BT
-51.24 313.566 Td
+51.24 313.56600000000043 Td
/F1.0 10.5 Tf
[<68> 20.01953125 <797065726c696e6b20746f>] TJ
ET
BT
-51.24 299.286 Td
+51.24 299.28600000000046 Td
/F1.0 10.5 Tf
<6120626f6f6b6d61726b> Tj
ET
BT
-51.24 285.006 Td
+51.24 285.0060000000004 Td
/F1.0 10.5 Tf
<77697468696e20746865> Tj
ET
BT
-51.24 270.726 Td
+51.24 270.72600000000045 Td
/F1.0 10.5 Tf
<66756e64616d656e74616c> Tj
ET
BT
-51.24 256.446 Td
+51.24 256.4460000000005 Td
/F1.0 10.5 Tf
<7320757365727327> Tj
ET
BT
-51.24 242.166 Td
+51.24 242.16600000000045 Td
/F1.0 10.5 Tf
<67756964652c> Tj
ET
BT
-51.24 227.886 Td
+51.24 227.88600000000045 Td
/F1.0 10.5 Tf
<77686572653a202a20> Tj
ET
@@ -66209,7 +66198,7 @@ ET
0.694 0.129 0.275 SCN
BT
-96.81 227.886 Td
+96.81 227.88600000000045 Td
/F5.0 10.5 Tf
<787878> Tj
ET
@@ -66218,26 +66207,26 @@ ET
0.200 0.200 0.200 scn
BT
-112.56 227.886 Td
+112.56 227.88600000000045 Td
ET
BT
-51.24 213.606 Td
+51.24 213.60600000000045 Td
/F1.0 10.5 Tf
<697320746865> Tj
ET
BT
-51.24 199.326 Td
+51.24 199.32600000000045 Td
/F1.0 10.5 Tf
<626f6f6b6d61726bd573> Tj
ET
BT
-51.24 185.046 Td
+51.24 185.04600000000045 Td
/F1.0 10.5 Tf
<616e63686f72202a20> Tj
ET
@@ -66246,7 +66235,7 @@ ET
0.694 0.129 0.275 SCN
BT
-97.4295 185.046 Td
+97.4295 185.04600000000045 Td
/F5.0 10.5 Tf
<747474> Tj
ET
@@ -66255,40 +66244,40 @@ ET
0.200 0.200 0.200 scn
BT
-113.1795 185.046 Td
+113.1795 185.04600000000045 Td
ET
BT
-51.24 170.766 Td
+51.24 170.76600000000045 Td
/F1.0 10.5 Tf
<697320746865207465787420746f> Tj
ET
BT
-51.24 156.486 Td
+51.24 156.48600000000044 Td
/F1.0 10.5 Tf
[<646973706c61> 20.01953125 <79206173>] TJ
ET
BT
-51.24 142.206 Td
+51.24 142.20600000000044 Td
/F1.0 10.5 Tf
<746865> Tj
ET
BT
-51.24 127.92599999999999 Td
+51.24 127.92600000000044 Td
/F1.0 10.5 Tf
[<68> 20.01953125 <797065726c696e6b>] TJ
ET
BT
-51.24 113.64599999999999 Td
+51.24 113.64600000000044 Td
/F1.0 10.5 Tf
<666f72206578616d706c653a> Tj
ET
@@ -66297,7 +66286,7 @@ ET
0.694 0.129 0.275 SCN
BT
-51.24 102.20099999999996 Td
+51.24 102.20100000000042 Td
/F5.0 10.5 Tf
<787265663a2e2e2f75676675> Tj
ET
@@ -66308,7 +66297,7 @@ ET
0.694 0.129 0.275 SCN
BT
-51.24 90.75599999999997 Td
+51.24 90.75600000000043 Td
/F5.0 10.5 Tf
<6e2f756766756e2e61646f63> Tj
ET
@@ -66319,7 +66308,7 @@ ET
0.694 0.129 0.275 SCN
BT
-51.24 79.31099999999998 Td
+51.24 79.31100000000043 Td
/F5.0 10.5 Tf
<235f756766756e5f636f7265> Tj
ET
@@ -66330,7 +66319,7 @@ ET
0.694 0.129 0.275 SCN
BT
-51.24 67.86599999999999 Td
+51.24 67.86600000000044 Td
/F5.0 10.5 Tf
<2d636f6e63657074735b436f> Tj
ET
@@ -66341,7 +66330,7 @@ ET
0.694 0.129 0.275 SCN
BT
-51.24 56.42099999999999 Td
+51.24 56.42100000000045 Td
/F5.0 10.5 Tf
<726520636f6e63657074735d> Tj
ET
@@ -66380,7 +66369,7 @@ S
0.259 0.545 0.792 SCN
BT
-122.4970716 351.387 Td
+122.4970716 351.38700000000046 Td
/F1.0 10.5 Tf
<436f726520636f6e6365707473> Tj
ET
@@ -66419,7 +66408,7 @@ S
0.694 0.129 0.275 SCN
BT
-407.52535800000004 353.571 Td
+407.52535800000004 353.5710000000005 Td
/F5.0 10.5 Tf
<616475677677> Tj
ET
@@ -66474,7 +66463,7 @@ endobj
/URI (../rgsvc/rgsvc.pdf#_rgsvc_presentation-layer-spi_ContentMappingServicef)
>>
/Subtype /Link
-/Rect [122.4970716 767.5770000000001 232.7470716 778.0770000000001]
+/Rect [122.4970716 767.5770000000006 232.7470716 778.0770000000006]
/Type /Annot
>>
endobj
@@ -66485,7 +66474,7 @@ endobj
/URI (../ugfun/ugfun.pdf#_ugfun_core-concepts)
>>
/Subtype /Link
-/Rect [122.4970716 348.321 191.92307160000001 362.601]
+/Rect [122.4970716 348.3210000000005 191.92307160000001 362.60100000000045]
/Type /Annot
>>
endobj
@@ -78289,327 +78278,327 @@ xref
0003385558 00000 n
0003385817 00000 n
0003386033 00000 n
-0003393574 00000 n
-0003393833 00000 n
-0003394070 00000 n
-0003405975 00000 n
-0003406242 00000 n
-0003406487 00000 n
-0003406687 00000 n
-0003418180 00000 n
-0003418447 00000 n
-0003418657 00000 n
-0003418865 00000 n
-0003430830 00000 n
-0003431097 00000 n
-0003431329 00000 n
-0003431546 00000 n
-0003460449 00000 n
-0003460721 00000 n
-0003460767 00000 n
-0003460825 00000 n
-0003673414 00000 n
-0003677087 00000 n
-0003677307 00000 n
-0003706416 00000 n
-0003706689 00000 n
-0003706735 00000 n
-0003706792 00000 n
-0003707219 00000 n
-0003707277 00000 n
-0003707488 00000 n
-0003707556 00000 n
-0003708100 00000 n
-0003726359 00000 n
-0003726698 00000 n
-0003726744 00000 n
-0003726924 00000 n
-0003727166 00000 n
-0003727370 00000 n
-0003727572 00000 n
-0003727780 00000 n
-0003727982 00000 n
-0003728192 00000 n
-0003728397 00000 n
-0003728602 00000 n
-0003728648 00000 n
-0003728858 00000 n
-0003729084 00000 n
-0003740429 00000 n
-0003740709 00000 n
-0003740755 00000 n
-0003740941 00000 n
-0003741172 00000 n
-0003741299 00000 n
-0003741417 00000 n
-0003741542 00000 n
-0003741668 00000 n
-0003741809 00000 n
-0003741941 00000 n
-0003742081 00000 n
-0003742222 00000 n
-0003742371 00000 n
-0003742520 00000 n
-0003742660 00000 n
-0003742812 00000 n
-0003742986 00000 n
-0003743170 00000 n
-0003743340 00000 n
-0003743520 00000 n
-0003743696 00000 n
-0003743872 00000 n
-0003744067 00000 n
-0003744262 00000 n
-0003744413 00000 n
-0003744575 00000 n
-0003744731 00000 n
-0003744898 00000 n
-0003745077 00000 n
-0003745256 00000 n
-0003745427 00000 n
-0003745608 00000 n
-0003745789 00000 n
-0003745980 00000 n
-0003746172 00000 n
-0003746364 00000 n
-0003746556 00000 n
-0003746758 00000 n
-0003746917 00000 n
-0003747076 00000 n
-0003747234 00000 n
-0003747402 00000 n
-0003747569 00000 n
-0003747746 00000 n
-0003747910 00000 n
-0003748084 00000 n
-0003748259 00000 n
-0003748434 00000 n
-0003748608 00000 n
-0003748782 00000 n
-0003748959 00000 n
-0003749136 00000 n
-0003749287 00000 n
-0003749449 00000 n
-0003749621 00000 n
-0003749793 00000 n
-0003749964 00000 n
-0003750135 00000 n
-0003750286 00000 n
-0003750448 00000 n
-0003750618 00000 n
-0003750788 00000 n
-0003750961 00000 n
-0003751136 00000 n
-0003751302 00000 n
-0003751479 00000 n
-0003751630 00000 n
-0003751791 00000 n
-0003751960 00000 n
-0003752129 00000 n
-0003752292 00000 n
-0003752455 00000 n
-0003752616 00000 n
-0003752777 00000 n
-0003752948 00000 n
-0003753119 00000 n
-0003753278 00000 n
-0003753439 00000 n
-0003753609 00000 n
-0003753779 00000 n
-0003753942 00000 n
-0003754105 00000 n
-0003754241 00000 n
-0003754389 00000 n
-0003754535 00000 n
-0003754692 00000 n
-0003754893 00000 n
-0003755105 00000 n
-0003755317 00000 n
-0003755529 00000 n
-0003755731 00000 n
-0003755944 00000 n
-0003756116 00000 n
-0003756288 00000 n
-0003756436 00000 n
-0003756594 00000 n
-0003756748 00000 n
-0003756905 00000 n
-0003757070 00000 n
-0003757216 00000 n
-0003757375 00000 n
-0003757537 00000 n
-0003757701 00000 n
-0003757864 00000 n
-0003758038 00000 n
-0003758204 00000 n
-0003758373 00000 n
-0003758536 00000 n
-0003758709 00000 n
-0003758872 00000 n
-0003759045 00000 n
-0003759219 00000 n
-0003759393 00000 n
-0003759558 00000 n
-0003759723 00000 n
-0003759893 00000 n
-0003760063 00000 n
-0003760223 00000 n
-0003760393 00000 n
-0003760548 00000 n
-0003760714 00000 n
-0003760880 00000 n
-0003761056 00000 n
-0003761214 00000 n
-0003761382 00000 n
-0003761543 00000 n
-0003761706 00000 n
-0003761868 00000 n
-0003762032 00000 n
-0003762197 00000 n
-0003762365 00000 n
-0003762533 00000 n
-0003762701 00000 n
-0003762868 00000 n
-0003763035 00000 n
-0003763189 00000 n
-0003763345 00000 n
-0003763504 00000 n
-0003763663 00000 n
-0003763819 00000 n
-0003763975 00000 n
-0003764118 00000 n
-0003764271 00000 n
-0003764437 00000 n
-0003764603 00000 n
-0003764756 00000 n
-0003764909 00000 n
-0003765048 00000 n
-0003765197 00000 n
-0003765360 00000 n
-0003765523 00000 n
-0003765672 00000 n
-0003765832 00000 n
-0003765987 00000 n
-0003766144 00000 n
-0003766431 00000 n
-0003766509 00000 n
-0003766686 00000 n
-0003766878 00000 n
-0003767143 00000 n
-0003767318 00000 n
-0003767563 00000 n
-0003767824 00000 n
-0003768051 00000 n
-0003768305 00000 n
-0003768527 00000 n
-0003768736 00000 n
-0003768984 00000 n
-0003769239 00000 n
-0003769517 00000 n
-0003769671 00000 n
-0003769887 00000 n
-0003770107 00000 n
-0003770372 00000 n
-0003770629 00000 n
-0003770920 00000 n
-0003771206 00000 n
-0003771436 00000 n
-0003771665 00000 n
-0003771874 00000 n
-0003772150 00000 n
-0003772418 00000 n
-0003772617 00000 n
-0003772863 00000 n
-0003773121 00000 n
-0003773382 00000 n
-0003773598 00000 n
-0003773835 00000 n
-0003774104 00000 n
-0003774375 00000 n
-0003774662 00000 n
-0003774900 00000 n
-0003775120 00000 n
-0003775333 00000 n
-0003775574 00000 n
-0003775783 00000 n
-0003776039 00000 n
-0003776316 00000 n
-0003776528 00000 n
-0003776776 00000 n
-0003777109 00000 n
-0003777491 00000 n
-0003777821 00000 n
-0003778004 00000 n
-0003778200 00000 n
-0003778387 00000 n
-0003778686 00000 n
-0003778860 00000 n
-0003779056 00000 n
-0003779268 00000 n
-0003779481 00000 n
-0003779730 00000 n
-0003779900 00000 n
-0003780089 00000 n
-0003780290 00000 n
-0003780470 00000 n
-0003780691 00000 n
-0003780883 00000 n
-0003781092 00000 n
-0003781297 00000 n
-0003781512 00000 n
-0003781826 00000 n
-0003782060 00000 n
-0003782260 00000 n
-0003782477 00000 n
-0003782670 00000 n
-0003782855 00000 n
-0003783088 00000 n
-0003783272 00000 n
-0003783439 00000 n
-0003783737 00000 n
-0003783918 00000 n
-0003784141 00000 n
-0003784813 00000 n
-0003794497 00000 n
-0003794713 00000 n
-0003796076 00000 n
-0003797121 00000 n
-0003805963 00000 n
-0003806184 00000 n
-0003807547 00000 n
-0003808613 00000 n
-0003810062 00000 n
-0003810273 00000 n
-0003810594 00000 n
-0003811510 00000 n
-0003817875 00000 n
-0003818101 00000 n
-0003819464 00000 n
-0003820541 00000 n
-0003826652 00000 n
-0003826866 00000 n
-0003828229 00000 n
-0003829274 00000 n
-0003830737 00000 n
-0003830955 00000 n
-0003832318 00000 n
-0003833455 00000 n
-0003834618 00000 n
-0003834834 00000 n
-0003835137 00000 n
-0003836274 00000 n
-0003837850 00000 n
-0003838064 00000 n
-0003838372 00000 n
-0003839510 00000 n
-0003841231 00000 n
-0003841444 00000 n
-0003842807 00000 n
+0003393409 00000 n
+0003393668 00000 n
+0003393901 00000 n
+0003406071 00000 n
+0003406338 00000 n
+0003406583 00000 n
+0003406804 00000 n
+0003418297 00000 n
+0003418564 00000 n
+0003418774 00000 n
+0003418982 00000 n
+0003430947 00000 n
+0003431214 00000 n
+0003431446 00000 n
+0003431663 00000 n
+0003460566 00000 n
+0003460838 00000 n
+0003460884 00000 n
+0003460942 00000 n
+0003673531 00000 n
+0003677204 00000 n
+0003677424 00000 n
+0003706533 00000 n
+0003706806 00000 n
+0003706852 00000 n
+0003706909 00000 n
+0003707336 00000 n
+0003707394 00000 n
+0003707605 00000 n
+0003707673 00000 n
+0003708217 00000 n
+0003726476 00000 n
+0003726815 00000 n
+0003726861 00000 n
+0003727041 00000 n
+0003727283 00000 n
+0003727487 00000 n
+0003727689 00000 n
+0003727897 00000 n
+0003728099 00000 n
+0003728309 00000 n
+0003728514 00000 n
+0003728719 00000 n
+0003728765 00000 n
+0003728975 00000 n
+0003729201 00000 n
+0003740546 00000 n
+0003740826 00000 n
+0003740872 00000 n
+0003741058 00000 n
+0003741289 00000 n
+0003741416 00000 n
+0003741534 00000 n
+0003741659 00000 n
+0003741785 00000 n
+0003741926 00000 n
+0003742058 00000 n
+0003742198 00000 n
+0003742339 00000 n
+0003742488 00000 n
+0003742637 00000 n
+0003742777 00000 n
+0003742929 00000 n
+0003743103 00000 n
+0003743287 00000 n
+0003743457 00000 n
+0003743637 00000 n
+0003743813 00000 n
+0003743989 00000 n
+0003744184 00000 n
+0003744379 00000 n
+0003744530 00000 n
+0003744692 00000 n
+0003744848 00000 n
+0003745015 00000 n
+0003745194 00000 n
+0003745373 00000 n
+0003745544 00000 n
+0003745725 00000 n
+0003745906 00000 n
+0003746097 00000 n
+0003746289 00000 n
+0003746481 00000 n
+0003746673 00000 n
+0003746875 00000 n
+0003747034 00000 n
+0003747193 00000 n
+0003747351 00000 n
+0003747519 00000 n
+0003747686 00000 n
+0003747863 00000 n
+0003748027 00000 n
+0003748201 00000 n
+0003748376 00000 n
+0003748551 00000 n
+0003748725 00000 n
+0003748899 00000 n
+0003749076 00000 n
+0003749253 00000 n
+0003749404 00000 n
+0003749566 00000 n
+0003749738 00000 n
+0003749910 00000 n
+0003750081 00000 n
+0003750252 00000 n
+0003750403 00000 n
+0003750565 00000 n
+0003750735 00000 n
+0003750905 00000 n
+0003751078 00000 n
+0003751253 00000 n
+0003751419 00000 n
+0003751596 00000 n
+0003751747 00000 n
+0003751908 00000 n
+0003752077 00000 n
+0003752246 00000 n
+0003752409 00000 n
+0003752572 00000 n
+0003752733 00000 n
+0003752894 00000 n
+0003753065 00000 n
+0003753236 00000 n
+0003753395 00000 n
+0003753556 00000 n
+0003753726 00000 n
+0003753896 00000 n
+0003754059 00000 n
+0003754222 00000 n
+0003754358 00000 n
+0003754506 00000 n
+0003754652 00000 n
+0003754809 00000 n
+0003755010 00000 n
+0003755222 00000 n
+0003755434 00000 n
+0003755646 00000 n
+0003755848 00000 n
+0003756061 00000 n
+0003756233 00000 n
+0003756405 00000 n
+0003756553 00000 n
+0003756711 00000 n
+0003756865 00000 n
+0003757022 00000 n
+0003757187 00000 n
+0003757333 00000 n
+0003757492 00000 n
+0003757654 00000 n
+0003757818 00000 n
+0003757981 00000 n
+0003758155 00000 n
+0003758321 00000 n
+0003758490 00000 n
+0003758653 00000 n
+0003758826 00000 n
+0003758989 00000 n
+0003759162 00000 n
+0003759336 00000 n
+0003759510 00000 n
+0003759675 00000 n
+0003759840 00000 n
+0003760010 00000 n
+0003760180 00000 n
+0003760340 00000 n
+0003760510 00000 n
+0003760665 00000 n
+0003760831 00000 n
+0003760997 00000 n
+0003761173 00000 n
+0003761331 00000 n
+0003761499 00000 n
+0003761660 00000 n
+0003761823 00000 n
+0003761985 00000 n
+0003762149 00000 n
+0003762314 00000 n
+0003762482 00000 n
+0003762650 00000 n
+0003762818 00000 n
+0003762985 00000 n
+0003763152 00000 n
+0003763306 00000 n
+0003763462 00000 n
+0003763621 00000 n
+0003763780 00000 n
+0003763936 00000 n
+0003764092 00000 n
+0003764235 00000 n
+0003764388 00000 n
+0003764554 00000 n
+0003764720 00000 n
+0003764873 00000 n
+0003765026 00000 n
+0003765165 00000 n
+0003765314 00000 n
+0003765477 00000 n
+0003765640 00000 n
+0003765789 00000 n
+0003765949 00000 n
+0003766104 00000 n
+0003766261 00000 n
+0003766548 00000 n
+0003766626 00000 n
+0003766803 00000 n
+0003766995 00000 n
+0003767260 00000 n
+0003767435 00000 n
+0003767680 00000 n
+0003767941 00000 n
+0003768168 00000 n
+0003768422 00000 n
+0003768644 00000 n
+0003768853 00000 n
+0003769101 00000 n
+0003769356 00000 n
+0003769634 00000 n
+0003769788 00000 n
+0003770004 00000 n
+0003770224 00000 n
+0003770489 00000 n
+0003770746 00000 n
+0003771037 00000 n
+0003771323 00000 n
+0003771553 00000 n
+0003771782 00000 n
+0003771991 00000 n
+0003772267 00000 n
+0003772535 00000 n
+0003772734 00000 n
+0003772980 00000 n
+0003773238 00000 n
+0003773499 00000 n
+0003773715 00000 n
+0003773952 00000 n
+0003774221 00000 n
+0003774492 00000 n
+0003774779 00000 n
+0003775017 00000 n
+0003775237 00000 n
+0003775450 00000 n
+0003775691 00000 n
+0003775900 00000 n
+0003776156 00000 n
+0003776433 00000 n
+0003776645 00000 n
+0003776893 00000 n
+0003777226 00000 n
+0003777608 00000 n
+0003777938 00000 n
+0003778121 00000 n
+0003778317 00000 n
+0003778504 00000 n
+0003778803 00000 n
+0003778977 00000 n
+0003779173 00000 n
+0003779385 00000 n
+0003779598 00000 n
+0003779847 00000 n
+0003780017 00000 n
+0003780206 00000 n
+0003780407 00000 n
+0003780587 00000 n
+0003780808 00000 n
+0003781000 00000 n
+0003781209 00000 n
+0003781414 00000 n
+0003781629 00000 n
+0003781943 00000 n
+0003782177 00000 n
+0003782377 00000 n
+0003782594 00000 n
+0003782787 00000 n
+0003782972 00000 n
+0003783205 00000 n
+0003783389 00000 n
+0003783556 00000 n
+0003783854 00000 n
+0003784035 00000 n
+0003784258 00000 n
+0003784930 00000 n
+0003794614 00000 n
+0003794830 00000 n
+0003796193 00000 n
+0003797238 00000 n
+0003806080 00000 n
+0003806301 00000 n
+0003807664 00000 n
+0003808730 00000 n
+0003810179 00000 n
+0003810390 00000 n
+0003810711 00000 n
+0003811627 00000 n
+0003817992 00000 n
+0003818218 00000 n
+0003819581 00000 n
+0003820658 00000 n
+0003826769 00000 n
+0003826983 00000 n
+0003828346 00000 n
+0003829391 00000 n
+0003830854 00000 n
+0003831072 00000 n
+0003832435 00000 n
+0003833572 00000 n
+0003834735 00000 n
+0003834951 00000 n
+0003835254 00000 n
+0003836391 00000 n
+0003837967 00000 n
+0003838181 00000 n
+0003838489 00000 n
+0003839627 00000 n
+0003841348 00000 n
+0003841561 00000 n
+0003842924 00000 n
trailer
<< /Size 968
/Root 2 0 R
/Info 1 0 R
>>
startxref
-3843940
+3844057
%%EOF
http://git-wip-us.apache.org/repos/asf/isis-site/blob/274edd1d/content/versions/2.0.0-M1/guides/htg.html
----------------------------------------------------------------------
diff --git a/content/versions/2.0.0-M1/guides/htg.html b/content/versions/2.0.0-M1/guides/htg.html
index 1d4f12c..2a62fba 100644
--- a/content/versions/2.0.0-M1/guides/htg.html
+++ b/content/versions/2.0.0-M1/guides/htg.html
@@ -916,14 +916,17 @@ table.CodeRay td.code>pre{padding:0}
<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 (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>
+ <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).</p>
+ </div>
+ <div class="paragraph">
+ <p>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>
</table>
</div>
<div class="paragraph">
- <p>The framework also supports i18n: locale-specific names and descriptions. for more information, see the <a href="../ugbtb/ugbtb.html#_ugbtb_i18n">beyond-the-basics</a> guide.</p>
+ <p>The framework also supports i18n: locale-specific names and descriptions. For more information, see the <a href="../ugbtb/ugbtb.html#_ugbtb_i18n">beyond-the-basics</a> guide.</p>
</div>
</div>
<div class="sect2">
@@ -2195,7 +2198,7 @@ securityManager.cacheManager = $memoryCacheManager</code></pre>
<p>The framework provides default implementations for many of the <a href="../rgsvc/rgsvc.html">domain services</a>. This is convenient, but sometimes you will want to replace the default implementation with your own service implementation.</p>
</div>
<div class="paragraph">
- <p>For example, suppose you wanted to provide your own implementation of <a href="../rgsvc/rgsvc.html#_rgsvc_api_LocaleProvider"><code>LocaleProvider</code></a>. The trick is to use the <a href="../rgant/rgant.html#_rgant-DomainService_menuOrder"><code>@DomainService#menuOrder()</code></a> attribute, specifying a low number (typically <code>"1"</code>).</p>
+ <p>For example, suppose you wanted to provide your own implementation of <a href="../rgsvc/rgsvc.html#_rgsvc_presentation-layer-spi_LocaleProvider"><code>LocaleProvider</code></a>. The trick is to use the <a href="../rgant/rgant.html#_rgant-DomainService_menuOrder"><code>@DomainService#menuOrder()</code></a> attribute, specifying a low number (typically <code>"1"</code>).</p>
</div>
<div class="paragraph">
<p>Here’s how:</p>
@@ -2762,7 +2765,7 @@ serviceRegistry.injectServicesInto(viewModel);</code></pre>
<span class="keyword">if</span>(original != <span class="predefined-constant">null</span>) { <i class="conum" data-value="2"></i><b>(2)</b>
<span class="keyword">return</span> original;
}
- container.flush(); <i class="conum" data-value="3"></i><b>(3)</b>
+ repositoryService.flush(); <i class="conum" data-value="3"></i><b>(3)</b>
<span class="directive">final</span> BreadcrumbModelProvider wicketSession = <i class="conum" data-value="4"></i><b>(4)</b>
(BreadcrumbModelProvider) AuthenticatedWebSession.get();
@@ -2788,7 +2791,7 @@ serviceRegistry.injectServicesInto(viewModel);</code></pre>
<span class="annotation">@Inject</span>
HomePageProviderService homePageProviderService;
<span class="annotation">@Inject</span>
- DomainObjectContainer container;
+ RepositoryService repositoryService;
}</code></pre>
</div>
</div>
[12/39] isis-site git commit: ISIS-1810: updates docs for 2.0.0-M1
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/274edd1d/content/versions/SNAPSHOT/guides/rgfis/rgfis.html
----------------------------------------------------------------------
diff --git a/content/versions/SNAPSHOT/guides/rgfis/rgfis.html b/content/versions/SNAPSHOT/guides/rgfis/rgfis.html
index 79c4991..3530f3d 100644
--- a/content/versions/SNAPSHOT/guides/rgfis/rgfis.html
+++ b/content/versions/SNAPSHOT/guides/rgfis/rgfis.html
@@ -697,13 +697,10 @@ table.CodeRay td.code>pre{padding:0}
<p>The <code>RepresentationService</code> is the main plug-in point for the <a href="../ugvro/ugvro.html">RestfulObjects viewer</a> to generate representations.</p>
</div>
<div class="paragraph">
- <p>The default implementation generates representations according to the <a href="http://restfulobjects.org">Restful Objects spec</a> v1.0. However, it also delegates to the <a href="../rgfis/rgfis.html#_rgfis_presentation-layer_ContentNegotiationService"><code>ContentNegotiationService</code></a> which provides a mechanism for altering representations according to the HTTP <code>Accept</code> header.</p>
+ <p>The default implementations ultimately generate representations according to the <a href="http://restfulobjects.org">Restful Objects spec</a> v1.0. However, it also delegates to the <a href="../rgfis/rgfis.html#_rgfis_presentation-layer_ContentNegotiationService"><code>ContentNegotiationService</code></a> which provides a mechanism for altering representations according to the HTTP <code>Accept</code> header. This allows more flexible representations to be generated for REST clients that (perhaps through their use of a certain Javascript library, say) expect, or at least works best with, a certain style of representation.</p>
</div>
<div class="paragraph">
- <p>The principal motivation is to allow more flexible representations to be generated for REST clients that (perhaps through their use of a certain Javascript library, say) expect, or at least works best with, a certain style of representation.</p>
- </div>
- <div class="paragraph">
- <p>In all there are three domain services that can influence the representations generated: this service, <a href="../rgfis/rgfis.html#_rgfis_presentation-layer_ContentNegotiationService"><code>ContentNegotiationService</code></a>and the <a href="../rgsvc/rgsvc.html#_rgsvc_presentation-layer-spi_ContentMappingService"><code>ContentMappingService</code></a>. The diagram below shows how these collaborate:</p>
+ <p>In all there are three domain services that can influence the representations generated: this service, <a href="../rgfis/rgfis.html#_rgfis_presentation-layer_ContentNegotiationService"><code>ContentNegotiationService</code></a> and the <a href="../rgsvc/rgsvc.html#_rgsvc_presentation-layer-spi_ContentMappingService"><code>ContentMappingService</code></a>. The diagram below shows how these collaborate:</p>
</div>
<div class="imageblock">
<div class="content">
@@ -711,7 +708,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="paragraph">
- <p>The <code>RepresentationServiceForRestfulObjects</code> is the default implementation of this service; likewise <code>ContentNegotiationServiceXRoDomainType</code> is the default implementation of the <code>ContentNegotiationService</code>. If you inspect the source code you’ll see that the default implementation of this service’s primary responsibility is to generate the default Restful Objects representations. Therefore, if you what you want to do is to generate a <em>different _representation then in many cases replacing either this service _or</em> the <code>ContentNegotiationService</code> will be equivalent (you’ll notice that their SPIs are very similar).</p>
+ <p>The <code>RepresentationServiceContentNegotiator</code> is the default implementation of the top-level <code>RepresentationService</code>, and it delegates to list of injecting <code>ContentNegotiationService</code> services. Using a chain of responsibility pattern, it returns the first non-null representation. For their part, the implementations of <code>ContentNegotiationService</code> use the HTTP Accept header to determine if they should render any representation or just return null.</p>
</div>
<div class="sect3">
<h4 id="_spi_2">2.2.1. SPI</h4>
@@ -750,23 +747,23 @@ table.CodeRay td.code>pre{padding:0}
<tbody>
<tr>
<td><i class="conum" data-value="1"></i><b>1</b></td>
- <td>representation of a single object, as per section 14.4 of the RO spec, v1.0</td>
+ <td>representation of a single object, eg as per section 14.4 of the RO spec, v1.0</td>
</tr>
<tr>
<td><i class="conum" data-value="2"></i><b>2</b></td>
- <td>representation of a single property of an object, as per section 16.4 of the RO spec v1.0</td>
+ <td>representation of a single property of an object, eg as per section 16.4 of the RO spec v1.0</td>
</tr>
<tr>
<td><i class="conum" data-value="3"></i><b>3</b></td>
- <td>representation of a single collection of an object, as per section 17.5 of the RO spec v1.0</td>
+ <td>representation of a single collection of an object, eg as per section 17.5 of the RO spec v1.0</td>
</tr>
<tr>
<td><i class="conum" data-value="4"></i><b>4</b></td>
- <td>representation of a single action (prompt) of an object, as per section 18.2 of the RO spec v1.0</td>
+ <td>representation of a single action (prompt) of an object, eg as per section 18.2 of the RO spec v1.0</td>
</tr>
<tr>
<td><i class="conum" data-value="5"></i><b>5</b></td>
- <td>representation of the results of a single action invocation, as per section 19.5 of the RO spec v1.0</td>
+ <td>representation of the results of a single action invocation, eg as per section 19.5 of the RO spec v1.0</td>
</tr>
</tbody>
</table>
@@ -1457,7 +1454,7 @@ table.CodeRay td.code>pre{padding:0}
</ul>
</div>
<div class="paragraph">
- <p>The (internal) <code>PublishingServiceInternal</code> domain service acts as an internal facade to any configured <a href="../rgsvc/rgsvc.html#_rgsvc_persistence-layer-spi_PublisherService"><code>PublisherService</code></a> or (deprecated) <a href="../rgsvc/rgsvc.html#_rgsvc_persistence-layer-spi_PublishingService"><code>PublishingService</code></a> domain services.</p>
+ <p>The (internal) <code>PublishingServiceInternal</code> domain service acts as an internal facade to any configured <a href="../rgsvc/rgsvc.html#_rgsvc_persistence-layer-spi_PublisherService"><code>PublisherService</code></a> domain service(s).</p>
</div>
<div class="paragraph">
<p>For published action invocations/ property edits, it provides an API for those member executions to call.</p>
@@ -1512,7 +1509,7 @@ table.CodeRay td.code>pre{padding:0}
<div class="sect3">
<h4 id="_related_classes_3">4.4.3. Related Classes</h4>
<div class="paragraph">
- <p>The service delegates between the (internal) <a href="../rgfis/rgfis.html#_rgfis_persistence-layer_ChangedObjectsServiceInternal"><code>ChangedObjectsServiceInternal</code></a> domain service to the configured <a href="../rgsvc/rgsvc.html#_rgsvc_persistence-layer-spi_PublisherService"><code>PublisherService</code></a> and <a href="../rgsvc/rgsvc.html#_rgsvc_persistence-layer-spi_PublishingService"><code>PublishingService</code></a>.</p>
+ <p>The service delegates between the (internal) <a href="../rgfis/rgfis.html#_rgfis_persistence-layer_ChangedObjectsServiceInternal"><code>ChangedObjectsServiceInternal</code></a> domain service to the configured <a href="../rgsvc/rgsvc.html#_rgsvc_persistence-layer-spi_PublisherService"><code>PublisherService</code></a>.</p>
</div>
<div class="paragraph">
<p>The (internal) <a href="../rgfis/rgfis.html#_rgfis_persistence-layer_AuditingServiceInternal"><code>AuditingServiceInternal</code></a> performs a similar function for the <a href="../rgsvc/rgsvc.html#_rgsvc_persistence-layer-spi_PublisherService"><code>PublisherService</code></a>, also collating details of the changed objects from <code>ChangedObjectsServiceInternal</code>.</p>
[15/39] isis-site git commit: ISIS-1810: updates docs for 2.0.0-M1
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/274edd1d/content/versions/SNAPSHOT/guides/rgant/rgant.pdf
----------------------------------------------------------------------
diff --git a/content/versions/SNAPSHOT/guides/rgant/rgant.pdf b/content/versions/SNAPSHOT/guides/rgant/rgant.pdf
index dc738b3..ceae323 100644
--- a/content/versions/SNAPSHOT/guides/rgant/rgant.pdf
+++ b/content/versions/SNAPSHOT/guides/rgant/rgant.pdf
@@ -4,16 +4,16 @@
<< /Title (Annotations)
/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:20180812182341+01'00')
-/ModDate (D:20180812182341+01'00')
+/CreationDate (D:20180814003721+02'00')
+/ModDate (D:20180814003721+02'00')
>>
endobj
2 0 obj
<< /Type /Catalog
/Pages 3 0 R
/Names 20 0 R
-/Outlines 2064 0 R
-/PageLabels 2225 0 R
+/Outlines 2060 0 R
+/PageLabels 2221 0 R
/PageMode /UseOutlines
/OpenAction [7 0 R /FitH 842.89]
/ViewerPreferences << /DisplayDocTitle true
@@ -22,8 +22,8 @@ endobj
endobj
3 0 obj
<< /Type /Pages
-/Count 183
-/Kids [7 0 R 10 0 R 12 0 R 14 0 R 16 0 R 18 0 R 42 0 R 45 0 R 66 0 R 81 0 R 109 0 R 154 0 R 156 0 R 158 0 R 172 0 R 182 0 R 185 0 R 198 0 R 203 0 R 205 0 R 211 0 R 214 0 R 218 0 R 231 0 R 233 0 R 239 0 R 249 0 R 256 0 R 262 0 R 266 0 R 272 0 R 274 0 R 295 0 R 303 0 R 310 0 R 317 0 R 334 0 R 345 0 R 353 0 R 369 0 R 375 0 R 383 0 R 392 0 R 407 0 R 413 0 R 416 0 R 432 0 R 439 0 R 446 0 R 450 0 R 463 0 R 479 0 R 495 0 R 502 0 R 514 0 R 524 0 R 530 0 R 533 0 R 541 0 R 549 0 R 556 0 R 558 0 R 563 0 R 577 0 R 582 0 R 598 0 R 625 0 R 631 0 R 634 0 R 647 0 R 660 0 R 666 0 R 671 0 R 677 0 R 681 0 R 684 0 R 690 0 R 700 0 R 705 0 R 713 0 R 725 0 R 737 0 R 743 0 R 749 0 R 756 0 R 763 0 R 767 0 R 774 0 R 795 0 R 801 0 R 808 0 R 825 0 R 835 0 R 841 0 R 858 0 R 868 0 R 881 0 R 893 0 R 904 0 R 910 0 R 916 0 R 926 0 R 931 0 R 941 0 R 948 0 R 957 0 R 963 0 R 969 0 R 980 0 R 989 0 R 992 0 R 995 0 R 1002 0 R 1006 0 R 1019 0 R 1025 0 R 1028 0 R 1034 0 R 1044 0 R 1051 0 R 1053 0 R 1057 0 R 1066 0 R 1072 0
R 1082 0 R 1091 0 R 1099 0 R 1103 0 R 1108 0 R 1110 0 R 1123 0 R 1136 0 R 1146 0 R 1161 0 R 1167 0 R 1172 0 R 1175 0 R 1188 0 R 1194 0 R 1205 0 R 1209 0 R 1218 0 R 1225 0 R 1230 0 R 1243 0 R 1253 0 R 1267 0 R 1275 0 R 1280 0 R 1284 0 R 1292 0 R 1298 0 R 1303 0 R 1317 0 R 1324 0 R 1332 0 R 1337 0 R 1342 0 R 1349 0 R 1352 0 R 1355 0 R 1361 0 R 1377 0 R 1393 0 R 1406 0 R 1423 0 R 1429 0 R 1441 0 R 1448 0 R 1454 0 R 1462 0 R 1465 0 R 1471 0 R 1476 0 R 1478 0 R 1484 0 R 1490 0 R 1507 0 R 1524 0 R 1543 0 R 1554 0 R 1559 0 R 1574 0 R]
+/Count 182
+/Kids [7 0 R 10 0 R 12 0 R 14 0 R 16 0 R 18 0 R 42 0 R 45 0 R 66 0 R 81 0 R 109 0 R 154 0 R 156 0 R 158 0 R 172 0 R 182 0 R 185 0 R 198 0 R 203 0 R 205 0 R 211 0 R 214 0 R 218 0 R 231 0 R 233 0 R 239 0 R 249 0 R 256 0 R 262 0 R 266 0 R 272 0 R 274 0 R 295 0 R 303 0 R 310 0 R 317 0 R 334 0 R 345 0 R 353 0 R 369 0 R 375 0 R 383 0 R 392 0 R 407 0 R 413 0 R 416 0 R 432 0 R 439 0 R 446 0 R 450 0 R 463 0 R 479 0 R 495 0 R 502 0 R 514 0 R 524 0 R 530 0 R 533 0 R 541 0 R 549 0 R 556 0 R 558 0 R 563 0 R 577 0 R 582 0 R 598 0 R 625 0 R 631 0 R 634 0 R 647 0 R 659 0 R 665 0 R 670 0 R 676 0 R 680 0 R 683 0 R 689 0 R 699 0 R 704 0 R 712 0 R 724 0 R 736 0 R 742 0 R 748 0 R 755 0 R 762 0 R 766 0 R 773 0 R 794 0 R 800 0 R 807 0 R 824 0 R 834 0 R 841 0 R 860 0 R 866 0 R 880 0 R 892 0 R 902 0 R 909 0 R 914 0 R 924 0 R 929 0 R 939 0 R 946 0 R 955 0 R 961 0 R 967 0 R 978 0 R 987 0 R 990 0 R 993 0 R 1000 0 R 1004 0 R 1017 0 R 1025 0 R 1028 0 R 1034 0 R 1044 0 R 1051 0 R 1053 0 R 1057 0 R 1066 0 R 1072 0
R 1082 0 R 1091 0 R 1099 0 R 1103 0 R 1108 0 R 1110 0 R 1123 0 R 1136 0 R 1146 0 R 1161 0 R 1167 0 R 1172 0 R 1175 0 R 1188 0 R 1194 0 R 1205 0 R 1214 0 R 1221 0 R 1226 0 R 1239 0 R 1249 0 R 1263 0 R 1271 0 R 1276 0 R 1280 0 R 1288 0 R 1294 0 R 1299 0 R 1313 0 R 1320 0 R 1328 0 R 1333 0 R 1338 0 R 1345 0 R 1348 0 R 1351 0 R 1357 0 R 1373 0 R 1389 0 R 1402 0 R 1419 0 R 1425 0 R 1437 0 R 1444 0 R 1450 0 R 1458 0 R 1461 0 R 1467 0 R 1472 0 R 1474 0 R 1480 0 R 1486 0 R 1503 0 R 1520 0 R 1539 0 R 1550 0 R 1555 0 R 1570 0 R]
>>
endobj
4 0 obj
@@ -80,11 +80,11 @@ endobj
<< /Type /Font
/BaseFont /AAAAAY+NotoSerif
/Subtype /TrueType
-/FontDescriptor 2227 0 R
+/FontDescriptor 2223 0 R
/FirstChar 32
/LastChar 255
-/Widths 2229 0 R
-/ToUnicode 2228 0 R
+/Widths 2225 0 R
+/ToUnicode 2224 0 R
>>
endobj
9 0 obj
@@ -1937,7 +1937,7 @@ endobj
/F3.0 40 0 R
>>
>>
-/Annots [1580 0 R 1581 0 R 1582 0 R 1583 0 R 1584 0 R 1585 0 R 1586 0 R 1587 0 R 1588 0 R 1589 0 R 1590 0 R 1591 0 R 1592 0 R 1593 0 R 1594 0 R 1595 0 R 1596 0 R 1597 0 R 1598 0 R 1599 0 R 1600 0 R 1601 0 R 1602 0 R 1603 0 R 1604 0 R 1605 0 R 1606 0 R 1607 0 R 1608 0 R 1609 0 R 1610 0 R 1611 0 R 1612 0 R 1613 0 R 1614 0 R 1615 0 R 1616 0 R 1617 0 R 1618 0 R 1619 0 R 1620 0 R 1621 0 R 1622 0 R 1623 0 R 1624 0 R 1625 0 R 1626 0 R 1627 0 R 1628 0 R 1629 0 R 1630 0 R 1631 0 R 1632 0 R 1633 0 R 1634 0 R 1635 0 R 1636 0 R 1637 0 R 1638 0 R 1639 0 R 1640 0 R 1641 0 R 1642 0 R 1643 0 R 1644 0 R 1645 0 R 1646 0 R 1647 0 R 1648 0 R 1649 0 R 1650 0 R 1651 0 R 1652 0 R 1653 0 R 1654 0 R 1655 0 R 1656 0 R 1657 0 R 1658 0 R 1659 0 R 1660 0 R 1661 0 R 1662 0 R 1663 0 R 1664 0 R 1665 0 R 1666 0 R 1667 0 R 1668 0 R 1669 0 R 1670 0 R 1671 0 R 1672 0 R 1673 0 R 1674 0 R 1675 0 R 1676 0 R 1677 0 R 1678 0 R 1679 0 R 1680 0 R 1681 0 R 1682 0 R]
+/Annots [1576 0 R 1577 0 R 1578 0 R 1579 0 R 1580 0 R 1581 0 R 1582 0 R 1583 0 R 1584 0 R 1585 0 R 1586 0 R 1587 0 R 1588 0 R 1589 0 R 1590 0 R 1591 0 R 1592 0 R 1593 0 R 1594 0 R 1595 0 R 1596 0 R 1597 0 R 1598 0 R 1599 0 R 1600 0 R 1601 0 R 1602 0 R 1603 0 R 1604 0 R 1605 0 R 1606 0 R 1607 0 R 1608 0 R 1609 0 R 1610 0 R 1611 0 R 1612 0 R 1613 0 R 1614 0 R 1615 0 R 1616 0 R 1617 0 R 1618 0 R 1619 0 R 1620 0 R 1621 0 R 1622 0 R 1623 0 R 1624 0 R 1625 0 R 1626 0 R 1627 0 R 1628 0 R 1629 0 R 1630 0 R 1631 0 R 1632 0 R 1633 0 R 1634 0 R 1635 0 R 1636 0 R 1637 0 R 1638 0 R 1639 0 R 1640 0 R 1641 0 R 1642 0 R 1643 0 R 1644 0 R 1645 0 R 1646 0 R 1647 0 R 1648 0 R 1649 0 R 1650 0 R 1651 0 R 1652 0 R 1653 0 R 1654 0 R 1655 0 R 1656 0 R 1657 0 R 1658 0 R 1659 0 R 1660 0 R 1661 0 R 1662 0 R 1663 0 R 1664 0 R 1665 0 R 1666 0 R 1667 0 R 1668 0 R 1669 0 R 1670 0 R 1671 0 R 1672 0 R 1673 0 R 1674 0 R 1675 0 R 1676 0 R 1677 0 R 1678 0 R]
>>
endobj
11 0 obj
@@ -4019,7 +4019,7 @@ endobj
/F3.0 40 0 R
>>
>>
-/Annots [1683 0 R 1684 0 R 1685 0 R 1686 0 R 1687 0 R 1688 0 R 1689 0 R 1690 0 R 1691 0 R 1692 0 R 1693 0 R 1694 0 R 1695 0 R 1696 0 R 1697 0 R 1698 0 R 1699 0 R 1700 0 R 1701 0 R 1702 0 R 1703 0 R 1704 0 R 1705 0 R 1706 0 R 1707 0 R 1708 0 R 1709 0 R 1710 0 R 1711 0 R 1712 0 R 1713 0 R 1714 0 R 1715 0 R 1716 0 R 1717 0 R 1718 0 R 1719 0 R 1720 0 R 1721 0 R 1722 0 R 1723 0 R 1724 0 R 1725 0 R 1726 0 R 1727 0 R 1728 0 R 1729 0 R 1730 0 R 1731 0 R 1732 0 R 1733 0 R 1734 0 R 1735 0 R 1736 0 R 1737 0 R 1738 0 R 1739 0 R 1740 0 R 1741 0 R 1742 0 R 1743 0 R 1744 0 R 1745 0 R 1746 0 R 1747 0 R 1748 0 R 1749 0 R 1750 0 R 1751 0 R 1752 0 R 1753 0 R 1754 0 R 1755 0 R 1756 0 R 1757 0 R 1758 0 R 1759 0 R 1760 0 R 1761 0 R 1762 0 R 1763 0 R 1764 0 R 1765 0 R 1766 0 R 1767 0 R 1768 0 R 1769 0 R 1770 0 R 1771 0 R 1772 0 R 1773 0 R 1774 0 R 1775 0 R 1776 0 R 1777 0 R 1778 0 R 1779 0 R 1780 0 R 1781 0 R 1782 0 R 1783 0 R 1784 0 R 1785 0 R 1786 0 R 1787 0 R 1788 0 R 1789 0 R 1790 0 R 1791 0 R 1792 0
R 1793 0 R 1794 0 R 1795 0 R 1796 0 R 1797 0 R 1798 0 R 1799 0 R 1800 0 R 1801 0 R 1802 0 R]
+/Annots [1679 0 R 1680 0 R 1681 0 R 1682 0 R 1683 0 R 1684 0 R 1685 0 R 1686 0 R 1687 0 R 1688 0 R 1689 0 R 1690 0 R 1691 0 R 1692 0 R 1693 0 R 1694 0 R 1695 0 R 1696 0 R 1697 0 R 1698 0 R 1699 0 R 1700 0 R 1701 0 R 1702 0 R 1703 0 R 1704 0 R 1705 0 R 1706 0 R 1707 0 R 1708 0 R 1709 0 R 1710 0 R 1711 0 R 1712 0 R 1713 0 R 1714 0 R 1715 0 R 1716 0 R 1717 0 R 1718 0 R 1719 0 R 1720 0 R 1721 0 R 1722 0 R 1723 0 R 1724 0 R 1725 0 R 1726 0 R 1727 0 R 1728 0 R 1729 0 R 1730 0 R 1731 0 R 1732 0 R 1733 0 R 1734 0 R 1735 0 R 1736 0 R 1737 0 R 1738 0 R 1739 0 R 1740 0 R 1741 0 R 1742 0 R 1743 0 R 1744 0 R 1745 0 R 1746 0 R 1747 0 R 1748 0 R 1749 0 R 1750 0 R 1751 0 R 1752 0 R 1753 0 R 1754 0 R 1755 0 R 1756 0 R 1757 0 R 1758 0 R 1759 0 R 1760 0 R 1761 0 R 1762 0 R 1763 0 R 1764 0 R 1765 0 R 1766 0 R 1767 0 R 1768 0 R 1769 0 R 1770 0 R 1771 0 R 1772 0 R 1773 0 R 1774 0 R 1775 0 R 1776 0 R 1777 0 R 1778 0 R 1779 0 R 1780 0 R 1781 0 R 1782 0 R 1783 0 R 1784 0 R 1785 0 R 1786 0 R 1787 0 R 1788 0
R 1789 0 R 1790 0 R 1791 0 R 1792 0 R 1793 0 R 1794 0 R 1795 0 R 1796 0 R 1797 0 R 1798 0 R]
>>
endobj
13 0 obj
@@ -6240,7 +6240,7 @@ ET
BT
529.4314999999999 73.95599999999956 Td
/F1.0 10.5 Tf
-<313336> Tj
+<313335> Tj
ET
0.000 0.000 0.000 SCN
@@ -6324,7 +6324,7 @@ ET
BT
529.4314999999999 55.47599999999957 Td
/F1.0 10.5 Tf
-<313337> Tj
+<313336> Tj
ET
0.000 0.000 0.000 SCN
@@ -6343,7 +6343,7 @@ endobj
/F3.0 40 0 R
>>
>>
-/Annots [1803 0 R 1804 0 R 1805 0 R 1806 0 R 1807 0 R 1808 0 R 1809 0 R 1810 0 R 1811 0 R 1812 0 R 1813 0 R 1814 0 R 1815 0 R 1816 0 R 1817 0 R 1818 0 R 1819 0 R 1820 0 R 1821 0 R 1822 0 R 1823 0 R 1824 0 R 1825 0 R 1826 0 R 1827 0 R 1828 0 R 1829 0 R 1830 0 R 1831 0 R 1832 0 R 1833 0 R 1834 0 R 1835 0 R 1836 0 R 1837 0 R 1838 0 R 1839 0 R 1840 0 R 1841 0 R 1842 0 R 1843 0 R 1844 0 R 1845 0 R 1846 0 R 1847 0 R 1848 0 R 1849 0 R 1850 0 R 1851 0 R 1852 0 R 1853 0 R 1854 0 R 1855 0 R 1856 0 R 1857 0 R 1858 0 R 1859 0 R 1860 0 R 1861 0 R 1862 0 R 1863 0 R 1864 0 R 1865 0 R 1866 0 R 1867 0 R 1868 0 R 1869 0 R 1870 0 R 1871 0 R 1872 0 R 1873 0 R 1874 0 R 1875 0 R 1876 0 R 1877 0 R 1878 0 R 1879 0 R 1880 0 R 1881 0 R 1882 0 R 1883 0 R 1884 0 R 1885 0 R 1886 0 R 1887 0 R 1888 0 R 1889 0 R 1890 0 R 1891 0 R 1892 0 R 1893 0 R 1894 0 R 1895 0 R 1896 0 R 1897 0 R 1898 0 R 1899 0 R 1900 0 R 1901 0 R 1902 0 R 1903 0 R 1904 0 R 1905 0 R 1906 0 R 1907 0 R 1908 0 R 1909 0 R 1910 0 R 1911 0 R 1912 0
R 1913 0 R 1914 0 R 1915 0 R 1916 0 R 1917 0 R 1918 0 R 1919 0 R 1920 0 R 1921 0 R 1922 0 R 1923 0 R 1924 0 R 1925 0 R 1926 0 R 1927 0 R 1928 0 R 1929 0 R 1930 0 R 1931 0 R 1932 0 R 1933 0 R 1934 0 R 1935 0 R 1936 0 R 1937 0 R 1938 0 R 1939 0 R 1940 0 R 1941 0 R 1942 0 R 1943 0 R 1944 0 R]
+/Annots [1799 0 R 1800 0 R 1801 0 R 1802 0 R 1803 0 R 1804 0 R 1805 0 R 1806 0 R 1807 0 R 1808 0 R 1809 0 R 1810 0 R 1811 0 R 1812 0 R 1813 0 R 1814 0 R 1815 0 R 1816 0 R 1817 0 R 1818 0 R 1819 0 R 1820 0 R 1821 0 R 1822 0 R 1823 0 R 1824 0 R 1825 0 R 1826 0 R 1827 0 R 1828 0 R 1829 0 R 1830 0 R 1831 0 R 1832 0 R 1833 0 R 1834 0 R 1835 0 R 1836 0 R 1837 0 R 1838 0 R 1839 0 R 1840 0 R 1841 0 R 1842 0 R 1843 0 R 1844 0 R 1845 0 R 1846 0 R 1847 0 R 1848 0 R 1849 0 R 1850 0 R 1851 0 R 1852 0 R 1853 0 R 1854 0 R 1855 0 R 1856 0 R 1857 0 R 1858 0 R 1859 0 R 1860 0 R 1861 0 R 1862 0 R 1863 0 R 1864 0 R 1865 0 R 1866 0 R 1867 0 R 1868 0 R 1869 0 R 1870 0 R 1871 0 R 1872 0 R 1873 0 R 1874 0 R 1875 0 R 1876 0 R 1877 0 R 1878 0 R 1879 0 R 1880 0 R 1881 0 R 1882 0 R 1883 0 R 1884 0 R 1885 0 R 1886 0 R 1887 0 R 1888 0 R 1889 0 R 1890 0 R 1891 0 R 1892 0 R 1893 0 R 1894 0 R 1895 0 R 1896 0 R 1897 0 R 1898 0 R 1899 0 R 1900 0 R 1901 0 R 1902 0 R 1903 0 R 1904 0 R 1905 0 R 1906 0 R 1907 0 R 1908 0
R 1909 0 R 1910 0 R 1911 0 R 1912 0 R 1913 0 R 1914 0 R 1915 0 R 1916 0 R 1917 0 R 1918 0 R 1919 0 R 1920 0 R 1921 0 R 1922 0 R 1923 0 R 1924 0 R 1925 0 R 1926 0 R 1927 0 R 1928 0 R 1929 0 R 1930 0 R 1931 0 R 1932 0 R 1933 0 R 1934 0 R 1935 0 R 1936 0 R 1937 0 R 1938 0 R 1939 0 R 1940 0 R]
>>
endobj
15 0 obj
@@ -6399,7 +6399,7 @@ ET
BT
529.4314999999999 794.6759999999999 Td
/F1.0 10.5 Tf
-<313338> Tj
+<313337> Tj
ET
0.000 0.000 0.000 SCN
@@ -6450,7 +6450,7 @@ ET
BT
529.4314999999999 776.1959999999999 Td
/F1.0 10.5 Tf
-<313339> Tj
+<313338> Tj
ET
0.000 0.000 0.000 SCN
@@ -6490,7 +6490,7 @@ ET
BT
529.4314999999999 757.7159999999999 Td
/F1.0 10.5 Tf
-<313431> Tj
+<313430> Tj
ET
0.000 0.000 0.000 SCN
@@ -6541,7 +6541,7 @@ ET
BT
529.4314999999999 739.2359999999999 Td
/F1.0 10.5 Tf
-<313435> Tj
+<313434> Tj
ET
0.000 0.000 0.000 SCN
@@ -6592,7 +6592,7 @@ ET
BT
529.4314999999999 720.7559999999999 Td
/F1.0 10.5 Tf
-<313438> Tj
+<313437> Tj
ET
0.000 0.000 0.000 SCN
@@ -6643,7 +6643,7 @@ ET
BT
529.4314999999999 702.2759999999998 Td
/F1.0 10.5 Tf
-<313438> Tj
+<313437> Tj
ET
0.000 0.000 0.000 SCN
@@ -6694,7 +6694,7 @@ ET
BT
529.4314999999999 683.7959999999998 Td
/F1.0 10.5 Tf
-<313439> Tj
+<313438> Tj
ET
0.000 0.000 0.000 SCN
@@ -6745,7 +6745,7 @@ ET
BT
529.4314999999999 665.3159999999998 Td
/F1.0 10.5 Tf
-<313530> Tj
+<313439> Tj
ET
0.000 0.000 0.000 SCN
@@ -6796,7 +6796,7 @@ ET
BT
529.4314999999999 646.8359999999998 Td
/F1.0 10.5 Tf
-<313531> Tj
+<313530> Tj
ET
0.000 0.000 0.000 SCN
@@ -6847,7 +6847,7 @@ ET
BT
529.4314999999999 628.3559999999998 Td
/F1.0 10.5 Tf
-<313532> Tj
+<313531> Tj
ET
0.000 0.000 0.000 SCN
@@ -6898,7 +6898,7 @@ ET
BT
529.4314999999999 609.8759999999997 Td
/F1.0 10.5 Tf
-<313533> Tj
+<313532> Tj
ET
0.000 0.000 0.000 SCN
@@ -6949,7 +6949,7 @@ ET
BT
529.4314999999999 591.3959999999997 Td
/F1.0 10.5 Tf
-<313536> Tj
+<313535> Tj
ET
0.000 0.000 0.000 SCN
@@ -7000,7 +7000,7 @@ ET
BT
529.4314999999999 572.9159999999997 Td
/F1.0 10.5 Tf
-<313537> Tj
+<313536> Tj
ET
0.000 0.000 0.000 SCN
@@ -7051,7 +7051,7 @@ ET
BT
529.4314999999999 554.4359999999997 Td
/F1.0 10.5 Tf
-<313538> Tj
+<313537> Tj
ET
0.000 0.000 0.000 SCN
@@ -7102,7 +7102,7 @@ ET
BT
529.4314999999999 535.9559999999997 Td
/F1.0 10.5 Tf
-<313539> Tj
+<313538> Tj
ET
0.000 0.000 0.000 SCN
@@ -7153,7 +7153,7 @@ ET
BT
529.4314999999999 517.4759999999997 Td
/F1.0 10.5 Tf
-<313539> Tj
+<313538> Tj
ET
0.000 0.000 0.000 SCN
@@ -7204,7 +7204,7 @@ ET
BT
529.4314999999999 498.9959999999997 Td
/F1.0 10.5 Tf
-<313631> Tj
+<313630> Tj
ET
0.000 0.000 0.000 SCN
@@ -7244,7 +7244,7 @@ ET
BT
529.4314999999999 480.5159999999997 Td
/F1.0 10.5 Tf
-<313632> Tj
+<313631> Tj
ET
0.000 0.000 0.000 SCN
@@ -7295,7 +7295,7 @@ ET
BT
529.4314999999999 462.03599999999966 Td
/F1.0 10.5 Tf
-<313633> Tj
+<313632> Tj
ET
0.000 0.000 0.000 SCN
@@ -7346,7 +7346,7 @@ ET
BT
529.4314999999999 443.55599999999964 Td
/F1.0 10.5 Tf
-<313633> Tj
+<313632> Tj
ET
0.000 0.000 0.000 SCN
@@ -7397,7 +7397,7 @@ ET
BT
529.4314999999999 425.0759999999996 Td
/F1.0 10.5 Tf
-<313634> Tj
+<313633> Tj
ET
0.000 0.000 0.000 SCN
@@ -7448,7 +7448,7 @@ ET
BT
529.4314999999999 406.5959999999996 Td
/F1.0 10.5 Tf
-<313635> Tj
+<313634> Tj
ET
0.000 0.000 0.000 SCN
@@ -7499,7 +7499,7 @@ ET
BT
529.4314999999999 388.1159999999996 Td
/F1.0 10.5 Tf
-<313635> Tj
+<313634> Tj
ET
0.000 0.000 0.000 SCN
@@ -7583,7 +7583,7 @@ ET
BT
529.4314999999999 369.63599999999957 Td
/F1.0 10.5 Tf
-<313637> Tj
+<313636> Tj
ET
0.000 0.000 0.000 SCN
@@ -7634,7 +7634,7 @@ ET
BT
529.4314999999999 351.15599999999955 Td
/F1.0 10.5 Tf
-<313638> Tj
+<313637> Tj
ET
0.000 0.000 0.000 SCN
@@ -7674,7 +7674,7 @@ ET
BT
529.4314999999999 332.67599999999953 Td
/F1.0 10.5 Tf
-<313638> Tj
+<313637> Tj
ET
0.000 0.000 0.000 SCN
@@ -7725,7 +7725,7 @@ ET
BT
529.4314999999999 314.1959999999995 Td
/F1.0 10.5 Tf
-<313730> Tj
+<313639> Tj
ET
0.000 0.000 0.000 SCN
@@ -7776,7 +7776,7 @@ ET
BT
529.4314999999999 295.7159999999995 Td
/F1.0 10.5 Tf
-<313732> Tj
+<313731> Tj
ET
0.000 0.000 0.000 SCN
@@ -7827,7 +7827,7 @@ ET
BT
529.4314999999999 277.2359999999995 Td
/F1.0 10.5 Tf
-<313733> Tj
+<313732> Tj
ET
0.000 0.000 0.000 SCN
@@ -7878,7 +7878,7 @@ ET
BT
529.4314999999999 258.75599999999946 Td
/F1.0 10.5 Tf
-<313733> Tj
+<313732> Tj
ET
0.000 0.000 0.000 SCN
@@ -7929,7 +7929,7 @@ ET
BT
529.4314999999999 240.27599999999947 Td
/F1.0 10.5 Tf
-<313734> Tj
+<313733> Tj
ET
0.000 0.000 0.000 SCN
@@ -7980,7 +7980,7 @@ ET
BT
529.4314999999999 221.79599999999948 Td
/F1.0 10.5 Tf
-<313734> Tj
+<313733> Tj
ET
0.000 0.000 0.000 SCN
@@ -8031,7 +8031,7 @@ ET
BT
529.4314999999999 203.3159999999995 Td
/F1.0 10.5 Tf
-<313735> Tj
+<313734> Tj
ET
0.000 0.000 0.000 SCN
@@ -8082,7 +8082,7 @@ ET
BT
529.4314999999999 184.8359999999995 Td
/F1.0 10.5 Tf
-<313735> Tj
+<313734> Tj
ET
0.000 0.000 0.000 SCN
@@ -8166,7 +8166,7 @@ ET
BT
529.4314999999999 166.3559999999995 Td
/F1.0 10.5 Tf
-<313736> Tj
+<313735> Tj
ET
0.000 0.000 0.000 SCN
@@ -8250,7 +8250,7 @@ ET
BT
529.4314999999999 147.87599999999952 Td
/F1.0 10.5 Tf
-<313737> Tj
+<313736> Tj
ET
0.000 0.000 0.000 SCN
@@ -8290,7 +8290,7 @@ ET
BT
529.4314999999999 129.39599999999953 Td
/F1.0 10.5 Tf
-<313737> Tj
+<313736> Tj
ET
0.000 0.000 0.000 SCN
@@ -8330,7 +8330,7 @@ ET
BT
529.4314999999999 110.91599999999954 Td
/F1.0 10.5 Tf
-<313738> Tj
+<313737> Tj
ET
0.000 0.000 0.000 SCN
@@ -8349,7 +8349,7 @@ endobj
/F3.0 40 0 R
>>
>>
-/Annots [1945 0 R 1946 0 R 1947 0 R 1948 0 R 1949 0 R 1950 0 R 1951 0 R 1952 0 R 1953 0 R 1954 0 R 1955 0 R 1956 0 R 1957 0 R 1958 0 R 1959 0 R 1960 0 R 1961 0 R 1962 0 R 1963 0 R 1964 0 R 1965 0 R 1966 0 R 1967 0 R 1968 0 R 1969 0 R 1970 0 R 1971 0 R 1972 0 R 1973 0 R 1974 0 R 1975 0 R 1976 0 R 1977 0 R 1978 0 R 1979 0 R 1980 0 R 1981 0 R 1982 0 R 1983 0 R 1984 0 R 1985 0 R 1986 0 R 1987 0 R 1988 0 R 1989 0 R 1990 0 R 1991 0 R 1992 0 R 1993 0 R 1994 0 R 1995 0 R 1996 0 R 1997 0 R 1998 0 R 1999 0 R 2000 0 R 2001 0 R 2002 0 R 2003 0 R 2004 0 R 2005 0 R 2006 0 R 2007 0 R 2008 0 R 2009 0 R 2010 0 R 2011 0 R 2012 0 R 2013 0 R 2014 0 R 2015 0 R 2016 0 R 2017 0 R 2018 0 R 2019 0 R 2020 0 R 2021 0 R 2022 0 R 2023 0 R 2024 0 R 2025 0 R 2026 0 R 2027 0 R 2028 0 R 2029 0 R 2030 0 R 2031 0 R 2032 0 R 2033 0 R 2034 0 R 2035 0 R 2036 0 R 2037 0 R 2038 0 R 2039 0 R 2040 0 R 2041 0 R 2042 0 R 2043 0 R 2044 0 R 2045 0 R 2046 0 R 2047 0 R 2048 0 R 2049 0 R 2050 0 R 2051 0 R 2052 0 R 2053 0 R 2054 0
R 2055 0 R 2056 0 R 2057 0 R 2058 0 R 2059 0 R 2060 0 R 2061 0 R 2062 0 R]
+/Annots [1941 0 R 1942 0 R 1943 0 R 1944 0 R 1945 0 R 1946 0 R 1947 0 R 1948 0 R 1949 0 R 1950 0 R 1951 0 R 1952 0 R 1953 0 R 1954 0 R 1955 0 R 1956 0 R 1957 0 R 1958 0 R 1959 0 R 1960 0 R 1961 0 R 1962 0 R 1963 0 R 1964 0 R 1965 0 R 1966 0 R 1967 0 R 1968 0 R 1969 0 R 1970 0 R 1971 0 R 1972 0 R 1973 0 R 1974 0 R 1975 0 R 1976 0 R 1977 0 R 1978 0 R 1979 0 R 1980 0 R 1981 0 R 1982 0 R 1983 0 R 1984 0 R 1985 0 R 1986 0 R 1987 0 R 1988 0 R 1989 0 R 1990 0 R 1991 0 R 1992 0 R 1993 0 R 1994 0 R 1995 0 R 1996 0 R 1997 0 R 1998 0 R 1999 0 R 2000 0 R 2001 0 R 2002 0 R 2003 0 R 2004 0 R 2005 0 R 2006 0 R 2007 0 R 2008 0 R 2009 0 R 2010 0 R 2011 0 R 2012 0 R 2013 0 R 2014 0 R 2015 0 R 2016 0 R 2017 0 R 2018 0 R 2019 0 R 2020 0 R 2021 0 R 2022 0 R 2023 0 R 2024 0 R 2025 0 R 2026 0 R 2027 0 R 2028 0 R 2029 0 R 2030 0 R 2031 0 R 2032 0 R 2033 0 R 2034 0 R 2035 0 R 2036 0 R 2037 0 R 2038 0 R 2039 0 R 2040 0 R 2041 0 R 2042 0 R 2043 0 R 2044 0 R 2045 0 R 2046 0 R 2047 0 R 2048 0 R 2049 0 R 2050 0
R 2051 0 R 2052 0 R 2053 0 R 2054 0 R 2055 0 R 2056 0 R 2057 0 R 2058 0 R]
>>
endobj
17 0 obj
@@ -9072,7 +9072,7 @@ endobj
/F1.0 8 0 R
/F3.0 40 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
/Annots [24 0 R 25 0 R 26 0 R 27 0 R 28 0 R 29 0 R 30 0 R 31 0 R 32 0 R 33 0 R 34 0 R 35 0 R 36 0 R 37 0 R 38 0 R]
@@ -9087,18 +9087,18 @@ endobj
>>
endobj
21 0 obj
-<< /Kids [225 0 R 329 0 R 486 0 R 547 0 R 668 0 R 776 0 R 997 0 R 1084 0 R 1153 0 R 1259 0 R 1460 0 R 1358 0 R 1551 0 R 226 0 R 1017 0 R 662 0 R 844 0 R]
+<< /Kids [225 0 R 329 0 R 486 0 R 547 0 R 667 0 R 775 0 R 995 0 R 1084 0 R 1153 0 R 1255 0 R 1456 0 R 1354 0 R 1547 0 R 226 0 R 1015 0 R 661 0 R 843 0 R]
>>
endobj
22 0 obj
<< /Type /Font
/BaseFont /AAAAAZ+NotoSerif-Bold
/Subtype /TrueType
-/FontDescriptor 2231 0 R
+/FontDescriptor 2227 0 R
/FirstChar 32
/LastChar 255
-/Widths 2233 0 R
-/ToUnicode 2232 0 R
+/Widths 2229 0 R
+/ToUnicode 2228 0 R
>>
endobj
23 0 obj
@@ -9276,11 +9276,11 @@ endobj
<< /Type /Font
/BaseFont /AAAABA+mplus1mn-regular
/Subtype /TrueType
-/FontDescriptor 2235 0 R
+/FontDescriptor 2231 0 R
/FirstChar 32
/LastChar 255
-/Widths 2237 0 R
-/ToUnicode 2236 0 R
+/Widths 2233 0 R
+/ToUnicode 2232 0 R
>>
endobj
41 0 obj
@@ -9643,7 +9643,7 @@ endobj
/F1.0 8 0 R
/F4.0 43 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
>>
@@ -9652,11 +9652,11 @@ endobj
<< /Type /Font
/BaseFont /AAAABB+mplus-1p-regular
/Subtype /TrueType
-/FontDescriptor 2239 0 R
+/FontDescriptor 2235 0 R
/FirstChar 32
/LastChar 255
-/Widths 2241 0 R
-/ToUnicode 2240 0 R
+/Widths 2237 0 R
+/ToUnicode 2236 0 R
>>
endobj
44 0 obj
@@ -12035,7 +12035,7 @@ endobj
/F5.1 48 0 R
/F6.0 50 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
/Annots [49 0 R 51 0 R 52 0 R 53 0 R 54 0 R 55 0 R 56 0 R 57 0 R 58 0 R 59 0 R 60 0 R 61 0 R 62 0 R 63 0 R 64 0 R]
@@ -12051,11 +12051,11 @@ endobj
<< /Type /Font
/BaseFont /AAAABC+FontAwesome
/Subtype /TrueType
-/FontDescriptor 2243 0 R
+/FontDescriptor 2239 0 R
/FirstChar 32
/LastChar 255
-/Widths 2245 0 R
-/ToUnicode 2244 0 R
+/Widths 2241 0 R
+/ToUnicode 2240 0 R
>>
endobj
49 0 obj
@@ -12073,11 +12073,11 @@ endobj
<< /Type /Font
/BaseFont /AAAABD+NotoSerif-Italic
/Subtype /TrueType
-/FontDescriptor 2247 0 R
+/FontDescriptor 2243 0 R
/FirstChar 32
/LastChar 255
-/Widths 2249 0 R
-/ToUnicode 2248 0 R
+/Widths 2245 0 R
+/ToUnicode 2244 0 R
>>
endobj
51 0 obj
@@ -14109,7 +14109,7 @@ endobj
/F6.0 50 0 R
/F5.1 48 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
/Annots [67 0 R 68 0 R 69 0 R 70 0 R 72 0 R 73 0 R 74 0 R 75 0 R 76 0 R 77 0 R 78 0 R]
@@ -16533,7 +16533,7 @@ endobj
/F2.0 22 0 R
/F3.0 40 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
/Annots [82 0 R 83 0 R 84 0 R 85 0 R 86 0 R 87 0 R 88 0 R 89 0 R 90 0 R 91 0 R 92 0 R 93 0 R 94 0 R 95 0 R 96 0 R 97 0 R 98 0 R 99 0 R 100 0 R 101 0 R 102 0 R 103 0 R 104 0 R 105 0 R 106 0 R]
@@ -19004,7 +19004,7 @@ endobj
/F2.0 22 0 R
/F3.0 40 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
/Annots [110 0 R 111 0 R 112 0 R 113 0 R 114 0 R 115 0 R 116 0 R 117 0 R 118 0 R 119 0 R 120 0 R 121 0 R 122 0 R 123 0 R 124 0 R 125 0 R 126 0 R 127 0 R 128 0 R 129 0 R 130 0 R 131 0 R 132 0 R 133 0 R 134 0 R 135 0 R 136 0 R 137 0 R 138 0 R 139 0 R 140 0 R 141 0 R 142 0 R 143 0 R 144 0 R 145 0 R 146 0 R 147 0 R 148 0 R 149 0 R 150 0 R 151 0 R]
@@ -20425,7 +20425,7 @@ endobj
/F3.0 40 0 R
/F1.0 8 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
>>
@@ -20833,7 +20833,7 @@ endobj
/F3.0 40 0 R
/F1.0 8 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
>>
@@ -22947,7 +22947,7 @@ endobj
/F1.0 8 0 R
/F6.0 50 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
/Annots [160 0 R 161 0 R 162 0 R 163 0 R 164 0 R 165 0 R 166 0 R 167 0 R 168 0 R 169 0 R 170 0 R]
@@ -25695,7 +25695,7 @@ endobj
/F4.0 43 0 R
/F3.1 179 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
/Annots [173 0 R 174 0 R 175 0 R 176 0 R 177 0 R 178 0 R]
@@ -25771,11 +25771,11 @@ endobj
<< /Type /Font
/BaseFont /AAAABE+mplus1mn-regular
/Subtype /TrueType
-/FontDescriptor 2251 0 R
+/FontDescriptor 2247 0 R
/FirstChar 32
/LastChar 255
-/Widths 2253 0 R
-/ToUnicode 2252 0 R
+/Widths 2249 0 R
+/ToUnicode 2248 0 R
>>
endobj
180 0 obj
@@ -27696,7 +27696,7 @@ endobj
/F6.0 50 0 R
/F4.0 43 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
>>
@@ -29479,7 +29479,7 @@ endobj
/F4.0 43 0 R
/F6.0 50 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
/Annots [187 0 R 189 0 R 190 0 R 191 0 R 192 0 R 193 0 R 194 0 R 195 0 R 196 0 R]
@@ -34113,7 +34113,7 @@ endobj
/F3.0 40 0 R
/F2.0 22 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
/Annots [199 0 R 200 0 R]
@@ -38922,13 +38922,13 @@ endobj
/F2.0 22 0 R
/F1.0 8 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
>>
endobj
204 0 obj
-<< /Length 26762
+<< /Length 26760
>>
stream
q
@@ -39178,7 +39178,7 @@ ET
BT
48.24 642.7160000000002 Td
/F1.0 10.5 Tf
-<51756172747a2e202053656520> Tj
+<51756172747a2e2053656520> Tj
ET
0.000 0.000 0.000 SCN
@@ -39187,7 +39187,7 @@ ET
0.259 0.545 0.792 SCN
BT
-110.316 642.7160000000002 Td
+107.5965 642.7160000000002 Td
/F1.0 10.5 Tf
<68657265> Tj
ET
@@ -39198,7 +39198,7 @@ ET
0.200 0.200 0.200 SCN
BT
-133.1535 642.7160000000002 Td
+130.434 642.7160000000002 Td
/F1.0 10.5 Tf
<20666f72206675727468657220696e666f726d6174696f6e206f6e207468697320746f7069632e> Tj
ET
@@ -40711,7 +40711,7 @@ endobj
/F2.0 22 0 R
/F3.1 179 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
/Annots [207 0 R 208 0 R]
@@ -40738,7 +40738,7 @@ endobj
/URI (../ugbtb/ugbtb.pdf#_ugbtb_headless-access_BackgroundCommandExecution)
>>
/Subtype /Link
-/Rect [110.316 639.6500000000002 133.1535 653.9300000000003]
+/Rect [107.5965 639.6500000000002 130.434 653.9300000000003]
/Type /Annot
>>
endobj
@@ -43271,7 +43271,7 @@ endobj
/F5.1 48 0 R
/F2.0 22 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
>>
@@ -45530,7 +45530,7 @@ endobj
/F2.0 22 0 R
/F1.0 8 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
>>
@@ -47151,7 +47151,7 @@ endobj
/F5.1 48 0 R
/F2.0 22 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
/Annots [219 0 R 220 0 R 221 0 R 222 0 R 223 0 R 227 0 R 228 0 R 229 0 R]
@@ -47222,7 +47222,7 @@ endobj
endobj
226 0 obj
<< /Limits [(_rgant_aaa_other) (default-doop-and-noop-events-12)]
-/Names [(_rgant_aaa_other) 71 0 R (_rgant_aaa_partial) 152 0 R (alternative-syntaxes) 1016 0 R (code-autocompleteaction-code) 632 0 R (code-commanddtoprocessor-code) 209 0 R (code-commanddtoprocessor-code-2) 1281 0 R (code-commandexecutein-code) 206 0 R (code-commandexecutein-code-2) 1276 0 R (default-doop-and-noop-events) 234 0 R (default-doop-and-noop-events-10) 842 0 R (default-doop-and-noop-events-11) 869 0 R (default-doop-and-noop-events-12) 911 0 R]
+/Names [(_rgant_aaa_other) 71 0 R (_rgant_aaa_partial) 152 0 R (alternative-syntaxes) 1014 0 R (code-autocompleteaction-code) 632 0 R (code-commanddtoprocessor-code) 209 0 R (code-commanddtoprocessor-code-2) 1277 0 R (code-commandexecutein-code) 206 0 R (code-commandexecutein-code-2) 1272 0 R (default-doop-and-noop-events) 234 0 R (default-doop-and-noop-events-10) 839 0 R (default-doop-and-noop-events-11) 867 0 R (default-doop-and-noop-events-12) 907 0 R]
>>
endobj
227 0 obj
@@ -48729,7 +48729,7 @@ endobj
/F1.0 8 0 R
/F5.1 48 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
>>
@@ -50252,7 +50252,7 @@ endobj
/F1.0 8 0 R
/F2.0 22 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
/Annots [236 0 R 237 0 R]
@@ -51358,7 +51358,7 @@ endobj
/F1.0 8 0 R
/F5.1 48 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
/Annots [241 0 R 242 0 R 243 0 R 244 0 R 245 0 R 246 0 R]
@@ -53246,7 +53246,7 @@ endobj
/F5.1 48 0 R
/F2.0 22 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
/Annots [251 0 R 252 0 R 253 0 R 254 0 R]
@@ -55300,7 +55300,7 @@ endobj
/F3.1 179 0 R
/F2.0 22 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
/Annots [257 0 R 258 0 R 260 0 R]
@@ -56810,7 +56810,7 @@ endobj
/F3.0 40 0 R
/F6.0 50 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
/Annots [264 0 R]
@@ -59556,7 +59556,7 @@ endobj
/F4.0 43 0 R
/F2.0 22 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
/Annots [267 0 R 268 0 R 270 0 R]
@@ -60262,7 +60262,7 @@ endobj
/F5.1 48 0 R
/F1.0 8 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
>>
@@ -62340,7 +62340,7 @@ endobj
/F1.0 8 0 R
/F6.0 50 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
/Annots [276 0 R 277 0 R 278 0 R 279 0 R 280 0 R 281 0 R 282 0 R 283 0 R 284 0 R 285 0 R 286 0 R 287 0 R 288 0 R 289 0 R 290 0 R 291 0 R 292 0 R 293 0 R]
@@ -63924,7 +63924,7 @@ endobj
/F5.1 48 0 R
/F2.0 22 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
/Annots [296 0 R 298 0 R 299 0 R 300 0 R]
@@ -65273,7 +65273,7 @@ endobj
/Contents 302 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/XObject << /I1 301 0 R
-/Stamp1 2063 0 R
+/Stamp1 2059 0 R
>>
/Font << /F5.1 48 0 R
/F1.0 8 0 R
@@ -67420,7 +67420,7 @@ endobj
/F2.0 22 0 R
/F6.0 50 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
/Annots [312 0 R 313 0 R 314 0 R 315 0 R]
@@ -69135,7 +69135,7 @@ endobj
/F6.0 50 0 R
/F2.0 22 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
/Annots [319 0 R 320 0 R 321 0 R 322 0 R 323 0 R 324 0 R 325 0 R 326 0 R 327 0 R 330 0 R 331 0 R 332 0 R]
@@ -71461,7 +71461,7 @@ endobj
/F5.1 48 0 R
/F2.0 22 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
/Annots [335 0 R 336 0 R 338 0 R 339 0 R 340 0 R 341 0 R 342 0 R 343 0 R]
@@ -73285,7 +73285,7 @@ endobj
/F5.1 48 0 R
/F2.0 22 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
/Annots [346 0 R 348 0 R 349 0 R 350 0 R 351 0 R]
@@ -75071,7 +75071,7 @@ endobj
/F3.0 40 0 R
/F2.0 22 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
/Annots [354 0 R 355 0 R 357 0 R 358 0 R 359 0 R 360 0 R 361 0 R 362 0 R 363 0 R 364 0 R 365 0 R 367 0 R]
@@ -76856,7 +76856,7 @@ endobj
/F3.1 179 0 R
>>
/XObject << /I2 371 0 R
-/Stamp1 2063 0 R
+/Stamp1 2059 0 R
>>
>>
/Annots [370 0 R 372 0 R]
@@ -77632,7 +77632,7 @@ endobj
/XObject << /I3 373 0 R
/I4 377 0 R
/I5 379 0 R
-/Stamp1 2063 0 R
+/Stamp1 2059 0 R
>>
/Font << /F1.0 8 0 R
/F3.0 40 0 R
@@ -80349,7 +80349,7 @@ endobj
/F6.0 50 0 R
/F3.1 179 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
/Annots [385 0 R 386 0 R 387 0 R 388 0 R 389 0 R 390 0 R]
@@ -81776,7 +81776,7 @@ endobj
/F2.0 22 0 R
/F6.0 50 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
/Annots [393 0 R 394 0 R 395 0 R 396 0 R 397 0 R 399 0 R 400 0 R 401 0 R 402 0 R 403 0 R 404 0 R 405 0 R]
@@ -84248,7 +84248,7 @@ endobj
/F5.1 48 0 R
/F2.0 22 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
/Annots [409 0 R 410 0 R 411 0 R]
@@ -85752,7 +85752,7 @@ endobj
/F3.0 40 0 R
/F2.0 22 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
>>
@@ -86909,7 +86909,7 @@ endobj
/F5.1 48 0 R
/F4.0 43 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
/Annots [418 0 R 419 0 R 421 0 R 422 0 R 423 0 R 424 0 R 425 0 R 426 0 R 427 0 R 428 0 R 429 0 R 430 0 R]
@@ -88578,7 +88578,7 @@ endobj
/F6.0 50 0 R
/F2.0 22 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
/Annots [434 0 R 435 0 R 436 0 R 437 0 R]
@@ -90638,7 +90638,7 @@ endobj
/F6.0 50 0 R
/F3.1 179 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
/Annots [440 0 R 441 0 R 443 0 R 444 0 R]
@@ -91700,7 +91700,7 @@ endobj
/F1.0 8 0 R
/F5.1 48 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
/Annots [448 0 R]
@@ -93394,7 +93394,7 @@ endobj
/F1.0 8 0 R
/F6.0 50 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
/Annots [452 0 R 453 0 R 454 0 R 455 0 R 456 0 R 457 0 R 458 0 R 459 0 R 460 0 R 461 0 R]
@@ -95522,7 +95522,7 @@ endobj
/F1.0 8 0 R
/F2.0 22 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
/Annots [464 0 R 465 0 R 466 0 R 467 0 R 468 0 R 469 0 R 471 0 R 472 0 R 473 0 R 474 0 R 475 0 R 476 0 R 477 0 R]
@@ -97454,7 +97454,7 @@ endobj
/F1.0 8 0 R
/F5.1 48 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
/Annots [481 0 R 482 0 R 483 0 R 484 0 R 487 0 R 488 0 R 489 0 R 490 0 R 491 0 R 492 0 R 493 0 R]
@@ -99330,7 +99330,7 @@ endobj
/F5.1 48 0 R
/F2.0 22 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
/Annots [496 0 R 498 0 R 499 0 R 500 0 R]
@@ -100916,7 +100916,7 @@ endobj
/F5.1 48 0 R
/F2.0 22 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
/Annots [503 0 R 505 0 R 506 0 R 507 0 R 508 0 R 509 0 R 510 0 R 511 0 R 512 0 R]
@@ -102608,7 +102608,7 @@ endobj
/F2.0 22 0 R
/F6.0 50 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
/Annots [515 0 R 517 0 R 518 0 R 519 0 R 520 0 R 521 0 R 522 0 R]
@@ -104509,7 +104509,7 @@ endobj
/F5.1 48 0 R
>>
/XObject << /I6 526 0 R
-/Stamp1 2063 0 R
+/Stamp1 2059 0 R
>>
>>
/Annots [527 0 R 528 0 R]
@@ -105080,7 +105080,7 @@ endobj
/F5.1 48 0 R
/F3.0 40 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
/Annots [531 0 R]
@@ -106655,7 +106655,7 @@ endobj
/F1.0 8 0 R
/F5.1 48 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
/Annots [535 0 R 537 0 R 538 0 R]
@@ -109945,7 +109945,7 @@ endobj
/F6.0 50 0 R
/F4.0 43 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
/Annots [542 0 R 544 0 R]
@@ -113426,7 +113426,7 @@ endobj
/F3.0 40 0 R
/F2.0 22 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
/Annots [550 0 R 552 0 R 553 0 R 554 0 R]
@@ -115141,7 +115141,7 @@ endobj
/Font << /F3.0 40 0 R
/F1.0 8 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
>>
@@ -116525,7 +116525,7 @@ endobj
/F1.0 8 0 R
/F3.1 179 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
/Annots [560 0 R 561 0 R]
@@ -117894,7 +117894,7 @@ endobj
/F1.0 8 0 R
/F5.1 48 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
/Annots [565 0 R 566 0 R 567 0 R 568 0 R 569 0 R 570 0 R 571 0 R 572 0 R 573 0 R]
@@ -118491,7 +118491,7 @@ endobj
/F3.0 40 0 R
/F5.1 48 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
/Annots [578 0 R 579 0 R 580 0 R]
@@ -120519,7 +120519,7 @@ endobj
/F1.0 8 0 R
/F6.0 50 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
/Annots [584 0 R 585 0 R 586 0 R 587 0 R 588 0 R 589 0 R 590 0 R 591 0 R 592 0 R 593 0 R 594 0 R 595 0 R 596 0 R]
@@ -122834,7 +122834,7 @@ endobj
/F1.0 8 0 R
/F3.1 179 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
/Annots [599 0 R 600 0 R 601 0 R 602 0 R 603 0 R 604 0 R 605 0 R 606 0 R 607 0 R 608 0 R 609 0 R 610 0 R 611 0 R 612 0 R 613 0 R 614 0 R 615 0 R 616 0 R 617 0 R 618 0 R 619 0 R 620 0 R 622 0 R 623 0 R]
@@ -124029,7 +124029,7 @@ endobj
/F5.1 48 0 R
/F4.0 43 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
/Annots [627 0 R 628 0 R 629 0 R]
@@ -125933,7 +125933,7 @@ endobj
/F3.1 179 0 R
/F2.0 22 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
>>
@@ -127500,7 +127500,7 @@ endobj
/F3.1 179 0 R
/F4.0 43 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
/Annots [635 0 R 636 0 R 637 0 R 638 0 R 639 0 R 641 0 R 642 0 R 643 0 R 644 0 R 645 0 R]
@@ -127620,7 +127620,7 @@ endobj
>>
endobj
646 0 obj
-<< /Length 20762
+<< /Length 21494
>>
stream
q
@@ -127655,12 +127655,12 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-7.772 Tw
+0.161 Tw
BT
48.24 742.866 Td
/F1.0 10.5 Tf
-<226372656174656422206c6966656379636c65206576656e742069732066697265642e202054686973206973207479706963616c6c79207768656e2074686520> Tj
+<226372656174656422206c6966656379636c65206576656e742069732066697265642e2054686973206973207479706963616c6c79207768656e2074686520> Tj
ET
@@ -127670,12 +127670,12 @@ ET
0.694 0.129 0.275 scn
0.694 0.129 0.275 SCN
-7.772 Tw
+0.161 Tw
BT
-429.74449999999996 742.866 Td
+343.1418846153846 742.866 Td
/F3.0 10.5 Tf
-<446f6d61696e4f626a656374436f6e7461696e6572> Tj
+<466163746f727953657276696365> Tj
ET
@@ -127685,12 +127685,12 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-7.772 Tw
+0.161 Tw
BT
-539.9944999999999 742.866 Td
+416.6418846153846 742.866 Td
/F1.0 10.5 Tf
-<2773> Tj
+<277320> Tj
ET
@@ -127700,12 +127700,12 @@ ET
0.694 0.129 0.275 scn
0.694 0.129 0.275 SCN
-0.268 Tw
+0.161 Tw
BT
-48.24 727.086 Td
+426.56742307692303 742.866 Td
/F3.0 10.5 Tf
-<6e65775472616e7369656e74496e7374616e63652829> Tj
+<696e7374616e74696174652829> Tj
ET
@@ -127715,42 +127715,38 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-0.268 Tw
+0.161 Tw
BT
-163.74 727.086 Td
+494.81742307692303 742.866 Td
/F1.0 10.5 Tf
-<2069732063616c6c65643b2069742077696c6c20616c736f2068617070656e20696620746865206f626a6563742069732073696d706c7920696e7374616e746961746564207769746820> Tj
+<206d6574686f64206973> 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
-
-0.268 Tw
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
-507.66499999999996 727.086 Td
-/F3.0 10.5 Tf
-<6e657728> Tj
+48.24 727.086 Td
+/F1.0 10.5 Tf
+<63616c6c65642e> 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
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
-0.268 Tw
+1.098 Tw
BT
-528.665 727.086 Td
-/F4.0 10.5 Tf
-<c9> Tj
+48.24 699.3059999999999 Td
+/F1.0 10.5 Tf
+<537562736372696265727320737562736372696265207468726f7567682074686520> Tj
ET
@@ -127760,12 +127756,12 @@ ET
0.694 0.129 0.275 scn
0.694 0.129 0.275 SCN
-0.268 Tw
+1.098 Tw
BT
-539.165 727.086 Td
+226.6057857142857 699.3059999999999 Td
/F3.0 10.5 Tf
-<29> Tj
+<4576656e7442757353657276696365> Tj
ET
@@ -127775,12 +127771,12 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-0.268 Tw
+1.098 Tw
BT
-544.415 727.086 Td
+305.35578571428573 699.3059999999999 Td
/F1.0 10.5 Tf
-<2c> Tj
+<20616e642063616e2075736520746865206576656e7420746f206f627461696e2061207265666572656e636520746f> Tj
ET
@@ -127790,65 +127786,47 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
+1.575 Tw
+
BT
-48.24 711.306 Td
+48.24 683.526 Td
/F1.0 10.5 Tf
-<616e64207468656e2074686520> Tj
+<746865206f626a656374206a75737420637265617465642e20546865207375627363726962657220636f756c64207468656e2c20666f72206578616d706c652c2075706461746520746865206f626a6563742c206567206c6f6f6b696e67207570> Tj
ET
-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
-
-BT
-114.22200000000001 711.306 Td
-/F3.0 10.5 Tf
-<536572766963655265676973747279> 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
BT
-192.972 711.306 Td
+48.24 667.746 Td
/F1.0 10.5 Tf
-<277320> Tj
-ET
-
-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
-
-BT
-202.73700000000002 711.306 Td
-/F3.0 10.5 Tf
-<696e6a6563745365727669636573496e746f28> Tj
+<73746174652066726f6d20736f6d652065787465726e616c206461746173746f72652e> Tj
ET
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
-
-BT
-302.487 711.306 Td
-/F4.0 10.5 Tf
-<c9> Tj
-ET
-
+q
+0.5 w
+0.933 0.933 0.933 SCN
+113.807 596.590 m
+113.807 651.930 l
+S
+Q
+0.067 0.067 0.067 scn
+0.067 0.067 0.067 SCN
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
+0.067 0.067 0.067 scn
+0.067 0.067 0.067 SCN
BT
-312.987 711.306 Td
-/F3.0 10.5 Tf
-<29> Tj
+80.17133333333334 615.68 Td
+/F5.1 24 Tf
+<21> Tj
ET
0.000 0.000 0.000 SCN
@@ -127856,23 +127834,27 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
+2.694 Tw
+
BT
-318.237 711.306 Td
+125.80666666666667 635.9659999999999 Td
/F1.0 10.5 Tf
-<206d6574686f642069732063616c6c65642e> Tj
+<4974d57320706f737369626c6520746f20696e7374616e7469617465206f626a6563747320776974686f757420666972696e672074686973206c6966656379636c653b206a75737420696e7374616e7469617465> 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
-1.098 Tw
+11.301 Tw
BT
-48.24 683.526 Td
+125.80666666666667 620.1859999999999 Td
/F1.0 10.5 Tf
-<537562736372696265727320737562736372696265207468726f7567682074686520> Tj
+<7573696e672069747320726567756c617220636f6e7374727563746f722c20616e64207468656e207573652074686520> Tj
ET
@@ -127882,12 +127864,12 @@ ET
0.694 0.129 0.275 scn
0.694 0.129 0.275 SCN
-1.098 Tw
+11.301 Tw
BT
-226.6057857142857 683.526 Td
+449.24449999999996 620.1859999999999 Td
/F3.0 10.5 Tf
-<4576656e7442757353657276696365> Tj
+<536572766963655265676973747279> Tj
ET
@@ -127897,40 +127879,58 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-1.098 Tw
+11.301 Tw
BT
-305.35578571428573 683.526 Td
+527.9945 620.1859999999999 Td
/F1.0 10.5 Tf
-<20616e642063616e2075736520746865206576656e7420746f206f627461696e2061207265666572656e636520746f> Tj
+<2773> 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
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
+
+BT
+125.80666666666667 604.406 Td
+/F3.0 10.5 Tf
+<696e6a6563745365727669636573496e746f28> Tj
+ET
-1.306 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
BT
-48.24 667.746 Td
-/F1.0 10.5 Tf
-<746865206f626a656374206a75737420637265617465642e2020546865207375627363726962657220636f756c64207468656e2c20666f72206578616d706c652c2075706461746520746865206f626a6563742c206567206c6f6f6b696e67207570> Tj
+225.55666666666667 604.406 Td
+/F4.0 10.5 Tf
+<c9> Tj
ET
+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
+
+BT
+236.05666666666667 604.406 Td
+/F3.0 10.5 Tf
+<29> 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
BT
-48.24 651.966 Td
+241.30666666666667 604.406 Td
/F1.0 10.5 Tf
-<73746174652066726f6d20736f6d652065787465726e616c206461746173746f72652e> Tj
+[<20746f206d616e75616c6c7920696e6a65637420616e> 20.01953125 <7920726571756972656420646f6d61696e2073657276696365732e>] TJ
ET
0.000 0.000 0.000 SCN
@@ -127939,7 +127939,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24 624.1859999999999 Td
+48.24000000000001 572.6259999999999 Td
/F1.0 10.5 Tf
[<42> 20.01953125 <792064656661756c7420746865206576656e742072> 20.01953125 <616973656420697320>] TJ
ET
@@ -127950,7 +127950,7 @@ ET
0.694 0.129 0.275 SCN
BT
-195.17658984375 624.1859999999999 Td
+195.17658984375 572.6259999999999 Td
/F3.0 10.5 Tf
<4f626a656374437265617465644576656e742e44656661756c74> Tj
ET
@@ -127961,7 +127961,7 @@ ET
0.200 0.200 0.200 SCN
BT
-331.67658984375 624.1859999999999 Td
+331.67658984375 572.6259999999999 Td
/F1.0 10.5 Tf
[<2e2046> 40.0390625 <6f72206578616d706c653a>] TJ
ET
@@ -127970,28 +127970,28 @@ ET
0.000 0.000 0.000 scn
q
0.961 0.961 0.961 scn
-52.240 608.370 m
-543.040 608.370 l
-545.249 608.370 547.040 606.579 547.040 604.370 c
-547.040 531.410 l
-547.040 529.201 545.249 527.410 543.040 527.410 c
-52.240 527.410 l
-50.031 527.410 48.240 529.201 48.240 531.410 c
-48.240 604.370 l
-48.240 606.579 50.031 608.370 52.240 608.370 c
+52.240 556.810 m
+543.040 556.810 l
+545.249 556.810 547.040 555.019 547.040 552.810 c
+547.040 479.850 l
+547.040 477.641 545.249 475.850 543.040 475.850 c
+52.240 475.850 l
+50.031 475.850 48.240 477.641 48.240 479.850 c
+48.240 552.810 l
+48.240 555.019 50.031 556.810 52.240 556.810 c
h
f
0.800 0.800 0.800 SCN
0.75 w
-52.240 608.370 m
-543.040 608.370 l
-545.249 608.370 547.040 606.579 547.040 604.370 c
-547.040 531.410 l
-547.040 529.201 545.249 527.410 543.040 527.410 c
-52.240 527.410 l
-50.031 527.410 48.240 529.201 48.240 531.410 c
-48.240 604.370 l
-48.240 606.579 50.031 608.370 52.240 608.370 c
+52.240 556.810 m
+543.040 556.810 l
+545.249 556.810 547.040 555.019 547.040 552.810 c
+547.040 479.850 l
+547.040 477.641 545.249 475.850 543.040 475.850 c
+52.240 475.850 l
+50.031 475.850 48.240 477.641 48.240 479.850 c
+48.240 552.810 l
+48.240 555.019 50.031 556.810 52.240 556.810 c
h
S
Q
@@ -127999,7 +127999,7 @@ Q
0.600 0.600 1.000 SCN
BT
-59.24 585.545 Td
+59.24000000000001 533.9849999999999 Td
/F3.0 11 Tf
<40446f6d61696e4f626a656374> Tj
ET
@@ -128010,7 +128010,7 @@ ET
0.000 0.400 0.600 SCN
BT
-59.24 570.805 Td
+59.24000000000001 519.2449999999999 Td
/F3.0 11 Tf
<7075626c6963> Tj
ET
@@ -128021,7 +128021,7 @@ ET
0.200 0.200 0.200 SCN
BT
-92.24000000000001 570.805 Td
+92.24000000000001 519.2449999999999 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -128032,7 +128032,7 @@ ET
0.000 0.467 0.533 SCN
BT
-97.74000000000001 570.805 Td
+97.74000000000001 519.2449999999999 Td
/F3.0 11 Tf
<636c617373> Tj
ET
@@ -128043,7 +128043,7 @@ ET
0.200 0.200 0.200 SCN
BT
-125.24000000000001 570.805 Td
+125.24000000000001 519.2449999999999 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -128054,7 +128054,7 @@ ET
0.000 0.667 0.533 SCN
BT
-130.74 570.805 Td
+130.74 519.2449999999999 Td
/F3.0 11 Tf
<546f446f4974656d44746f> Tj
ET
@@ -128065,7 +128065,7 @@ ET
0.200 0.200 0.200 SCN
BT
-191.24 570.805 Td
+191.24 519.2449999999999 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -128076,7 +128076,7 @@ ET
0.200 0.200 0.200 SCN
BT
-196.74 570.805 Td
+196.74 519.2449999999999 Td
/F3.0 11 Tf
<7b> Tj
ET
@@ -128087,7 +128087,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 556.065 Td
+59.24000000000001 504.50499999999994 Td
/F3.0 11 Tf
<ca202020> Tj
ET
@@ -128098,7 +128098,7 @@ ET
0.200 0.200 0.200 SCN
BT
-81.24000000000001 556.065 Td
+81.24000000000001 504.50499999999994 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -128109,7 +128109,7 @@ ET
0.200 0.200 0.200 SCN
BT
-86.74000000000001 556.065 Td
+86.74000000000001 504.50499999999994 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -128120,7 +128120,7 @@ ET
0.200 0.200 0.200 SCN
BT
-92.24000000000001 556.065 Td
+92.24000000000001 504.50499999999994 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -128131,7 +128131,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 541.325 Td
+59.24000000000001 489.76499999999993 Td
/F3.0 11 Tf
<7d> Tj
ET
@@ -128144,7 +128144,7 @@ ET
1.180 Tw
BT
-48.24 503.44599999999997 Td
+48.24000000000001 451.8859999999999 Td
/F1.0 10.5 Tf
<54686520707572706f7365206f662074686520> Tj
ET
@@ -128159,7 +128159,7 @@ ET
1.180 Tw
BT
-149.3302857142857 503.44599999999997 Td
+149.3302857142857 451.8859999999999 Td
/F3.0 10.5 Tf
<637265617465644c6966656379636c654576656e742829> Tj
ET
@@ -128174,7 +128174,7 @@ ET
1.180 Tw
BT
-270.0802857142857 503.44599999999997 Td
+270.0802857142857 451.8859999999999 Td
/F1.0 10.5 Tf
<2061747472696275746520697320746f20616c6c6f7773206120637573746f6d20737562636c61737320746f20626520656d6974746564> Tj
ET
@@ -128187,9 +128187,9 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24 487.66599999999994 Td
+48.24000000000001 436.1059999999999 Td
/F1.0 10.5 Tf
-<696e73746561642e2020412073696d696c61722061747472696275746520697320617661696c61626c6520666f72206f74686572206c6966656379636c65206576656e74732e> Tj
+<696e73746561642e20412073696d696c61722061747472696275746520697320617661696c61626c6520666f72206f74686572206c6966656379636c65206576656e74732e> Tj
ET
0.000 0.000 0.000 SCN
@@ -128198,7 +128198,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24 459.88599999999997 Td
+48.24000000000001 408.3259999999999 Td
/F1.0 10.5 Tf
[<46> 40.0390625 <6f72206578616d706c653a>] TJ
ET
@@ -128207,28 +128207,28 @@ ET
0.000 0.000 0.000 scn
q
0.961 0.961 0.961 scn
-52.240 444.070 m
-543.040 444.070 l
-545.249 444.070 547.040 442.279 547.040 440.070 c
-547.040 293.410 l
-547.040 291.201 545.249 289.410 543.040 289.410 c
-52.240 289.410 l
-50.031 289.410 48.240 291.201 48.240 293.410 c
-48.240 440.070 l
-48.240 442.279 50.031 444.070 52.240 444.070 c
+52.240 392.510 m
+543.040 392.510 l
+545.249 392.510 547.040 390.719 547.040 388.510 c
+547.040 241.850 l
+547.040 239.641 545.249 237.850 543.040 237.850 c
+52.240 237.850 l
+50.031 237.850 48.240 239.641 48.240 241.850 c
+48.240 388.510 l
+48.240 390.719 50.031 392.510 52.240 392.510 c
h
f
0.800 0.800 0.800 SCN
0.75 w
-52.240 444.070 m
-543.040 444.070 l
-545.249 444.070 547.040 442.279 547.040 440.070 c
-547.040 293.410 l
-547.040 291.201 545.249 289.410 543.040 289.410 c
-52.240 289.410 l
-50.031 289.410 48.240 291.201 48.240 293.410 c
-48.240 440.070 l
-48.240 442.279 50.031 444.070 52.240 444.070 c
+52.240 392.510 m
+543.040 392.510 l
+545.249 392.510 547.040 390.719 547.040 388.510 c
+547.040 241.850 l
+547.040 239.641 545.249 237.850 543.040 237.850 c
+52.240 237.850 l
+50.031 237.850 48.240 239.641 48.240 241.850 c
+48.240 388.510 l
+48.240 390.719 50.031 392.510 52.240 392.510 c
h
S
Q
@@ -128236,7 +128236,7 @@ Q
0.600 0.600 1.000 SCN
BT
-59.24 421.24499999999995 Td
+59.24000000000001 369.6849999999999 Td
/F3.0 11 Tf
<40446f6d61696e4f626a6563744c61796f7574> Tj
ET
@@ -128247,7 +128247,7 @@ ET
0.200 0.200 0.200 SCN
BT
-163.74 421.24499999999995 Td
+163.74 369.6849999999999 Td
/F3.0 11 Tf
<28> Tj
ET
@@ -128258,7 +128258,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 406.50499999999994 Td
+59.24000000000001 354.9449999999999 Td
/F3.0 11 Tf
<ca202020> Tj
ET
@@ -128269,7 +128269,7 @@ ET
0.200 0.200 0.200 SCN
BT
-81.24000000000001 406.50499999999994 Td
+81.24000000000001 354.9449999999999 Td
/F3.0 11 Tf
<637265617465644c6966656379636c654576656e74> Tj
ET
@@ -128280,7 +128280,7 @@ ET
0.200 0.200 0.200 SCN
BT
-196.74 406.50499999999994 Td
+196.74 354.9449999999999 Td
/F3.0 11 Tf
<3d> Tj
ET
@@ -128291,7 +128291,7 @@ ET
0.200 0.200 0.200 SCN
BT
-202.24 406.50499999999994 Td
+202.24 354.9449999999999 Td
/F3.0 11 Tf
<546f446f4974656d> Tj
ET
@@ -128302,7 +128302,7 @@ ET
0.200 0.200 0.200 SCN
BT
-246.24 406.50499999999994 Td
+246.24 354.9449999999999 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -128313,7 +128313,7 @@ ET
0.200 0.200 0.200 SCN
BT
-251.74 406.50499999999994 Td
+251.74 354.9449999999999 Td
/F3.0 11 Tf
<437265617465644576656e74> Tj
ET
@@ -128324,7 +128324,7 @@ ET
0.200 0.200 0.200 SCN
BT
-317.74 406.50499999999994 Td
+317.74 354.9449999999999 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -128335,7 +128335,7 @@ ET
0.200 0.200 0.200 SCN
BT
-323.24 406.50499999999994 Td
+323.24 354.9449999999999 Td
/F3.0 11 Tf
<636c617373> Tj
ET
@@ -128346,7 +128346,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 391.76499999999993 Td
+59.24000000000001 340.20499999999987 Td
/F3.0 11 Tf
<29> Tj
ET
@@ -128357,7 +128357,7 @@ ET
0.000 0.400 0.600 SCN
BT
-59.24 377.0249999999999 Td
+59.24000000000001 325.46499999999986 Td
/F3.0 11 Tf
<7075626c6963> Tj
ET
@@ -128368,7 +128368,7 @@ ET
0.200 0.200 0.200 SCN
BT
-92.24000000000001 377.0249999999999 Td
+92.24000000000001 325.46499999999986 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -128379,7 +128379,7 @@ ET
0.000 0.467 0.533 SCN
BT
-97.74000000000001 377.0249999999999 Td
+97.74000000000001 325.46499999999986 Td
/F3.0 11 Tf
<636c617373> Tj
ET
@@ -128390,7 +128390,7 @@ ET
0.200 0.200 0.200 SCN
BT
-125.24000000000001 377.0249999999999 Td
+125.24000000000001 325.46499999999986 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -128401,7 +128401,7 @@ ET
0.000 0.667 0.533 SCN
BT
-130.74 377.0249999999999 Td
+130.74 325.46499999999986 Td
/F3.0 11 Tf
<546f446f4974656d> Tj
ET
@@ -128412,7 +128412,7 @@ ET
0.200 0.200 0.200 SCN
BT
-174.74 377.0249999999999 Td
+174.74 325.46499999999986 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -128423,7 +128423,7 @@ ET
0.200 0.200 0.200 SCN
BT
-180.24 377.0249999999999 Td
+180.24 325.46499999999986 Td
/F3.0 11 Tf
<7b> Tj
ET
@@ -128434,7 +128434,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 362.2849999999999 Td
+59.24000000000001 310.72499999999985 Td
/F3.0 11 Tf
<ca202020> Tj
ET
@@ -128445,7 +128445,7 @@ ET
0.000 0.400 0.600 SCN
BT
-81.24000000000001 362.2849999999999 Td
+81.24000000000001 310.72499999999985 Td
/F3.0 11 Tf
<7075626c6963> Tj
ET
@@ -128456,7 +128456,7 @@ ET
0.200 0.200 0.200 SCN
BT
-114.24000000000001 362.2849999999999 Td
+114.24000000000001 310.72499999999985 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -128467,7 +128467,7 @@ ET
0.000 0.400 0.600 SCN
BT
-119.74000000000001 362.2849999999999 Td
+119.74000000000001 310.72499999999985 Td
/F3.0 11 Tf
<737461746963> Tj
ET
@@ -128478,7 +128478,7 @@ ET
0.200 0.200 0.200 SCN
BT
-152.74 362.2849999999999 Td
+152.74 310.72499999999985 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -128489,7 +128489,7 @@ ET
0.000 0.467 0.533 SCN
BT
-158.24 362.2849999999999 Td
+158.24 310.72499999999985 Td
/F3.0 11 Tf
<636c617373> Tj
ET
@@ -128500,7 +128500,7 @@ ET
0.200 0.200 0.200 SCN
BT
-185.74 362.2849999999999 Td
+185.74 310.72499999999985 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -128511,7 +128511,7 @@ ET
0.000 0.667 0.533 SCN
BT
-191.24 362.2849999999999 Td
+191.24 310.72499999999985 Td
/F3.0 11 Tf
<437265617465644576656e74> Tj
ET
@@ -128522,7 +128522,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 347.54499999999996 Td
+59.24000000000001 295.9849999999999 Td
/F3.0 11 Tf
<ca20202020202020> Tj
ET
@@ -128533,7 +128533,7 @@ ET
0.000 0.400 0.600 SCN
BT
-103.24000000000001 347.54499999999996 Td
+103.24000000000001 295.9849999999999 Td
/F3.0 11 Tf
<657874656e6473> Tj
ET
@@ -128544,7 +128544,7 @@ ET
0.200 0.200 0.200 SCN
BT
-141.74 347.54499999999996 Td
+141.74 295.9849999999999 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -128555,7 +128555,7 @@ ET
0.200 0.200 0.200 SCN
BT
-147.24 347.54499999999996 Td
+147.24 295.9849999999999 Td
/F3.0 11 Tf
<6f7267> Tj
ET
@@ -128566,7 +128566,7 @@ ET
0.200 0.200 0.200 SCN
BT
-163.74 347.54499999999996 Td
+163.74 295.9849999999999 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -128577,7 +128577,7 @@ ET
0.200 0.200 0.200 SCN
BT
-169.24 347.54499999999996 Td
+169.24 295.9849999999999 Td
/F3.0 11 Tf
<617061636865> Tj
ET
@@ -128588,7 +128588,7 @@ ET
0.200 0.200 0.200 SCN
BT
-202.24 347.54499999999996 Td
+202.24 295.9849999999999 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -128599,7 +128599,7 @@ ET
0.200 0.200 0.200 SCN
BT
-207.74 347.54499999999996 Td
+207.74 295.9849999999999 Td
/F3.0 11 Tf
<69736973> Tj
ET
@@ -128610,7 +128610,7 @@ ET
0.200 0.200 0.200 SCN
BT
-229.74 347.54499999999996 Td
+229.74 295.9849999999999 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -128621,7 +128621,7 @@ ET
0.200 0.200 0.200 SCN
BT
-235.24 347.54499999999996 Td
+235.24 295.9849999999999 Td
/F3.0 11 Tf
<6170706c6962> Tj
ET
@@ -128632,7 +128632,7 @@ ET
0.200 0.200 0.200 SCN
BT
-268.24 347.54499999999996 Td
+268.24 295.9849999999999 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -128643,7 +128643,7 @@ ET
0.200 0.200 0.200 SCN
BT
-273.74 347.54499999999996 Td
+273.74 295.9849999999999 Td
/F3.0 11 Tf
<6576656e7473> Tj
ET
@@ -128654,7 +128654,7 @@ ET
0.200 0.200 0.200 SCN
BT
-306.74 347.54499999999996 Td
+306.74 295.9849999999999 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -128665,7 +128665,7 @@ ET
0.200 0.200 0.200 SCN
BT
-312.24 347.54499999999996 Td
+312.24 295.9849999999999 Td
/F3.0 11 Tf
<6c6966656379636c65> Tj
ET
@@ -128676,7 +128676,7 @@ ET
0.200 0.200 0.200 SCN
BT
-361.74 347.54499999999996 Td
+361.74 295.9849999999999 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -128687,7 +128687,7 @@ ET
0.200 0.200 0.200 SCN
BT
-367.24 347.54499999999996 Td
+367.24 295.9849999999999 Td
/F3.0 11 Tf
<4f626a656374437265617465644576656e74> Tj
ET
@@ -128698,7 +128698,7 @@ ET
0.200 0.200 0.200 SCN
BT
-466.24 347.54499999999996 Td
+466.24 295.9849999999999 Td
/F3.0 11 Tf
<3c> Tj
ET
@@ -128709,7 +128709,7 @@ ET
0.200 0.200 0.200 SCN
BT
-471.74 347.54499999999996 Td
+471.74 295.9849999999999 Td
/F3.0 11 Tf
<546f446f4974656d> Tj
ET
@@ -128720,7 +128720,7 @@ ET
0.200 0.200 0.200 SCN
BT
-515.74 347.54499999999996 Td
+515.74 295.9849999999999 Td
/F3.0 11 Tf
<3e> Tj
ET
@@ -128731,7 +128731,7 @@ ET
0.200 0.200 0.200 SCN
BT
-521.24 347.54499999999996 Td
+521.24 295.9849999999999 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -128742,7 +128742,7 @@ ET
0.200 0.200 0.200 SCN
BT
-526.74 347.54499999999996 Td
+526.74 295.9849999999999 Td
/F3.0 11 Tf
<7b> Tj
ET
@@ -128753,7 +128753,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 332.80499999999995 Td
+59.24000000000001 281.2449999999999 Td
ET
0.000 0.000 0.000 SCN
@@ -128762,7 +128762,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 332.80499999999995 Td
+59.24000000000001 281.2449999999999 Td
/F3.0 11 Tf
<7d> Tj
ET
@@ -128773,7 +128773,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 318.06499999999994 Td
+59.24000000000001 266.5049999999999 Td
/F3.0 11 Tf
<ca202020> Tj
ET
@@ -128784,7 +128784,7 @@ ET
0.200 0.200 0.200 SCN
BT
-81.24000000000001 318.06499999999994 Td
+81.24000000000001 266.5049999999999 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -128795,7 +128795,7 @@ ET
0.200 0.200 0.200 SCN
BT
-86.74000000000001 318.06499999999994 Td
+86.74000000000001 266.5049999999999 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -128806,7 +128806,7 @@ ET
0.200 0.200 0.200 SCN
BT
-92.24000000000001 318.06499999999994 Td
+92.24000000000001 266.5049999999999 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -128817,7 +128817,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 303.32499999999993 Td
+59.24000000000001 251.76499999999987 Td
/F3.0 11 Tf
<7d> Tj
ET
@@ -128828,7 +128828,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24 265.44599999999997 Td
+48.24000000000001 213.88599999999988 Td
/F1.0 10.5 Tf
<5468652062656e6566697420697320746861742073756273637269626572732063616e206265206d6f726520746172676574656420617320746f20746865206576656e7473207468617420746865792073756273637269626520746f2e> Tj
ET
@@ -128839,7 +128839,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24 230.94599999999997 Td
+48.24000000000001 179.38599999999985 Td
/F2.0 13 Tf
<31302e342e312e205375627363726962657273> Tj
ET
@@ -128852,7 +128852,7 @@ ET
2.827 Tw
BT
-48.24 204.38599999999997 Td
+48.24000000000001 152.82599999999985 Td
/F1.0 10.5 Tf
<537562736372696265727320287768696368206d75737420626520646f6d61696e2073657276696365732920737562736372696265207573696e67206569746865722074686520> Tj
ET
@@ -128867,7 +128867,7 @@ ET
2.827 Tw
BT
-437.3982142857143 204.38599999999997 Td
+437.3982142857143 152.82599999999985 Td
/F1.0 10.5 Tf
<4775617661> Tj
ET
@@ -128882,7 +128882,7 @@ ET
2.827 Tw
BT
-469.42321428571427 204.38599999999997 Td
+469.42321428571427 152.82599999999985 Td
/F1.0 10.5 Tf
<20415049206f722028696620746865> Tj
ET
@@ -128894,10 +128894,10 @@ ET
0.694 0.129 0.275 scn
0.694 0.129 0.275 SCN
-0.349 Tw
+0.628 Tw
BT
-48.24 188.60599999999997 Td
+48.24000000000001 137.04599999999985 Td
/F3.0 10.5 Tf
<4576656e7442757353657276696365> Tj
ET
@@ -128909,10 +128909,10 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-0.349 Tw
+0.628 Tw
BT
-126.99000000000001 188.60599999999997 Td
+126.99000000000001 137.04599999999985 Td
/F1.0 10.5 Tf
<20686173206265656e20617070726f7072696174656c7920636f6e6669677572656429207573696e672074686520> Tj
ET
@@ -128924,10 +128924,10 @@ ET
0.259 0.545 0.792 scn
0.259 0.545 0.792 SCN
-0.349 Tw
+0.628 Tw
BT
-360.4010362955729 188.60599999999997 Td
+362.3536759588068 137.04599999999985 Td
/F1.0 10.5 Tf
[<41786f6e204672> 20.01953125 <616d65776f726b>] TJ
ET
@@ -128939,12 +128939,12 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-0.349 Tw
+0.628 Tw
BT
-448.2987649739583 188.60599999999997 Td
+450.5303531605113 137.04599999999985 Td
/F1.0 10.5 Tf
-<204150492e2020546865206578616d706c6573> Tj
+<204150492e20546865206578616d706c6573> Tj
ET
@@ -128955,9 +128955,9 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24 172.82599999999996 Td
+48.24000000000001 121.26599999999985 Td
/F1.0 10.5 Tf
-<62656c6f772075736520746865204775617661204150492e> Tj
+<62656c6f772061726520636f6d70617469626c65207769746820626f74682e> Tj
ET
0.000 0.000 0.000 SCN
@@ -128966,7 +128966,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24 145.04599999999996 Td
+48.24000000000001 93.48599999999985 Td
/F1.0 10.5 Tf
[<53756273637269626572732063616e2062652065697468657220636f617273652d6772> 20.01953125 <61696e65642028696620746865792073756273637269626520746f2074686520746f702d6c6576656c206576656e742074797065293a>] TJ
ET
@@ -129006,12 +129006,13 @@ endobj
/Font << /F2.0 22 0 R
/F1.0 8 0 R
/F3.0 40 0 R
+/F5.1 48 0 R
/F4.0 43 0 R
>>
-/XObject << /Stamp1 2063 0 R
+/XObject << /Stamp1 2059 0 R
>>
>>
-/Annots [649 0 R 650 0 R 651 0 R 652 0 R 653 0 R 654 0 R 656 0 R 657 0 R 658 0 R]
+/Annots [649 0 R 650 0 R 651 0 R 652 0 R 653 0 R 655 0 R 656 0 R 657 0 R]
>>
endobj
648 0 obj
@@ -129021,10 +129022,10 @@ endobj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
-/URI (../rgsvc/rgsvc.pdf#_rgsvc_core-domain-api_DomainObjectContainer)
+/URI (../rgsvc/rgsvc.pdf#_rgsvc_core-domain-api_FactoryService)
>>
/Subtype /Link
-/Rect [429.74449999999996 741.396 539.9944999999999 751.896]
+/Rect [343.1418846153846 741.396 416.6418846153846 751.896]
/Type /Annot
>>
endobj
@@ -129032,10 +129033,10 @@ endobj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
-/URI (../rgsvc/rgsvc.pdf#_rgsvc_core-domain-api_DomainObjectContainer_object-creation-api)
+/URI (../rgsvc/rgsvc.pdf#_rgsvc_core-domain-api_EventBusService)
>>
/Subtype /Link
-/Rect [48.24 725.616 163.74 736.116]
+/Rect [226.6057857142857 697.8359999999999 305.35578571428573 708.3359999999999]
/Type /Annot
>>
endobj
@@ -129046,7 +129047,7 @@ endobj
/URI (../rgsvc/rgsvc.pdf#_rgsvc_metadata-api_ServiceRegistry)
>>
/Subtype /Link
-/Rect [202.73700000000002 709.836 302.487 720.336]
+/Rect [125.80666666666667 602.9359999999999 225.55666666666667 613.4359999999999]
/Type /Annot
>>
endobj
@@ -129057,7 +129058,7 @@ endobj
/URI (../rgsvc/rgsvc.pdf#_rgsvc_metadata-api_ServiceRegistry)
>>
/Subtype /Link
-/Rect [302.487 709.836 312.987 720.336]
+/Rect [225.55666666666667 602.9359999999999 236.05666666666667 613.4359999999999]
/Type /Annot
>>
endobj
@@ -129068,59 +129069,48 @@ endobj
/URI (../rgsvc/rgsvc.pdf#_rgsvc_metadata-api_ServiceRegistry)
>>
/Subtype /Link
-/Rect [312.987 709.836 318.237 720.336]
+/Rect [236.05666666666667 602.9359999999999 241.30666666666667 613.4359999999999]
/Type /Annot
>>
endobj
654 0 obj
-<< /Border [0 0 0]
-/A << /Type /Action
-/S /URI
-/URI (../rgsvc/rgsvc.pdf#_rgsvc_core-domain-api_EventBusService)
->>
-/Subtype /Link
-/Rect [226.6057857142857 682.0559999999999 305.35578571428573 692.5559999999999]
-/Type /Annot
->>
+[647 0 R /XYZ 0 198.06999999999988 null]
endobj
655 0 obj
-[647 0 R /XYZ 0 249.63 null]
-endobj
-656 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
/URI (https://github.com/google/guava)
>>
/Subtype /Link
-/Rect [437.3982142857143 201.31999999999996 469.42321428571427 215.59999999999997]
+/Rect [437.3982142857143 149.75999999999985 469.42321428571427 164.03999999999985]
/Type /Annot
>>
endobj
-657 0 obj
+656 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
/URI (../rgsvc/rgsvc.pdf#_rgsvc_core-domain-api_EventBusService)
>>
/Subtype /Link
-/Rect [48.24 187.13599999999997 126.99000000000001 197.63599999999997]
+/Rect [48.24000000000001 135.57599999999985 126.99000000000001 146.07599999999985]
/Type /Annot
>>
endobj
-658 0 obj
+657 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
/URI (http://www.axonframework.org/)
>>
/Subtype /Link
-/Rect [360.4010362955729 185.53999999999996 448.2987649739583 199.81999999999996]
+/Rect [362.3536759588068 133.97999999999985 450.5303531605113 148.25999999999985]
/Type /Annot
>>
endobj
-659 0 obj
-<< /Length 29456
+658 0 obj
+<< /Length 32462
>>
stream
q
@@ -129130,10 +129120,10 @@ q
52.240 805.890 m
543.040 805.890 l
545.249 805.890 547.040 804.099 547.040 801.890 c
-547.040 684.710 l
-547.040 682.501 545.249 680.710 543.040 680.710 c
-52.240 680.710 l
-50.031 680.710 48.240 682.501 48.240 684.710 c
+547.040 669.970 l
+547.040 667.761 545.249 665.970 543.040 665.970 c
+52.240 665.970 l
+50.031 665.970 48.240 667.761 48.240 669.970 c
48.240 801.890 l
48.240 804.099 50.031 805.890 52.240 805.890 c
h
@@ -129144,10 +129134,10 @@ f
52.240 805.890 m
543.040 805.890 l
545.249 805.890 547.040 804.099 547.040 801.890 c
-547.040 684.710 l
-547.040 682.501 545.249 680.710 543.040 680.710 c
-52.240 680.710 l
-50.031 680.710 48.240 682.501 48.240 684.710 c
+547.040 669.970 l
+547.040 667.761 545.249 665.970 543.040 665.970 c
+52.240 665.970 l
+50.031 665.970 48.240 667.761 48.240 669.970 c
48.240 801.890 l
48.240 804.099 50.031 805.890 52.240 805.890 c
h
@@ -129381,7 +129371,7 @@ ET
BT
81.24000000000001 753.585 Td
/F3.0 11 Tf
-<40636f6d> Tj
+<406f7267> Tj
ET
0.000 0.000 0.000 SCN
@@ -129403,7 +129393,7 @@ ET
BT
108.74000000000001 753.585 Td
/F3.0 11 Tf
-<676f6f676c65> Tj
+<61786f6e6672616d65776f726b> Tj
ET
0.000 0.000 0.000 SCN
@@ -129412,7 +129402,7 @@ ET
0.200 0.200 0.200 SCN
BT
-141.74 753.585 Td
+180.24 753.585 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -129423,9 +129413,9 @@ ET
0.200 0.200 0.200 SCN
BT
-147.24 753.585 Td
+185.74 753.585 Td
/F3.0 11 Tf
-<636f6d6d6f6e> Tj
+<6576656e7468616e646c696e67> Tj
ET
0.000 0.000 0.000 SCN
@@ -129434,7 +129424,7 @@ ET
0.200 0.200 0.200 SCN
BT
-180.24 753.585 Td
+257.24 753.585 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -129445,9 +129435,9 @@ ET
0.200 0.200 0.200 SCN
BT
-185.74 753.585 Td
+262.74 753.585 Td
/F3.0 11 Tf
-<6576656e74627573> Tj
+<616e6e6f746174696f6e> Tj
ET
0.000 0.000 0.000 SCN
@@ -129456,7 +129446,7 @@ ET
0.200 0.200 0.200 SCN
BT
-229.74 753.585 Td
+317.74 753.585 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -129467,9 +129457,9 @@ ET
0.200 0.200 0.200 SCN
BT
-235.24 753.585 Td
+323.24 753.585 Td
/F3.0 11 Tf
-<537562736372696265> Tj
+<4576656e7448616e646c6572> Tj
ET
0.000 0.000 0.000 SCN
@@ -129478,20 +129468,20 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 738.845 Td
+389.24 753.585 Td
/F3.0 11 Tf
-<ca202020> Tj
+<20> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.400 0.600 scn
-0.000 0.400 0.600 SCN
+0.600 0.600 0.600 scn
+0.600 0.600 0.600 SCN
BT
-81.24000000000001 738.845 Td
+394.74 753.585 Td
/F3.0 11 Tf
-<7075626c6963> Tj
+<2f2f206966207573696e672061786f6e> Tj
ET
0.000 0.000 0.000 SCN
@@ -129500,20 +129490,20 @@ ET
0.200 0.200 0.200 SCN
BT
-114.24000000000001 738.845 Td
+59.24 738.845 Td
/F3.0 11 Tf
-<20> Tj
+<ca202020> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.467 0.533 scn
-0.000 0.467 0.533 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
BT
-119.74000000000001 738.845 Td
+81.24000000000001 738.845 Td
/F3.0 11 Tf
-<766f6964> Tj
+<40636f6d> Tj
ET
0.000 0.000 0.000 SCN
@@ -129522,9 +129512,9 @@ ET
0.200 0.200 0.200 SCN
BT
-141.74 738.845 Td
+103.24000000000001 738.845 Td
/F3.0 11 Tf
-<20> Tj
+<2e> Tj
ET
0.000 0.000 0.000 SCN
@@ -129533,9 +129523,9 @@ ET
0.200 0.200 0.200 SCN
BT
-147.24 738.845 Td
+108.74000000000001 738.845 Td
/F3.0 11 Tf
-<6f6e> Tj
+<676f6f676c65> Tj
ET
0.000 0.000 0.000 SCN
@@ -129544,9 +129534,9 @@ ET
0.200 0.200 0.200 SCN
BT
-158.24 738.845 Td
+141.74 738.845 Td
/F3.0 11 Tf
-<28> Tj
+<2e> Tj
ET
0.000 0.000 0.000 SCN
@@ -129555,9 +129545,9 @@ ET
0.200 0.200 0.200 SCN
BT
-163.74 738.845 Td
+147.24 738.845 Td
/F3.0 11 Tf
-<4f626a656374437265617465644576656e74> Tj
+<636f6d6d6f6e> Tj
ET
0.000 0.000 0.000 SCN
@@ -129566,9 +129556,9 @@ ET
0.200 0.200 0.200 SCN
BT
-262.74 738.845 Td
+180.24 738.845 Td
/F3.0 11 Tf
-<20> Tj
+<2e> Tj
ET
0.000 0.000 0.000 SCN
@@ -129577,9 +129567,9 @@ ET
0.200 0.200 0.200 SCN
BT
-268.24 738.845 Td
+185.74 738.845 Td
/F3.0 11 Tf
-<6576> Tj
+<6576656e74627573> Tj
ET
0.000 0.000 0.000 SCN
@@ -129588,9 +129578,9 @@ ET
0.200 0.200 0.200 SCN
BT
-279.24 738.845 Td
+229.74 738.845 Td
/F3.0 11 Tf
-<29> Tj
+<2e> Tj
ET
0.000 0.000 0.000 SCN
@@ -129599,9 +129589,9 @@ ET
0.200 0.200 0.200 SCN
BT
-284.74 738.845 Td
+235.24 738.845 Td
/F3.0 11 Tf
-<20> Tj
+<537562736372696265> Tj
ET
0.000 0.000 0.000 SCN
@@ -129610,9 +129600,20 @@ ET
0.200 0.200 0.200 SCN
BT
-290.24 738.845 Td
+284.74 738.845 Td
/F3.0 11 Tf
-<7b> Tj
+<2020202020202020202020202020202020202020> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.600 0.600 0.600 scn
+0.600 0.600 0.600 SCN
+
+BT
+394.74 738.845 Td
+/F3.0 11 Tf
+<2f2f206966207573696e67206775617661> Tj
ET
0.000 0.000 0.000 SCN
@@ -129623,7 +129624,7 @@ ET
BT
59.24 724.105 Td
/F3.0 11 Tf
-<ca20202020202020> Tj
+<ca202020> Tj
ET
0.000 0.000 0.000 SCN
@@ -129632,9 +129633,9 @@ ET
0.000 0.400 0.600 SCN
BT
-103.24000000000001 724.105 Td
+81.24000000000001 724.105 Td
/F3.0 11 Tf
-<6966> Tj
+<7075626c6963> Tj
ET
0.000 0.000 0.000 SCN
@@ -129645,18 +129646,18 @@ ET
BT
114.24000000000001 724.105 Td
/F3.0 11 Tf
-<28> Tj
+<20> Tj
ET
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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
BT
119.74000000000001 724.105 Td
/F3.0 11 Tf
-<6576> Tj
+<766f6964> Tj
ET
0.000 0.000 0.000 SCN
@@ -129665,9 +129666,9 @@ ET
0.200 0.200 0.200 SCN
BT
-130.74 724.105 Td
+141.74 724.105 Td
/F3.0 11 Tf
-<2e> Tj
+<20> Tj
ET
0.000 0.000 0.000 SCN
@@ -129676,9 +129677,9 @@ ET
0.200 0.200 0.200 SCN
BT
-136.24 724.105 Td
+147.24 724.105 Td
/F3.0 11 Tf
-<676574536f75726365> Tj
+<6f6e> Tj
ET
0.000 0.000 0.000 SCN
@@ -129687,7 +129688,7 @@ ET
0.200 0.200 0.200 SCN
BT
-185.74 724.105 Td
+158.24 724.105 Td
/F3.0 11 Tf
<28> Tj
ET
@@ -129698,9 +129699,9 @@ ET
0.200 0.200 0.200 SCN
BT
-191.24 724.105 Td
+163.74 724.105 Td
/F3.0 11 Tf
-<29> Tj
+<4f626a656374437265617465644576656e74> Tj
ET
0.000 0.000 0.000 SCN
@@ -129709,20 +129710,20 @@ ET
0.200 0.200 0.200 SCN
BT
-196.74 724.105 Td
+262.74 724.105 Td
/F3.0 11 Tf
<20> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.400 0.600 scn
-0.000 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
-202.24 724.105 Td
+268.24 724.105 Td
/F3.0 11 Tf
-<696e7374616e63656f66> Tj
+<6576> Tj
ET
0.000 0.000 0.000 SCN
@@ -129731,9 +129732,9 @@ ET
0.200 0.200 0.200 SCN
BT
-257.24 724.105 Td
+279.24 724.105 Td
/F3.0 11 Tf
-<20> Tj
+<29> Tj
ET
0.000 0.000 0.000 SCN
@@ -129742,9 +129743,9 @@ ET
0.200 0.200 0.200 SCN
BT
-262.74 724.105 Td
+284.74 724.105 Td
/F3.0 11 Tf
-<546f446f4974656d> Tj
+<20> Tj
ET
0.000 0.000 0.000 SCN
@@ -129753,9 +129754,9 @@ ET
0.200 0.200 0.200 SCN
BT
-306.74 724.105 Td
+290.24 724.105 Td
/F3.0 11 Tf
-<29> Tj
+<7b> Tj
ET
0.000 0.000 0.000 SCN
@@ -129764,20 +129765,20 @@ ET
0.200 0.200 0.200 SCN
BT
-312.24 724.105 Td
+59.24 709.365 Td
/F3.0 11 Tf
-<20> Tj
+<ca20202020202020> Tj
ET
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
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
-317.74 724.105 Td
+103.24000000000001 709.365 Td
/F3.0 11 Tf
-<7b> Tj
+<6966> Tj
ET
0.000 0.000 0.000 SCN
@@ -129786,9 +129787,9 @@ ET
0.200 0.200 0.200 SCN
BT
-323.24 724.105 Td
+114.24000000000001 709.365 Td
/F3.0 11 Tf
-<20> Tj
+<28> Tj
ET
0.000 0.000 0.000 SCN
@@ -129797,9 +129798,9 @@ ET
0.200 0.200 0.200 SCN
BT
-328.74 724.105 Td
+119.74000000000001 709.365 Td
/F3.0 11 Tf
-<2e> Tj
+<6576> Tj
ET
0.000 0.000 0.000 SCN
@@ -129808,7 +129809,7 @@ ET
0.200 0.200 0.200 SCN
BT
-334.24 724.105 Td
+130.74 709.365 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -129819,9 +129820,9 @@ ET
0.200 0.200 0.200 SCN
BT
-339.74 724.105 Td
+136.24 709.365 Td
/F3.0 11 Tf
-<2e> Tj
+<676574536f75726365> Tj
ET
0.000 0.000 0.000 SCN
@@ -129830,9 +129831,9 @@ ET
0.200 0.200 0.200 SCN
BT
-345.24 724.105 Td
+185.74 709.365 Td
/F3.0 11 Tf
-<20> Tj
+<28> Tj
ET
0.000 0.000 0.000 SCN
@@ -129841,9 +129842,9 @@ ET
0.200 0.200 0.200 SCN
BT
-350.74 724.105 Td
+191.24 709.365 Td
/F3.0 11 Tf
-<7d> Tj
+<29> Tj
ET
0.000 0.000 0.000 SCN
@@ -129852,9 +129853,20 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 709.365 Td
+196.74 709.365 Td
/F3.0 11 Tf
-<ca202020> Tj
+<20> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
+
+BT
+202.24 709.365 Td
+/F3.0 11 Tf
+<696e7374616e63656f66> Tj
ET
0.000 0.000 0.000 SCN
@@ -129863,9 +129875,9 @@ ET
0.200 0.200 0.200 SCN
BT
-81.24000000000001 709.365 Td
+257.24 709.365 Td
/F3.0 11 Tf
-<7d> Tj
+<20> Tj
ET
0.000 0.000 0.000 SCN
@@ -129874,9 +129886,9 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 694.625 Td
+262.74 709.365 Td
/F3.0 11 Tf
-<7d> Tj
+<546f446f4974656d> Tj
ET
0.000 0.000 0.000 SCN
@@ -129885,47 +129897,20 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24 656.746 Td
-/F1.0 10.5 Tf
-[<6f722063616e2062652066696e652d6772> 20.01953125 <61696e6564202862> 20.01953125 <79207375627363726962696e6720746f207370656369666963206576656e74207375627479706573293a>] TJ
+306.74 709.365 Td
+/F3.0 11 Tf
+<29> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-q
-0.961 0.961 0.961 scn
-52.240 640.930 m
-543.040 640.930 l
-545.249 640.930 547.040 639.139 547.040 636.930 c
-547.040 519.750 l
-547.040 517.541 545.249 515.750 543.040 515.750 c
-52.240 515.750 l
-50.031 515.750 48.240 517.541 48.240 519.750 c
-48.240 636.930 l
-48.240 639.139 50.031 640.930 52.240 640.930 c
-h
-f
-0.800 0.800 0.800 SCN
-0.75 w
-52.240 640.930 m
-543.040 640.930 l
-545.249 640.930 547.040 639.139 547.040 636.930 c
-547.040 519.750 l
-547.040 517.541 545.249 515.750 543.040 515.750 c
-52.240 515.750 l
-50.031 515.750 48.240 517.541 48.240 519.750 c
-48.240 636.930 l
-48.240 639.139 50.031 640.930 52.240 640.930 c
-h
-S
-Q
-0.600 0.600 1.000 scn
-0.600 0.600 1.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
-59.24 618.105 Td
+312.24 709.365 Td
/F3.0 11 Tf
-<40446f6d61696e53657276696365> Tj
+<20> Tj
ET
0.000 0.000 0.000 SCN
@@ -129934,9 +129919,9 @@ ET
0.200 0.200 0.200 SCN
BT
-136.24 618.105 Td
+317.74 709.365 Td
/F3.0 11 Tf
-<28> Tj
+<7b> Tj
ET
0.000 0.000 0.000 SCN
@@ -129945,9 +129930,9 @@ ET
0.200 0.200 0.200 SCN
BT
-141.74 618.105 Td
+323.24 709.365 Td
/F3.0 11 Tf
-<6e6174757265> Tj
+<20> Tj
ET
0.000 0.000 0.000 SCN
@@ -129956,9 +129941,9 @@ ET
0.200 0.200 0.200 SCN
BT
-174.74 618.105 Td
+328.74 709.365 Td
/F3.0 11 Tf
-<3d> Tj
+<2e> Tj
ET
0.000 0.000 0.000 SCN
@@ -129967,9 +129952,9 @@ ET
0.200 0.200 0.200 SCN
BT
-180.24 618.105 Td
+334.24 709.365 Td
/F3.0 11 Tf
-<4e61747572654f6653657276696365> Tj
+<2e> Tj
ET
0.000 0.000 0.000 SCN
@@ -129978,7 +129963,7 @@ ET
0.200 0.200 0.200 SCN
BT
-262.74 618.105 Td
+339.74 709.365 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -129989,9 +129974,9 @@ ET
0.200 0.200 0.200 SCN
BT
-268.24 618.105 Td
+345.24 709.365 Td
/F3.0 11 Tf
-<444f4d41494e> Tj
+<20> Tj
ET
0.000 0.000 0.000 SCN
@@ -130000,20 +129985,20 @@ ET
0.200 0.200 0.200 SCN
BT
-301.24 618.105 Td
+350.74 709.365 Td
/F3.0 11 Tf
-<29> Tj
+<7d> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.400 0.600 scn
-0.000 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
-59.24 603.365 Td
+59.24 694.625 Td
/F3.0 11 Tf
-<7075626c6963> Tj
+<ca202020> Tj
ET
0.000 0.000 0.000 SCN
@@ -130022,20 +130007,20 @@ ET
0.200 0.200 0.200 SCN
BT
-92.24000000000001 603.365 Td
+81.24000000000001 694.625 Td
/F3.0 11 Tf
-<20> Tj
+<7d> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.467 0.533 scn
-0.000 0.467 0.533 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
-97.74000000000001 603.365 Td
+59.24 679.885 Td
/F3.0 11 Tf
-<636c617373> Tj
+<7d> Tj
ET
0.000 0.000 0.000 SCN
@@ -130044,20 +130029,47 @@ ET
0.200 0.200 0.200 SCN
BT
-125.24000000000001 603.365 Td
-/F3.0 11 Tf
-<20> Tj
+48.24 642.006 Td
+/F1.0 10.5 Tf
+[<6f722063616e2062652066696e652d6772> 20.01953125 <61696e6564202862> 20.01953125 <79207375627363726962696e6720746f207370656369666963206576656e74207375627479706573293a>] TJ
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.667 0.533 scn
-0.000 0.667 0.533 SCN
+q
+0.961 0.961 0.961 scn
+52.240 626.190 m
+543.040 626.190 l
+545.249 626.190 547.040 624.399 547.040 622.190 c
+547.040 490.270 l
+547.040 488.061 545.249 486.270 543.040 486.270 c
+52.240 486.270 l
+50.031 486.270 48.240 488.061 48.240 490.270 c
+48.240 622.190 l
+48.240 624.399 50.031 626.190 52.240 626.190 c
+h
+f
+0.800 0.800 0.800 SCN
+0.75 w
+52.240 626.190 m
+543.040 626.190 l
+545.249 626.190 547.040 624.399 547.040 622.190 c
+547.040 490.270 l
+547.040 488.061 545.249 486.270 543.040 486.270 c
+52.240 486.270 l
+50.031 486.270 48.240 488.061 48.240 490.270 c
+48.240 622.190 l
+48.240 624.399 50.031 626.190 52.240 626.190 c
+h
+S
+Q
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
BT
-130.74 603.365 Td
+59.24 603.365 Td
/F3.0 11 Tf
-<536f6d6553756273637269626572> Tj
+<40446f6d61696e53657276696365> Tj
ET
0.000 0.000 0.000 SCN
@@ -130066,20 +130078,20 @@ ET
0.200 0.200 0.200 SCN
BT
-207.74 603.365 Td
+136.24 603.365 Td
/F3.0 11 Tf
-<20> Tj
+<28> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.400 0.600 scn
-0.000 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
-213.24 603.365 Td
+141.74 603.365 Td
/F3.0 11 Tf
-<657874656e6473> Tj
+<6e6174757265> Tj
ET
0.000 0.000 0.000 SCN
@@ -130088,9 +130100,9 @@ ET
0.200 0.200 0.200 SCN
BT
-251.74 603.365 Td
+174.74 603.365 Td
/F3.0 11 Tf
-<20> Tj
+<3d> Tj
ET
0.000 0.000 0.000 SCN
@@ -130099,9 +130111,9 @@ ET
0.200 0.200 0.200 SCN
BT
-257.24 603.365 Td
+180.24 603.365 Td
/F3.0 11 Tf
-<416273747261637453756273637269626572> Tj
+<4e61747572654f6653657276696365> Tj
ET
0.000 0.000 0.000 SCN
@@ -130110,9 +130122,9 @@ ET
0.200 0.200 0.200 SCN
BT
-356.24 603.365 Td
+262.74 603.365 Td
/F3.0 11 Tf
-<20> Tj
+<2e> Tj
ET
0.000 0.000 0.000 SCN
@@ -130121,9 +130133,9 @@ ET
0.200 0.200 0.200 SCN
BT
-361.74 603.365 Td
+268.24 603.365 Td
/F3.0 11 Tf
-<7b> Tj
+<444f4d41494e> Tj
ET
0.000 0.000 0.000 SCN
@@ -130132,20 +130144,20 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 588.625 Td
+301.24 603.365 Td
/F3.0 11 Tf
-<ca202020> Tj
+<29> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.600 0.600 1.000 scn
-0.600 0.600 1.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
-81.24000000000001 588.625 Td
+59.24 588.625 Td
/F3.0 11 Tf
-<40636f6d> Tj
+<7075626c6963> Tj
ET
0.000 0.000 0.000 SCN
@@ -130154,20 +130166,20 @@ ET
0.200 0.200 0.200 SCN
BT
-103.24000000000001 588.625 Td
+92.24000000000001 588.625 Td
/F3.0 11 Tf
-<2e> Tj
+<20> Tj
ET
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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
BT
-108.74000000000001 588.625 Td
+97.74000000000001 588.625 Td
/F3.0 11 Tf
-<676f6f676c65> Tj
+<636c617373> Tj
ET
0.000 0.000 0.000 SCN
@@ -130176,20 +130188,20 @@ ET
0.200 0.200 0.200 SCN
BT
-141.74 588.625 Td
+125.24000000000001 588.625 Td
/F3.0 11 Tf
-<2e> Tj
+<20> Tj
ET
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
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
BT
-147.24 588.625 Td
+130.74 588.625 Td
/F3.0 11 Tf
-<636f6d6d6f6e> Tj
+<536f6d6553756273637269626572> Tj
ET
0.000 0.000 0.000 SCN
@@ -130198,20 +130210,20 @@ ET
0.200 0.200 0.200 SCN
BT
-180.24 588.625 Td
+207.74 588.625 Td
/F3.0 11 Tf
-<2e> Tj
+<20> Tj
ET
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
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
-185.74 588.625 Td
+213.24 588.625 Td
/F3.0 11 Tf
-<6576656e74627573> Tj
+<657874656e6473> Tj
ET
0.000 0.000 0.000 SCN
@@ -130220,9 +130232,9 @@ ET
0.200 0.200 0.200 SCN
BT
-229.74 588.625 Td
+251.74 588.625 Td
/F3.0 11 Tf
-<2e> Tj
+<20> Tj
ET
0.000 0.000 0.000 SCN
@@ -130231,9 +130243,9 @@ ET
0.200 0.200 0.200 SCN
BT
-235.24 588.625 Td
+257.24 588.625 Td
/F3.0 11 Tf
-<537562736372696265> Tj
+<416273747261637453756273637269626572> Tj
ET
0.000 0.000 0.000 SCN
@@ -130242,20 +130254,20 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 573.8850000000001 Td
+356.24 588.625 Td
/F3.0 11 Tf
-<ca202020> Tj
+<20> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.400 0.600 scn
-0.000 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
-81.24000000000001 573.8850000000001 Td
+361.74 588.625 Td
/F3.0 11 Tf
-<7075626c6963> Tj
+<7b> Tj
ET
0.000 0.000 0.000 SCN
@@ -130264,20 +130276,20 @@ ET
0.200 0.200 0.200 SCN
BT
-114.24000000000001 573.8850000000001 Td
+59.24 573.885 Td
/F3.0 11 Tf
-<20> Tj
+<ca202020> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.467 0.533 scn
-0.000 0.467 0.533 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
BT
-119.74000000000001 573.8850000000001 Td
+81.24000000000001 573.885 Td
/F3.0 11 Tf
-<766f6964> Tj
+<406f7267> Tj
ET
0.000 0.000 0.000 SCN
@@ -130286,9 +130298,9 @@ ET
0.200 0.200 0.200 SCN
BT
-141.74 573.8850000000001 Td
+103.24000000000001 573.885 Td
/F3.0 11 Tf
-<20> Tj
+<2e> Tj
ET
0.000 0.000 0.000 SCN
@@ -130297,9 +130309,9 @@ ET
0.200 0.200 0.200 SCN
BT
-147.24 573.8850000000001 Td
+108.74000000000001 573.885 Td
/F3.0 11 Tf
-<6f6e> Tj
+<61786f6e6672616d65776f726b> Tj
ET
0.000 0.000 0.000 SCN
@@ -130308,9 +130320,9 @@ ET
0.200 0.200 0.200 SCN
BT
-158.24 573.8850000000001 Td
+180.24 573.885 Td
/F3.0 11 Tf
-<28> Tj
+<2e> Tj
ET
0.000 0.000 0.000 SCN
@@ -130319,9 +130331,9 @@ ET
0.200 0.200 0.200 SCN
BT
-163.74 573.8850000000001 Td
+185.74 573.885 Td
/F3.0 11 Tf
-<546f446f4974656d> Tj
+<6576656e7468616e646c696e67> Tj
ET
0.000 0.000 0.000 SCN
@@ -130330,7 +130342,7 @@ ET
0.200 0.200 0.200 SCN
BT
-207.74 573.8850000000001 Td
+257.24 573.885 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -130341,9 +130353,9 @@ ET
0.200 0.200 0.200 SCN
BT
-213.24 573.8850000000001 Td
+262.74 573.885 Td
/F3.0 11 Tf
-<4f626a656374437265617465644576656e74> Tj
+<616e6e6f746174696f6e> Tj
ET
0.000 0.000 0.000 SCN
@@ -130352,9 +130364,9 @@ ET
0.200 0.200 0.200 SCN
BT
-312.24 573.8850000000001 Td
+317.74 573.885 Td
/F3.0 11 Tf
-<20> Tj
+<2e> Tj
ET
0.000 0.000 0.000 SCN
@@ -130363,9 +130375,9 @@ ET
0.200 0.200 0.200 SCN
BT
-317.74 573.8850000000001 Td
+323.24 573.885 Td
/F3.0 11 Tf
-<6576> Tj
+<4576656e7448616e646c6572> Tj
ET
0.000 0.000 0.000 SCN
@@ -130374,20 +130386,20 @@ ET
0.200 0.200 0.200 SCN
BT
-328.74 573.8850000000001 Td
+389.24 573.885 Td
/F3.0 11 Tf
-<29> Tj
+<20> Tj
ET
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
+0.600 0.600 0.600 scn
+0.600 0.600 0.600 SCN
BT
-334.24 573.8850000000001 Td
+394.74 573.885 Td
/F3.0 11 Tf
-<20> Tj
+<2f2f206966207573696e672061786f6e> Tj
ET
0.000 0.000 0.000 SCN
@@ -130396,20 +130408,20 @@ ET
0.200 0.200 0.200 SCN
BT
-339.74 573.8850000000001 Td
+59.24 559.145 Td
/F3.0 11 Tf
-<7b> Tj
+<ca202020> Tj
ET
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
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
BT
-59.24 559.145 Td
+81.24000000000001 559.145 Td
/F3.0 11 Tf
-<ca20202020202020> Tj
+<40636f6d> Tj
ET
0.000 0.000 0.000 SCN
@@ -130431,6 +130443,17 @@ ET
BT
108.74000000000001 559.145 Td
/F3.0 11 Tf
+<676f6f676c65> Tj
+ET
+
+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
+
+BT
+141.74 559.145 Td
+/F3.0 11 Tf
<2e> Tj
ET
@@ -130440,7 +130463,18 @@ ET
0.200 0.200 0.200 SCN
BT
-114.24000000000001 559.145 Td
+147.24 559.145 Td
+/F3.0 11 Tf
+<636f6d6d6f6e> Tj
+ET
+
+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
+
+BT
+180.24 559.145 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -130451,20 +130485,97 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 544.4050000000001 Td
+185.74 559.145 Td
+/F3.0 11 Tf
+<6576656e74627573> Tj
+ET
+
+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
+
+BT
+229.74 559.145 Td
+/F3.0 11 Tf
+<2e> Tj
+ET
+
+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
+
+BT
+235.24 559.145 Td
+/F3.0 11 Tf
+<537562736372696265> Tj
+ET
+
+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
+
+BT
+284.74 559.145 Td
+/F3.0 11 Tf
+<2020202020202020202020202020202020202020> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.600 0.600 0.600 scn
+0.600 0.600 0.600 SCN
+
+BT
+394.74 559.145 Td
+/F3.0 11 Tf
+<2f2f206966207573696e67206775617661> Tj
+ET
+
+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
+
+BT
+59.24 544.405 Td
/F3.0 11 Tf
<ca202020> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
+
+BT
+81.24000000000001 544.405 Td
+/F3.0 11 Tf
+<7075626c6963> Tj
+ET
+
+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
BT
-81.24000000000001 544.4050000000001 Td
+114.24000000000001 544.405 Td
/F3.0 11 Tf
-<7d> Tj
+<20> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
+
+BT
+119.74000000000001 544.405 Td
+/F3.0 11 Tf
+<766f6964> Tj
ET
0.000 0.000 0.000 SCN
@@ -130473,31 +130584,31 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 529.6650000000001 Td
+141.74 544.405 Td
/F3.0 11 Tf
-<7d> Tj
+<20> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-q
-0.5 w
-0.933 0.933 0.933 SCN
-113.807 448.410 m
-113.807 503.750 l
-S
-Q
-0.067 0.067 0.067 scn
-0.067 0.067 0.067 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+147.24 544.405 Td
+/F3.0 11 Tf
+<6f6e> Tj
+ET
+
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.067 0.067 0.067 scn
-0.067 0.067 0.067 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
-80.17133333333334 467.5 Td
-/F5.1 24 Tf
-<21> Tj
+158.24 544.405 Td
+/F3.0 11 Tf
+<28> Tj
ET
0.000 0.000 0.000 SCN
@@ -130505,55 +130616,109 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-30.911 Tw
+BT
+163.74 544.405 Td
+/F3.0 11 Tf
+<546f446f4974656d> Tj
+ET
+
+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
BT
-125.80666666666667 487.786 Td
-/F1.0 10.5 Tf
-[<4966207468652041786f6e4672> 20.01953125 <616d65776f726b206973206265696e6720757365642c207265706c616365>] TJ
+207.74 544.405 Td
+/F3.0 11 Tf
+<2e> Tj
ET
+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
+
+BT
+213.24 544.405 Td
+/F3.0 11 Tf
+<4f626a656374437265617465644576656e74> 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
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
-189.521 Tw
+BT
+312.24 544.405 Td
+/F3.0 11 Tf
+<20> Tj
+ET
+
+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
BT
-125.80666666666667 472.006 Td
-/F3.0 10.5 Tf
-<40636f6d2e676f6f676c652e636f6d6d6f6e2e6576656e746275732e537562736372696265> Tj
+317.74 544.405 Td
+/F3.0 11 Tf
+<6576> Tj
ET
+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
+
+BT
+328.74 544.405 Td
+/F3.0 11 Tf
+<29> 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
-189.521 Tw
+BT
+334.24 544.405 Td
+/F3.0 11 Tf
+<20> Tj
+ET
+
+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
BT
-320.0566666666667 472.006 Td
-/F1.0 10.5 Tf
-<2077697468> Tj
+339.74 544.405 Td
+/F3.0 11 Tf
+<7b> Tj
ET
+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
+
+BT
+59.24 529.6650000000001 Td
+/F3.0 11 Tf
+<ca20202020202020> 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
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
-125.80666666666667 456.226 Td
-/F3.0 10.5 Tf
-<406f72672e61786f6e6672616d65776f726b2e6576656e7468616e646c696e672e616e6e6f746174696f6e2e4576656e7448616e646c6572> Tj
+103.24000000000001 529.6650000000001 Td
+/F3.0 11 Tf
+<2e> Tj
ET
0.000 0.000 0.000 SCN
@@ -130562,8 +130727,8 @@ ET
0.200 0.200 0.200 SCN
BT
-419.8066666666667 456.226 Td
-/F1.0 10.5 Tf
+108.74000000000001 529.6650000000001 Td
+/F3.0 11 Tf
<2e> Tj
ET
@@ -130573,7 +130738,51 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24000000000001 417.72599999999994 Td
+114.24000000000001 529.6650000000001 Td
+/F3.0 11 Tf
+<2e> Tj
+ET
+
+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
+
+BT
+59.24 514.9250000000001 Td
+/F3.0 11 Tf
+<ca202020> Tj
+ET
+
+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
+
+BT
+81.24000000000001 514.9250000000001 Td
+/F3.0 11 Tf
+<7d> Tj
+ET
+
+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
+
+BT
+59.24 500.18500000000006 Td
+/F3.0 11 Tf
+<7d> Tj
+ET
+
+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
+
+BT
+48.24 455.586 Td
/F2.0 13 Tf
<31302e342e322e2044656661756c742c20446f6f7020616e64204e6f6f70206576656e7473> Tj
ET
@@ -130586,7 +130795,7 @@ ET
4.157 Tw
BT
-48.24000000000001 391.16599999999994 Td
+48.24 429.026 Td
/F1.0 10.5 Tf
<49662074686520> Tj
ET
@@ -130601,7 +130810,7 @@ ET
4.157 Tw
BT
-85.6915 391.16599999999994 Td
+85.69149999999999 429.026 Td
/F3.0 10.5 Tf
<637265617465644c6966656379636c654576656e74> Tj
ET
@@ -130616,7 +130825,7 @@ ET
4.157 Tw
BT
-195.94150000000002 391.16599999999994 Td
+195.94150000000002 429.026 Td
/F1.0 10.5 Tf
<20617474726962757465206973206e6f74206578706c696
<TRUNCATED>