You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2016/07/12 22:55:10 UTC
[1/7] isis-site git commit: internal services introduced in 1.13.0
Repository: isis-site
Updated Branches:
refs/heads/asf-site 2c032b24c -> c5f2b2e14
http://git-wip-us.apache.org/repos/asf/isis-site/blob/c5f2b2e1/content/migration-notes.html
----------------------------------------------------------------------
diff --git a/content/migration-notes.html b/content/migration-notes.html
index 5b47550..08b3132 100644
--- a/content/migration-notes.html
+++ b/content/migration-notes.html
@@ -538,8 +538,18 @@ was an amalgam of <code>cmd.xsd</code> and <code>ixn.xsd</code>).</p>
<p>The reworked <code>CommandService</code> now properly supports property edits in the exact same way as action invocations.</p>
</div>
<div class="paragraph">
-<p>As a side-effect of this work, note also that the <code>CommandService#startTransaction(…​)</code> SPI is <strong>NO LONGER CALLED</strong> by
-the framework.</p>
+<p>As a side-effect of this work, note also that:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>the <code>CommandService#startTransaction(…​)</code> SPI is <strong>NO LONGER CALLED</strong> by the framework.</p>
+</li>
+<li>
+<p>the <code>BackgroundService#asActionInvocationMemento(…​)</code> (not formally part of the API) is also no longer called by the
+framework; moreover the default implementation now throws an exception to this effect.</p>
+</li>
+</ul>
</div>
</div>
<div class="sect2">
http://git-wip-us.apache.org/repos/asf/isis-site/blob/c5f2b2e1/content/screencasts.html
----------------------------------------------------------------------
diff --git a/content/screencasts.html b/content/screencasts.html
index 367edac..a01f9af 100644
--- a/content/screencasts.html
+++ b/content/screencasts.html
@@ -583,7 +583,7 @@ can use one of the themed playlists to explore particular aspects of the framewo
<tr>
<td class="tableblock halign-left valign-top"><div><div class="paragraph">
<p><a href="https://www.youtube.com/watch?v=OTNHR5EdAs8" target="_blank">001</a><br>
-Generating an app using the <a href="ug.html#_ug_getting-started_simpleapp-archetype">SimpleApp Maven archetype</a></p>
+Generating an app using the <a href="guides/ugfun.html#_ugfun_getting-started_simpleapp-archetype">SimpleApp archetype</a></p>
</div></div></td>
<td class="tableblock halign-left valign-top"><div><div class="paragraph">
<p>x</p>
@@ -601,7 +601,7 @@ Generating an app using the <a href="ug.html#_ug_getting-started_simpleapp-arche
<tr>
<td class="tableblock halign-left valign-top"><div><div class="paragraph">
<p><a href="https://www.youtube.com/watch?v=6GPtec5Hu5Q" target="_blank">002</a><br>
-Importing the generated app into an <a href="dg.html#_dg_ide">IDE</a><br></p>
+Importing the generated app into an <a href="guides/dg.html#_dg_ide">IDE</a><br></p>
</div></div></td>
<td class="tableblock halign-left valign-top"><div><div class="paragraph">
<p>x</p>
@@ -621,7 +621,7 @@ Importing the generated app into an <a href="dg.html#_dg_ide">IDE</a><br></p>
<tr>
<td class="tableblock halign-left valign-top"><div><div class="paragraph">
<p><a href="https://www.youtube.com/watch?v=xVTjtiJM8XM" target="_blank">003</a><br>
-Walking through the main classes that make up the SimpleApp: <code>SimpleObject</code> persistent entity, <code>HomePageViewModel</code> <a href="ugbtb.html#_ugbtb_view-models">view model</a> and <code>SimpleObjects</code> domain service (repository).</p>
+Walking through the main classes that make up the SimpleApp: <code>SimpleObject</code> persistent entity, <code>HomePageViewModel</code> <a href="guides/ugbtb.html#_ugbtb_view-models">view model</a> and <code>SimpleObjects</code> domain service (repository).</p>
</div></div></td>
<td class="tableblock halign-left valign-top"><div></div></td>
<td class="tableblock halign-left valign-top"><div></div></td>
@@ -639,7 +639,7 @@ Walking through the main classes that make up the SimpleApp: <code>SimpleObject<
<tr>
<td class="tableblock halign-left valign-top"><div><div class="paragraph">
<p><a href="https://www.youtube.com/watch?v=KCJ1ZPPB3pA" target="_blank">004</a><br>
-Using the optional <code>Xxx.layout.xml</code> file to provide <a href="ugfun.html#_ugfun_object-layout_dynamic_xml">layout metadata</a> to dynamically render a domain object using the <a href="http://getbootstrap.com">Bootstrap 3</a> grid system.</p>
+Using the optional <code>Xxx.layout.xml</code> file to provide <a href="guides/ugfun.html#_ugfun_object-layout_dynamic_xml">layout metadata</a> to dynamically render a domain object using the <a href="http://getbootstrap.com">Bootstrap 3</a> grid system.</p>
</div></div></td>
<td class="tableblock halign-left valign-top"><div></div></td>
<td class="tableblock halign-left valign-top"><div><div class="paragraph">
@@ -695,7 +695,7 @@ Using the optional <code>Xxx.layout.xml</code> file to provide <a href="ugfun.ht
<tr>
<td class="tableblock halign-left valign-top"><div><div class="paragraph">
<p><a href="https://www.youtube.com/watch?v=pH02g0l2GKY" target="_blank">005</a><br>
-Using <a href="ugtst.html#_ugtst_fixture-scripts">fixture scripts</a> to initialize the database, eg while prototyping and for demos</p>
+Using <a href="guides/ugtst.html#_ugtst_fixture-scripts">fixture scripts</a> to initialize the database, eg while prototyping and for demos</p>
</div></div></td>
<td class="tableblock halign-left valign-top"><div></div></td>
<td class="tableblock halign-left valign-top"><div><div class="paragraph">
@@ -713,7 +713,7 @@ Using <a href="ugtst.html#_ugtst_fixture-scripts">fixture scripts</a> to initial
<tr>
<td class="tableblock halign-left valign-top"><div><div class="paragraph">
<p><a href="https://www.youtube.com/watch?v=dXtmxmYxa30" target="_blank">006</a><br>
-Implementing <a href="ugfun.html#_ugfun_how-tos_business-rules">business rules</a>for domain object members, using supporting methods ("see it, use it, do it")</p>
+Implementing <a href="guides/ugfun.html#_ugfun_how-tos_business-rules">business rules</a>for domain object members, using supporting methods ("see it, use it, do it")</p>
</div></div></td>
<td class="tableblock halign-left valign-top"><div><div class="paragraph">
<p>x</p>
@@ -731,7 +731,7 @@ Implementing <a href="ugfun.html#_ugfun_how-tos_business-rules">business rules</
<tr>
<td class="tableblock halign-left valign-top"><div><div class="paragraph">
<p><a href="https://www.youtube.com/watch?v=imHfxQGUgV8" target="_blank">007</a><br>
-Writing <a href="ugtst.html#_ugtst_unit-test-support">unit tests</a> for a domain object responsibility</p>
+Writing <a href="guides/ugtst.html#_ugtst_unit-test-support">unit tests</a> for a domain object responsibility</p>
</div></div></td>
<td class="tableblock halign-left valign-top"><div></div></td>
<td class="tableblock halign-left valign-top"><div><div class="paragraph">
@@ -749,7 +749,7 @@ Writing <a href="ugtst.html#_ugtst_unit-test-support">unit tests</a> for a domai
<tr>
<td class="tableblock halign-left valign-top"><div><div class="paragraph">
<p><a href="https://www.youtube.com/watch?v=-lAt4UWiBjE" target="_blank">008</a><br>
-Writing end-to-end <a href="ugtst.html#_ugtst_integ-test-support">integration tests</a> for a domain object responsibility</p>
+Writing end-to-end <a href="guides/ugtst.html#_ugtst_integ-test-support">integration tests</a> for a domain object responsibility</p>
</div></div></td>
<td class="tableblock halign-left valign-top"><div></div></td>
<td class="tableblock halign-left valign-top"><div><div class="paragraph">
@@ -805,7 +805,7 @@ Writing end-to-end <a href="ugtst.html#_ugtst_integ-test-support">integration te
<tr>
<td class="tableblock halign-left valign-top"><div><div class="paragraph">
<p><a href="https://www.youtube.com/watch?v=lkZxRSS0Zwg" target="_blank">009</a><br>
-Using the Swagger UI to access the <a href="ugvro.html">REST API</a> automatically exposed for domain services, entities, and/or view models</p>
+Using the Swagger UI to access the <a href="guides/ugvro.html">REST API</a> automatically exposed for domain services, entities, and/or view models</p>
</div></div></td>
<td class="tableblock halign-left valign-top"><div></div></td>
<td class="tableblock halign-left valign-top"><div></div></td>
@@ -823,7 +823,7 @@ Using the Swagger UI to access the <a href="ugvro.html">REST API</a> automatical
<tr>
<td class="tableblock halign-left valign-top"><div><div class="paragraph">
<p><a href="https://www.youtube.com/watch?v=yOh3WphhR1E" target="_blank">010</a><br>
-Using the <a href="#rgmvn.adoc">Apache Isis maven plugin</a> to validate domain object models during the build process (rather than at runtime).</p>
+Using the <a href="#guides/rgmvn.adoc">Apache Isis maven plugin</a> to validate domain object models during the build process (rather than at runtime).</p>
</div></div></td>
<td class="tableblock halign-left valign-top"><div></div></td>
<td class="tableblock halign-left valign-top"><div></div></td>
@@ -846,7 +846,7 @@ Using the <a href="#rgmvn.adoc">Apache Isis maven plugin</a> to validate domain
<tr>
<td class="tableblock halign-left valign-top"><div><div class="paragraph">
<p><a href="https://www.youtube.com/watch?v=1sNiR3Y84c0" target="_blank">011</a><br>
-How the framework uses the <a href="rgcms.html#_rgcms_classes_AppManifest-bootstrapping"><code>AppManifest</code></a> is used to bootstrap the application</p>
+How the framework uses the <a href="guides/rgcms.html#_rgcms_classes_AppManifest-bootstrapping"><code>AppManifest</code></a> is used to bootstrap the application</p>
</div></div></td>
<td class="tableblock halign-left valign-top"><div></div></td>
<td class="tableblock halign-left valign-top"><div></div></td>
@@ -902,7 +902,7 @@ How the framework uses the <a href="rgcms.html#_rgcms_classes_AppManifest-bootst
<tr>
<td class="tableblock halign-left valign-top"><div><div class="paragraph">
<p><a href="https://www.youtube.com/watch?v=dfRZeYqzMtI" target="_blank">012</a><br>
-Implementing business logic using a (no-arg) action, and associating with a property using either the <a href="rgant.html#_rgant-MemberOrder"><code>@MemberOrder</code></a> annotations or using <a href="ugfun.html#_ugfun_object-layout_dynamic_xml">dynamic (XML) layouts</a>.</p>
+Implementing business logic using a (no-arg) action, and associating with a property using either the <a href="guides/rgant.html#_rgant-MemberOrder"><code>@MemberOrder</code></a> annotations or using <a href="guides/ugfun.html#_ugfun_object-layout_dynamic_xml">dynamic (XML) layouts</a>.</p>
</div></div></td>
<td class="tableblock halign-left valign-top"><div><div class="paragraph">
<p>x</p>
@@ -922,7 +922,7 @@ Implementing business logic using a (no-arg) action, and associating with a prop
<tr>
<td class="tableblock halign-left valign-top"><div><div class="paragraph">
<p><a href="https://www.youtube.com/watch?v=0naoVsWppuQ" target="_blank">013</a><br>
-Invoking (no-arg) action on multiple objects at once (using <a href="rgant.html#_rgant-Action_invokeOn"><code>@Action#invokeOn()</code></a>, and using the <a href="rgsvc.html#_rgsvc_api_ActionInvocationContext"><code>ActionInvocationContext</code></a> domain service for a smoother end-user experience.</p>
+Invoking (no-arg) action on multiple objects at once (using <a href="guides/rgant.html#_rgant-Action_invokeOn"><code>@Action#invokeOn()</code></a>, and using the <a href="guides/rgsvc.html#_rgsvc_api_ActionInvocationContext"><code>ActionInvocationContext</code></a> domain service for a smoother end-user experience.</p>
</div></div></td>
<td class="tableblock halign-left valign-top"><div></div></td>
<td class="tableblock halign-left valign-top"><div></div></td>
@@ -980,7 +980,7 @@ Invoking (no-arg) action on multiple objects at once (using <a href="rgant.html#
<tr>
<td class="tableblock halign-left valign-top"><div><div class="paragraph">
<p><a href="https://www.youtube.com/watch?v=CwM430UH5WE" target="_blank">014</a><br>
-Using the <a href="rgcms.html#_rgcms_methods_reserved_title"><code>title()</code></a>, <a href="rgcms.html#_rgcms_methods_reserved_iconName"><code>iconName()</code></a> and <a href="rgcms.html#_rgcms_methods_reserved_cssClass"><code>cssClass()</code></a> so that end-users can distinguish domain objects within the UI.</p>
+Using the <a href="guides/rgcms.html#_rgcms_methods_reserved_title"><code>title()</code></a>, <a href="guides/rgcms.html#_rgcms_methods_reserved_iconName"><code>iconName()</code></a> and <a href="guides/rgcms.html#_rgcms_methods_reserved_cssClass"><code>cssClass()</code></a> so that end-users can distinguish domain objects within the UI.</p>
</div></div></td>
<td class="tableblock halign-left valign-top"><div><div class="paragraph">
<p>x</p>
@@ -1002,7 +1002,7 @@ Using the <a href="rgcms.html#_rgcms_methods_reserved_title"><code>title()</code
<tr>
<td class="tableblock halign-left valign-top"><div><div class="paragraph">
<p><a href="https://www.youtube.com/watch?v=7ToRKBOeemM" target="_blank">015</a><br>
-Moving the responsibility to specify the icon for a domain object out and into a subscriber, using the <a href="rgcms.html#_rgcms_classes_uievent_IconUiEvent"><code>IconUiEvent</code></a> as per the <a href="rgant.html#_rgant-DomainObjectLayout_iconUiEvent"><code>@DomainObjectLayout#iconUiEvent()</code></a> annotation</p>
+Moving the responsibility to specify the icon for a domain object out and into a subscriber, using the <a href="guides/rgcms.html#_rgcms_classes_uievent_IconUiEvent"><code>IconUiEvent</code></a> as per the <a href="guides/rgant.html#_rgant-DomainObjectLayout_iconUiEvent"><code>@DomainObjectLayout#iconUiEvent()</code></a> annotation</p>
</div></div></td>
<td class="tableblock halign-left valign-top"><div></div></td>
<td class="tableblock halign-left valign-top"><div></div></td>
@@ -1048,7 +1048,7 @@ How to implement a derived collection on a domain object.</p>
<tr>
<td class="tableblock halign-left valign-top"><div><div class="paragraph">
<p><a href="https://www.youtube.com/watch?v=l_oZymgb65I" target="_blank">017</a><br>
-Extending a <a href="ugtst.html#_ugtst_fixture-scripts">fixture script</a> to more easily demonstrate new functionality.</p>
+Extending a <a href="guides/ugtst.html#_ugtst_fixture-scripts">fixture script</a> to more easily demonstrate new functionality.</p>
</div></div></td>
<td class="tableblock halign-left valign-top"><div></div></td>
<td class="tableblock halign-left valign-top"><div><div class="paragraph">
@@ -1071,7 +1071,7 @@ Extending a <a href="ugtst.html#_ugtst_fixture-scripts">fixture script</a> to mo
<tr>
<td class="tableblock halign-left valign-top"><div><div class="paragraph">
<p><a href="https://www.youtube.com/watch?v=39Hpd7C4Kvo" target="_blank">018</a><br>
-Using <a href="ugfun.html#_ugfun_object-layout_dynamic_xml">dynamic (XML) layouts</a> to specify the page size for a domain object’s collection.</p>
+Using <a href="guides/ugfun.html#_ugfun_object-layout_dynamic_xml">dynamic (XML) layouts</a> to specify the page size for a domain object’s collection.</p>
</div></div></td>
<td class="tableblock halign-left valign-top"><div></div></td>
<td class="tableblock halign-left valign-top"><div></div></td>
@@ -1127,8 +1127,8 @@ Using <a href="ugfun.html#_ugfun_object-layout_dynamic_xml">dynamic (XML) layout
<tr>
<td class="tableblock halign-left valign-top"><div><div class="paragraph">
<p><a href="https://www.youtube.com/watch?v=0d713-V4vrg" target="_blank">019</a><br>
-Demonstrates how Apache Isis' <a href="#ugvw.adoc">Wicket viewer</a> remembers the state of rendered domain objects, and how the end-user of the
- application can clear these UI hints using the (framework-provided) <a href="rgcms.html#_rgcms_classes_mixins_Object_clearHints">"clear hints"</a> action.</p>
+Demonstrates how Apache Isis' <a href="#guides/ugvw.adoc">Wicket viewer</a> remembers the state of rendered domain objects, and how the end-user of the
+ application can clear these UI hints using the (framework-provided) <a href="guides/rgcms.html#_rgcms_classes_mixins_Object_clearHints">"clear hints"</a> action.</p>
</div></div></td>
<td class="tableblock halign-left valign-top"><div></div></td>
<td class="tableblock halign-left valign-top"><div></div></td>
@@ -1146,7 +1146,7 @@ Demonstrates how Apache Isis' <a href="#ugvw.adoc">Wicket viewer</a> remembers t
<tr>
<td class="tableblock halign-left valign-top"><div><div class="paragraph">
<p><a href="https://www.youtube.com/watch?v=Kqch-XNlBMA" target="_blank">020</a><br>
-Demonstrates how the end-user can copy and share URLs for domain objects - including UI hints - using Apache Isis' <a href="#ugvw.adoc">Wicket viewer</a>.</p>
+Demonstrates how the end-user can copy and share URLs for domain objects - including UI hints - using Apache Isis' <a href="#guides/ugvw.adoc">Wicket viewer</a>.</p>
</div></div></td>
<td class="tableblock halign-left valign-top"><div></div></td>
<td class="tableblock halign-left valign-top"><div></div></td>
@@ -1164,7 +1164,7 @@ Demonstrates how the end-user can copy and share URLs for domain objects - inclu
<tr>
<td class="tableblock halign-left valign-top"><div><div class="paragraph">
<p><a href="https://www.youtube.com/watch?v=a0QQLT_16To" target="_blank">021</a><br>
-Demonstrates how the end-user can use bookmarks and breadcrumbs within Apache Isis' <a href="#ugvw.adoc">Wicket viewer</a>, and how the developer can ensure that <a href="rgant.html#_rgant-DomainObjectLayout_bookmarking">domain objects</a> and (<a href="rgant.html#_rgant-Action_semantics">query-only</a>) <a href="rgant.html#_rgant-ActionLayout_bookmarking">actions</a> can be bookmarked.</p>
+Demonstrates how the end-user can use bookmarks and breadcrumbs within Apache Isis' <a href="#guides/ugvw.adoc">Wicket viewer</a>, and how the developer can ensure that <a href="guides/rgant.html#_rgant-DomainObjectLayout_bookmarking">domain objects</a> and (<a href="guides/rgant.html#_rgant-Action_semantics">query-only</a>) <a href="guides/rgant.html#_rgant-ActionLayout_bookmarking">actions</a> can be bookmarked.</p>
</div></div></td>
<td class="tableblock halign-left valign-top"><div></div></td>
<td class="tableblock halign-left valign-top"><div></div></td>
@@ -1220,7 +1220,7 @@ Demonstrates how the end-user can use bookmarks and breadcrumbs within Apache Is
<tr>
<td class="tableblock halign-left valign-top"><div><div class="paragraph">
<p><a href="https://www.youtube.com/watch?v=Wn5215K7_Jg" target="_blank">022</a><br>
-Shows how to refactor a domain object to move an action implementation out of the domain object itself, and instead implement as a <a href="ugbtb.html#_ugbtb_decoupling_mixins">mixin</a> (useful for decoupling).</p>
+Shows how to refactor a domain object to move an action implementation out of the domain object itself, and instead implement as a <a href="guides/ugbtb.html#_ugbtb_decoupling_mixins">mixin</a> (useful for decoupling).</p>
</div></div></td>
<td class="tableblock halign-left valign-top"><div><div class="paragraph">
<p>x</p>
@@ -1240,7 +1240,7 @@ Shows how to refactor a domain object to move an action implementation out of th
<tr>
<td class="tableblock halign-left valign-top"><div><div class="paragraph">
<p><a href="https://www.youtube.com/watch?v=m633OEBpWqQ" target="_blank">023</a><br>
-Shows how to refactor a domain object to move (derived) collections out of the domain object and reimplement as a <a href="ugbtb.html#_ugbtb_decoupling_mixins">mixin</a>.</p>
+Shows how to refactor a domain object to move (derived) collections out of the domain object and reimplement as a <a href="guides/ugbtb.html#_ugbtb_decoupling_mixins">mixin</a>.</p>
</div></div></td>
<td class="tableblock halign-left valign-top"><div></div></td>
<td class="tableblock halign-left valign-top"><div></div></td>
@@ -1258,7 +1258,7 @@ Shows how to refactor a domain object to move (derived) collections out of the d
<tr>
<td class="tableblock halign-left valign-top"><div><div class="paragraph">
<p><a href="https://www.youtube.com/watch?v=-AQJb9GtIqI" target="_blank">024</a><br>
-Using a domain event <a href="rgcms.html#_rgcms_classes_super_AbstractSubscriber">subscriber</a> to <a href="ugbtb.html#_ugbtb_decoupling_event-bus">decouple</a> and abstract business rules ( <a href="rgcms.html#_rgcms_methods_prefixes_validate">validation</a>).</p>
+Using a domain event <a href="guides/rgcms.html#_rgcms_classes_super_AbstractSubscriber">subscriber</a> to <a href="guides/ugbtb.html#_ugbtb_decoupling_event-bus">decouple</a> and abstract business rules ( <a href="guides/rgcms.html#_rgcms_methods_prefixes_validate">validation</a>).</p>
</div></div></td>
<td class="tableblock halign-left valign-top"><div></div></td>
<td class="tableblock halign-left valign-top"><div></div></td>
@@ -1276,8 +1276,8 @@ Using a domain event <a href="rgcms.html#_rgcms_classes_super_AbstractSubscriber
<tr>
<td class="tableblock halign-left valign-top"><div><div class="paragraph">
<p><a href="https://www.youtube.com/watch?v=6GjLW0hlrm4" target="_blank">025</a><br>
-Using a domain event <a href="rgcms.html#_rgcms_classes_super_AbstractSubscriber">subscriber</a> to hide functionality, in this
- case the <a href="rgcms.html#_rgcms_classes_mixins_Object_clearHints">"clear hints"</a> action automatically provided by the framework.</p>
+Using a domain event <a href="guides/rgcms.html#_rgcms_classes_super_AbstractSubscriber">subscriber</a> to hide functionality, in this
+ case the <a href="guides/rgcms.html#_rgcms_classes_mixins_Object_clearHints">"clear hints"</a> action automatically provided by the framework.</p>
</div></div></td>
<td class="tableblock halign-left valign-top"><div></div></td>
<td class="tableblock halign-left valign-top"><div></div></td>
@@ -1300,7 +1300,7 @@ Using a domain event <a href="rgcms.html#_rgcms_classes_super_AbstractSubscriber
<tr>
<td class="tableblock halign-left valign-top"><div><div class="paragraph">
<p><a href="https://www.youtube.com/watch?v=qj4bMkQRBUY" target="_blank">026</a><br>
-Using the <a href="rgant.html#_rgant-Title"><code>@Title</code></a> annotation (instead of the <a href="rgcms.html#_rgcms_methods_reserved_title"><code>title()</code></a> reserved method) to obtain the title of a domain object, so that the end-user can distinguish one object from another.</p>
+Using the <a href="guides/rgant.html#_rgant-Title"><code>@Title</code></a> annotation (instead of the <a href="guides/rgcms.html#_rgcms_methods_reserved_title"><code>title()</code></a> reserved method) to obtain the title of a domain object, so that the end-user can distinguish one object from another.</p>
</div></div></td>
<td class="tableblock halign-left valign-top"><div><div class="paragraph">
<p>x</p>
@@ -1325,7 +1325,7 @@ Using the <a href="rgant.html#_rgant-Title"><code>@Title</code></a> annotation (
<tr>
<td class="tableblock halign-left valign-top"><div><div class="paragraph">
<p><a href="https://www.youtube.com/watch?v=yi52Gbd3lmY" target="_blank">027</a><br>
-How to write an <a href="ugtst.html#_ugtst_integ-test-support">integration test</a> for an <a href="rgant.html#_rgant-Mixin">mixin</a>.</p>
+How to write an <a href="guides/ugtst.html#_ugtst_integ-test-support">integration test</a> for an <a href="guides/rgant.html#_rgant-Mixin">mixin</a>.</p>
</div></div></td>
<td class="tableblock halign-left valign-top"><div></div></td>
<td class="tableblock halign-left valign-top"><div><div class="paragraph">
@@ -1399,7 +1399,7 @@ Using <a href="https://projectlombok.org/">Project Lombok</a> to remove boilerpl
<tr>
<td class="tableblock halign-left valign-top"><div><div class="paragraph">
<p><a href="https://www.youtube.com/watch?v=AXuxULuRtm0" target="_blank">029</a><br>
-Using the (non-ASF) <a href="http://github.com/isisaddons/isis-metamodel-paraname8">Isis addons' paraname8</a> module to remove boilerplate from your domain object (<a href="rgant.html#_rgant-ParameterLayout_named"><code>@ParameterLayout#named()</code></a> annotation attribute on action parameters).</p>
+Using the (non-ASF) <a href="http://github.com/isisaddons/isis-metamodel-paraname8">Isis addons' paraname8</a> module to remove boilerplate from your domain object (<a href="guides/rgant.html#_rgant-ParameterLayout_named"><code>@ParameterLayout#named()</code></a> annotation attribute on action parameters).</p>
</div></div></td>
<td class="tableblock halign-left valign-top"><div></div></td>
<td class="tableblock halign-left valign-top"><div></div></td>
@@ -1457,7 +1457,7 @@ Using the (non-ASF) <a href="http://github.com/isisaddons/isis-metamodel-paranam
<tr>
<td class="tableblock halign-left valign-top"><div><div class="paragraph">
<p><a href="https://www.youtube.com/watch?v=ORoEYlg6XFM" target="_blank">030</a><br>
-How to validate action parameters using a supporting <a href="rgcms.html#_rgcms_methods_prefixes_validate"><code>validateNXxx()</code></a> method.</p>
+How to validate action parameters using a supporting <a href="guides/rgcms.html#_rgcms_methods_prefixes_validate"><code>validateNXxx()</code></a> method.</p>
</div></div></td>
<td class="tableblock halign-left valign-top"><div><div class="paragraph">
<p>x</p>
@@ -1477,7 +1477,7 @@ How to validate action parameters using a supporting <a href="rgcms.html#_rgcms_
<tr>
<td class="tableblock halign-left valign-top"><div><div class="paragraph">
<p><a href="https://www.youtube.com/watch?v=1Vlzob89pYI" target="_blank">031</a><br>
-How to validate action parameters using the <a href="rgant.html#_rgant-Parameter_mustSatisfy"><code>@Parameter#mustSatisfy()</code></a> and the Specification interface.</p>
+How to validate action parameters using the <a href="guides/rgant.html#_rgant-Parameter_mustSatisfy"><code>@Parameter#mustSatisfy()</code></a> and the Specification interface.</p>
</div></div></td>
<td class="tableblock halign-left valign-top"><div></div></td>
<td class="tableblock halign-left valign-top"><div></div></td>
@@ -1500,7 +1500,7 @@ How to validate action parameters using the <a href="rgant.html#_rgant-Parameter
<tr>
<td class="tableblock halign-left valign-top"><div><div class="paragraph">
<p><a href="https://www.youtube.com/watch?v=fYJjXAepWAs" target="_blank">032</a><br>
-How to instantiate/initialize objects using <a href="rgsvc.html#_rgsvc_api_RepositoryService"><code>RepositoryService</code></a>, <a href="rgsvc.html#_rgsvc_api_ServiceRegistry"><code>ServiceRegistry</code></a> and/or <a href="rgsvc.html#_rgsvc_api_FactoryService"><code>FactoryService</code></a>.</p>
+How to instantiate/initialize objects using <a href="guides/rgsvc.html#_rgsvc_api_RepositoryService"><code>RepositoryService</code></a>, <a href="guides/rgsvc.html#_rgsvc_api_ServiceRegistry"><code>ServiceRegistry</code></a> and/or <a href="guides/rgsvc.html#_rgsvc_api_FactoryService"><code>FactoryService</code></a>.</p>
</div></div></td>
<td class="tableblock halign-left valign-top"><div><div class="paragraph">
<p>x</p>
@@ -1558,7 +1558,7 @@ How to instantiate/initialize objects using <a href="rgsvc.html#_rgsvc_api_Repos
<tr>
<td class="tableblock halign-left valign-top"><div><div class="paragraph">
<p><a href="https://www.youtube.com/watch?v=cQ06PoMNDPw" target="_blank">033</a><br>
-How to provide a set of <a href="rgcms.html#_rgcms_methods_prefixes_choices">choices</a> (a drop-down list) when editing a property.</p>
+How to provide a set of <a href="guides/rgcms.html#_rgcms_methods_prefixes_choices">choices</a> (a drop-down list) when editing a property.</p>
</div></div></td>
<td class="tableblock halign-left valign-top"><div><div class="paragraph">
<p>x</p>
@@ -1578,7 +1578,7 @@ How to provide a set of <a href="rgcms.html#_rgcms_methods_prefixes_choices">cho
<tr>
<td class="tableblock halign-left valign-top"><div><div class="paragraph">
<p><a href="https://www.youtube.com/watch?v=afEnYKljBQs" target="_blank">034</a><br>
-How to provide a set of <a href="rgcms.html#_rgcms_methods_prefixes_choices">choices</a> (a drop-down list) when invoking an action.</p>
+How to provide a set of <a href="guides/rgcms.html#_rgcms_methods_prefixes_choices">choices</a> (a drop-down list) when invoking an action.</p>
</div></div></td>
<td class="tableblock halign-left valign-top"><div></div></td>
<td class="tableblock halign-left valign-top"><div></div></td>
@@ -1596,7 +1596,7 @@ How to provide a set of <a href="rgcms.html#_rgcms_methods_prefixes_choices">cho
<tr>
<td class="tableblock halign-left valign-top"><div><div class="paragraph">
<p><a href="https://www.youtube.com/watch?v=fKo6aTPK-gk" target="_blank">035</a><br>
-How to use the <a href="rgcms.html#_rgcms_methods_prefixes_choices">choices</a> supporting methods as a source for default values within a <a href="ugtst.html#_ugtst_fixture-scripts">fixture script</a>.</p>
+How to use the <a href="guides/rgcms.html#_rgcms_methods_prefixes_choices">choices</a> supporting methods as a source for default values within a <a href="guides/ugtst.html#_ugtst_fixture-scripts">fixture script</a>.</p>
</div></div></td>
<td class="tableblock halign-left valign-top"><div></div></td>
<td class="tableblock halign-left valign-top"><div><div class="paragraph">
@@ -1672,7 +1672,7 @@ How to use an enum for choices (drop down list) for both a property or an action
<tr>
<td class="tableblock halign-left valign-top"><div><div class="paragraph">
<p><a href="https://www.youtube.com/watch?v=1SCyBlMM2Bo" target="_blank">037</a><br>
-How to hide properties as columns in tables (parented collections or standalone collections), using the dynamic XML layout (equivalent to <a href="rgant.html#_rgant-PropertyLayout_hidden"><code>@PropertyLayout#hidden()</code></a>).</p>
+How to hide properties as columns in tables (parented collections or standalone collections), using the dynamic XML layout (equivalent to <a href="guides/rgant.html#_rgant-PropertyLayout_hidden"><code>@PropertyLayout#hidden()</code></a>).</p>
</div></div></td>
<td class="tableblock halign-left valign-top"><div></div></td>
<td class="tableblock halign-left valign-top"><div></div></td>
@@ -1746,7 +1746,7 @@ How to hide properties as columns in tables, using CSS.</p>
<tr>
<td class="tableblock halign-left valign-top"><div><div class="paragraph">
<p><a href="https://www.youtube.com/watch?v=NKaR7ZedI8E" target="_blank">039</a><br>
-Using the <a href="rgcms.html#_rgcms_classes_super_FixtureScript"><code>FixtureScript</code></a> <code>defaultParam(…​)</code> method to reflectively default parameters to fixture scripts that have not been set by the caller.</p>
+Using the <a href="guides/rgcms.html#_rgcms_classes_super_FixtureScript"><code>FixtureScript</code></a> <code>defaultParam(…​)</code> method to reflectively default parameters to fixture scripts that have not been set by the caller.</p>
</div></div></td>
<td class="tableblock halign-left valign-top"><div></div></td>
<td class="tableblock halign-left valign-top"><div><div class="paragraph">
@@ -1822,7 +1822,7 @@ Using the (non-ASF) <a href="http://github.com/isisaddons/isis-module-fakedata">
<tr>
<td class="tableblock halign-left valign-top"><div><div class="paragraph">
<p><a href="https://www.youtube.com/watch?v=esujf_DFeWA" target="_blank">041</a><br>
-Using BigDecimal as a property within a domain object, also demonstrating the "summary" view within the <a href="#ugvw.adoc">Wicket viewer</a>.</p>
+Using BigDecimal as a property within a domain object, also demonstrating the "summary" view within the <a href="#guides/ugvw.adoc">Wicket viewer</a>.</p>
</div></div></td>
<td class="tableblock halign-left valign-top"><div></div></td>
<td class="tableblock halign-left valign-top"><div></div></td>
@@ -1844,7 +1844,7 @@ Using BigDecimal as a property within a domain object, also demonstrating the "s
<tr>
<td class="tableblock halign-left valign-top"><div><div class="paragraph">
<p><a href="https://www.youtube.com/watch?v=n9Oy0m2bplw" target="_blank">042</a><br>
-How to use the <a href="rgant.html#_rgant-Digits"><code>@Digits</code></a> annotation for action parameters of type <code>java.math.BigDecimal</code>.</p>
+How to use the <a href="guides/rgant.html#_rgant-Digits"><code>@Digits</code></a> annotation for action parameters of type <code>java.math.BigDecimal</code>.</p>
</div></div></td>
<td class="tableblock halign-left valign-top"><div></div></td>
<td class="tableblock halign-left valign-top"><div></div></td>
@@ -1900,7 +1900,7 @@ How to use the <a href="rgant.html#_rgant-Digits"><code>@Digits</code></a> annot
<tr>
<td class="tableblock halign-left valign-top"><div><div class="paragraph">
<p><a href="https://www.youtube.com/watch?v=Rt4JoV4ssVY" target="_blank">043</a><br>
-How to use the supporting <a href="rgcms.html#_rgcms_methods_prefixes_default"><code>defaultXxx(…​)</code></a> supporting method to provide a default argument value for action parameters.</p>
+How to use the supporting <a href="guides/rgcms.html#_rgcms_methods_prefixes_default"><code>defaultXxx(…​)</code></a> supporting method to provide a default argument value for action parameters.</p>
</div></div></td>
<td class="tableblock halign-left valign-top"><div><div class="paragraph">
<p>x</p>
@@ -1920,7 +1920,7 @@ How to use the supporting <a href="rgcms.html#_rgcms_methods_prefixes_default"><
<tr>
<td class="tableblock halign-left valign-top"><div><div class="paragraph">
<p><a href="https://www.youtube.com/watch?v=qAJDGxztWIQ" target="_blank">044</a><br>
-How to use <a href="rgant.html#_rgant-DomainObject_bounded"><code>@DomainObject#bounded()</code></a> so that a drop-down list is automatically provided for any parameters to actions that are for (domain entity) reference types.</p>
+How to use <a href="guides/rgant.html#_rgant-DomainObject_bounded"><code>@DomainObject#bounded()</code></a> so that a drop-down list is automatically provided for any parameters to actions that are for (domain entity) reference types.</p>
</div></div></td>
<td class="tableblock halign-left valign-top"><div></div></td>
<td class="tableblock halign-left valign-top"><div></div></td>
@@ -1938,7 +1938,7 @@ How to use <a href="rgant.html#_rgant-DomainObject_bounded"><code>@DomainObject#
<tr>
<td class="tableblock halign-left valign-top"><div><div class="paragraph">
<p><a href="https://www.youtube.com/watch?v=0ro_YhXOpJU" target="_blank">045</a><br>
-How to use the <a href="rgcms.html#_rgcms_methods_prefixes_choices"><code>choicesXxx(…​)</code></a> supporting method to provide a drop-down list for parameters to actions that are for reference types (domain entities or view models).</p>
+How to use the <a href="guides/rgcms.html#_rgcms_methods_prefixes_choices"><code>choicesXxx(…​)</code></a> supporting method to provide a drop-down list for parameters to actions that are for reference types (domain entities or view models).</p>
</div></div></td>
<td class="tableblock halign-left valign-top"><div></div></td>
<td class="tableblock halign-left valign-top"><div></div></td>
@@ -1956,7 +1956,7 @@ How to use the <a href="rgcms.html#_rgcms_methods_prefixes_choices"><code>choice
<tr>
<td class="tableblock halign-left valign-top"><div><div class="paragraph">
<p><a href="https://www.youtube.com/watch?v=K36IJQ_hDfs" target="_blank">046</a><br>
-How to use the <a href="rgcms.html#_rgcms_methods_prefixes_autoComplete"><code>autoCompleteXxx(…​)</code></a> supporting method to provide a drop-down list for parameters to actions that are for reference types (domain entities or view models).</p>
+How to use the <a href="guides/rgcms.html#_rgcms_methods_prefixes_autoComplete"><code>autoCompleteXxx(…​)</code></a> supporting method to provide a drop-down list for parameters to actions that are for reference types (domain entities or view models).</p>
</div></div></td>
<td class="tableblock halign-left valign-top"><div></div></td>
<td class="tableblock halign-left valign-top"><div></div></td>
@@ -2050,7 +2050,7 @@ extension.</p>
<tr>
<td class="tableblock halign-left valign-top"><div><div class="paragraph">
<p><a href="https://www.youtube.com/watch?v=0YoFa44Xr6M" target="_blank">049</a><br>
-Using the <a href="rgant.html#_rgant-Programmatic"><code>@Programmatic</code></a> annotation to exclude methods from a domain object
+Using the <a href="guides/rgant.html#_rgant-Programmatic"><code>@Programmatic</code></a> annotation to exclude methods from a domain object
(eg implementing methods of an interface as defined by the (non-ASF)
<a href="http://github.com/isisaddons/isis-wicket-fullcalendar2">Isis addons' fullcalendar2 </a> wicket extension) that would
otherwise be part of the Apache Isis metamodel (and thus show up in the UI).</p>
@@ -2147,7 +2147,7 @@ Using derived properties to persist value types (such as gmap3’s Location
<tr>
<td class="tableblock halign-left valign-top"><div><div class="paragraph">
<p><a href="https://www.youtube.com/watch?v=puG-pzxRSd0" target="_blank">052</a><br>
-How to write a <a href="ugbtb.html#_ugbtb_view-models_jaxb">(JAXB) view model</a>, holding references to two domain objects.</p>
+How to write a <a href="guides/ugbtb.html#_ugbtb_view-models_jaxb">(JAXB) view model</a>, holding references to two domain objects.</p>
</div></div></td>
<td class="tableblock halign-left valign-top"><div><div class="paragraph">
<p>x</p>
@@ -2167,7 +2167,7 @@ How to write a <a href="ugbtb.html#_ugbtb_view-models_jaxb">(JAXB) view model</a
<tr>
<td class="tableblock halign-left valign-top"><div><div class="paragraph">
<p><a href="https://www.youtube.com/watch?v=tdBkmA2CCZY" target="_blank">053</a><br>
-Updating the title, icon and layout of a <a href="ugbtb.html#_ugbtb_view-models_jaxb">(JAXB) view model</a>.</p>
+Updating the title, icon and layout of a <a href="guides/ugbtb.html#_ugbtb_view-models_jaxb">(JAXB) view model</a>.</p>
</div></div></td>
<td class="tableblock halign-left valign-top"><div></div></td>
<td class="tableblock halign-left valign-top"><div></div></td>
@@ -2185,7 +2185,7 @@ Updating the title, icon and layout of a <a href="ugbtb.html#_ugbtb_view-models_
<tr>
<td class="tableblock halign-left valign-top"><div><div class="paragraph">
<p><a href="https://www.youtube.com/watch?v=TKF0FB_od00" target="_blank">054</a><br>
-How to expose information from underlying domain entities referenced by a <a href="ugbtb.html#_ugbtb_view-models_jaxb">(JAXB) view model</a> using derived properties</p>
+How to expose information from underlying domain entities referenced by a <a href="guides/ugbtb.html#_ugbtb_view-models_jaxb">(JAXB) view model</a> using derived properties</p>
</div></div></td>
<td class="tableblock halign-left valign-top"><div></div></td>
<td class="tableblock halign-left valign-top"><div></div></td>
@@ -2203,7 +2203,7 @@ How to expose information from underlying domain entities referenced by a <a hre
<tr>
<td class="tableblock halign-left valign-top"><div><div class="paragraph">
<p><a href="https://www.youtube.com/watch?v=TMMeVhRNi8A" target="_blank">055</a><br>
-Adding an action to a <a href="ugbtb.html#_ugbtb_view-models_jaxb">(JAXB) view model</a>, and adjusting the layout using custom CSS.</p>
+Adding an action to a <a href="guides/ugbtb.html#_ugbtb_view-models_jaxb">(JAXB) view model</a>, and adjusting the layout using custom CSS.</p>
</div></div></td>
<td class="tableblock halign-left valign-top"><div></div></td>
<td class="tableblock halign-left valign-top"><div></div></td>
@@ -2277,7 +2277,7 @@ The (very simple) steps required to rename a domain entity class.</p>
<tr>
<td class="tableblock halign-left valign-top"><div><div class="paragraph">
<p><a href="https://www.youtube.com/watch?v=J5xobU6X0ng" target="_blank">057</a><br>
-How to rename a menu (on the top-level menubar) as rendered in the <a href="#ugvw.adoc">Wicket viewer</a>.</p>
+How to rename a menu (on the top-level menubar) as rendered in the <a href="#guides/ugvw.adoc">Wicket viewer</a>.</p>
</div></div></td>
<td class="tableblock halign-left valign-top"><div><div class="paragraph">
<p>x</p>
@@ -2295,7 +2295,7 @@ How to rename a menu (on the top-level menubar) as rendered in the <a href="#ugv
<tr>
<td class="tableblock halign-left valign-top"><div><div class="paragraph">
<p><a href="https://www.youtube.com/watch?v=mgHqRxQrp28" target="_blank">058</a><br>
-How to rename various elements (collections, title) of the <a href="rgant.html#_rgant-HomePage">home page</a> view model,
+How to rename various elements (collections, title) of the <a href="guides/rgant.html#_rgant-HomePage">home page</a> view model,
for an improved initial page.</p>
</div></div></td>
<td class="tableblock halign-left valign-top"><div></div></td>
[3/7] isis-site git commit: internal services introduced in 1.13.0
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/c5f2b2e1/content/guides/ugfun.html
----------------------------------------------------------------------
diff --git a/content/guides/ugfun.html b/content/guides/ugfun.html
index 741170f..5ea7844 100644
--- a/content/guides/ugfun.html
+++ b/content/guides/ugfun.html
@@ -1811,9 +1811,6 @@ implementation.</p>
<p><a href="rgsvc.html#_rgsvc_spi_CommandService"><code>CommandService</code></a> (SPI)</p>
</li>
<li>
-<p><a href="rgsvc.html#_rgsvc_spi_CommandMementoService"><code>CommandMementoService</code></a> (SPI)</p>
-</li>
-<li>
<p><a href="rgsvc.html#_rgsvc_api_InteractionContext"><code>InteractionContext</code></a> (SPI)</p>
</li>
<li>
[7/7] isis-site git commit: internal services introduced in 1.13.0
Posted by da...@apache.org.
internal services introduced in 1.13.0
Project: http://git-wip-us.apache.org/repos/asf/isis-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis-site/commit/c5f2b2e1
Tree: http://git-wip-us.apache.org/repos/asf/isis-site/tree/c5f2b2e1
Diff: http://git-wip-us.apache.org/repos/asf/isis-site/diff/c5f2b2e1
Branch: refs/heads/asf-site
Commit: c5f2b2e1407420b345e510d2c1d95ceb688715ac
Parents: 2c032b2
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Tue Jul 12 23:51:58 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Tue Jul 12 23:51:58 2016 +0100
----------------------------------------------------------------------
content/guides/cgcom.html | 4 +-
content/guides/cgcom.pdf | 12 +-
content/guides/rgfis.html | 433 +-
content/guides/rgfis.pdf | 22866 +++++++++++++++++++---------
content/guides/rgsvc.html | 403 +-
content/guides/rgsvc.pdf | 29174 +++++++++++++++++++-----------------
content/guides/ugfun.html | 3 -
content/guides/ugfun.pdf | 6477 ++++----
content/migration-notes.html | 14 +-
content/screencasts.html | 100 +-
10 files changed, 35293 insertions(+), 24193 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis-site/blob/c5f2b2e1/content/guides/cgcom.html
----------------------------------------------------------------------
diff --git a/content/guides/cgcom.html b/content/guides/cgcom.html
index 53ac8c0..34193a7 100644
--- a/content/guides/cgcom.html
+++ b/content/guides/cgcom.html
@@ -2309,8 +2309,8 @@ Enjoy!
<pre class="CodeRay highlight"><code data-lang="bash">git checkout master # update master with latest
git pull
git merge release-1.14.0-RC1 # merge branch onto master
-git branch -d release-1.14.0-RC1 # branch no longer needed
-git push origin --delete release-1.14.0-RC1 # remote branch no longer needed</code></pre>
+git push origin --delete release-1.14.0-RC1 # remote branch no longer needed
+git branch -d release-1.14.0-RC1 # branch no longer needed</code></pre>
</div>
</div>
<div class="paragraph">
http://git-wip-us.apache.org/repos/asf/isis-site/blob/c5f2b2e1/content/guides/cgcom.pdf
----------------------------------------------------------------------
diff --git a/content/guides/cgcom.pdf b/content/guides/cgcom.pdf
index 3b46f4d..6b96e1c 100644
--- a/content/guides/cgcom.pdf
+++ b/content/guides/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:20160712063803+01'00')
-/ModDate (D:20160712063803+01'00')
+/CreationDate (D:20160712234406+01'00')
+/ModDate (D:20160712234406+01'00')
>>
endobj
2 0 obj
@@ -33753,7 +33753,7 @@ ET
BT
59.24 738.845 Td
/F3.0 11 Tf
-<676974206272616e6368202d642072656c656173652d312e31342e302d5243312020202020202020202020202020> Tj
+<6769742070757368206f726967696e202d2d64656c6574652072656c656173652d312e31342e302d524331202020> Tj
ET
0.000 0.000 0.000 SCN
@@ -33764,7 +33764,7 @@ ET
BT
312.23999999999995 738.845 Td
/F3.0 11 Tf
-<23206272616e6368206e6f206c6f6e676572206e6565646564> Tj
+<232072656d6f7465206272616e6368206e6f206c6f6e676572206e6565646564> Tj
ET
0.000 0.000 0.000 SCN
@@ -33775,7 +33775,7 @@ ET
BT
59.24 724.105 Td
/F3.0 11 Tf
-<6769742070757368206f726967696e202d2d64656c6574652072656c656173652d312e31342e302d524331202020> Tj
+<676974206272616e6368202d642072656c656173652d312e31342e302d5243312020202020202020202020202020> Tj
ET
0.000 0.000 0.000 SCN
@@ -33786,7 +33786,7 @@ ET
BT
312.23999999999995 724.105 Td
/F3.0 11 Tf
-<232072656d6f7465206272616e6368206e6f206c6f6e676572206e6565646564> Tj
+<23206272616e6368206e6f206c6f6e676572206e6565646564> Tj
ET
0.000 0.000 0.000 SCN
http://git-wip-us.apache.org/repos/asf/isis-site/blob/c5f2b2e1/content/guides/rgfis.html
----------------------------------------------------------------------
diff --git a/content/guides/rgfis.html b/content/guides/rgfis.html
index e485d4f..faf78d6 100644
--- a/content/guides/rgfis.html
+++ b/content/guides/rgfis.html
@@ -703,10 +703,10 @@ Impl’n (g: a:)</th>
<p>The <code>ContentNegotiationService</code> is responsible for inspecting the HTTP <code>Accept</code> header, and use this to select the correct representation to render. <br></p>
</div>
<div class="paragraph">
-<p>The Apache Isis framework provides a default implementation of <code>ContentNegotiationService</code> which inspects the "x-ro-domaintype" component of the HTTP <code>Accept</code> header. If present, this implementation will delegate to the companion <a href="rgsvc.html#_rgsvc_spi_ContentMappingService"><code>ContentMappingService</code></a> service, if configured. <br></p>
+<p>The Apache Isis framework provides three implementations of <code>ContentNegotiationService</code> which inspects different elements of the HTTP <code>Accept</code> header. One of these implementations, <code>ContentNegotiationServiceXRoDomainType</code> will further delegate down to the companion <a href="rgsvc.html#_rgsvc_spi_ContentMappingService"><code>ContentMappingService</code></a> service (if configured/available), based on the value of the "x-ro-domain-type" parameter of the header.<br></p>
</div>
<div class="paragraph">
-<p>A typical implementation of <code>ContentMappingService</code> will convert the domain object into some sort of DTO (data transfer object) as specified by the "x-ro-domaintype". If this DTO is annotated with JAXB or Jackson mappings, then the RO viewer (courtesy of the underlying <a href="http://resteasy.jboss.org/">RestEasy</a> framework) can serialize these directly <br></p>
+<p>A typical implementation of <code>ContentMappingService</code> will convert the domain object into some sort of DTO (data transfer object) as specified by the "x-ro-domaintype". If this DTO is annotated with JAXB or Jackson mappings, then the RO viewer (courtesy of the underlying <a href="http://resteasy.jboss.org/">RestEasy</a> framework) can serialize these directly.<br></p>
</div>
<div class="paragraph">
<p>What all that means is that, if the underlying entities change, we are required to update the mappings in the <code>ContentMappingService</code> to map to the same DTOs.</p>
@@ -730,23 +730,18 @@ Impl’n (g: a:)</th>
<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">ContentNegotiationService</span> {
- <span class="annotation">@Programmatic</span>
Response.ResponseBuilder buildResponse( <i class="conum" data-value="1"></i><b>(1)</b>
RepresentationService.Context2 renderContext2,
ObjectAdapter objectAdapter);
- <span class="annotation">@Programmatic</span>
Response.ResponseBuilder buildResponse( <i class="conum" data-value="2"></i><b>(2)</b>
RepresentationService.Context2 renderContext2,
ObjectAndProperty objectAndProperty);
- <span class="annotation">@Programmatic</span>
Response.ResponseBuilder buildResponse( <i class="conum" data-value="3"></i><b>(3)</b>
RepresentationService.Context2 renderContext2,
ObjectAndCollection objectAndCollection);
- <span class="annotation">@Programmatic</span>
Response.ResponseBuilder buildResponse( <i class="conum" data-value="4"></i><b>(4)</b>
RepresentationService.Context2 renderContext2,
ObjectAndAction objectAndAction);
- <span class="annotation">@Programmatic</span>
Response.ResponseBuilder buildResponse( <i class="conum" data-value="5"></i><b>(5)</b>
RepresentationService.Context2 renderContext2,
ObjectAndActionInvocation objectAndActionInvocation);
@@ -818,7 +813,7 @@ Impl’n (g: a:)</th>
</div>
</div>
<div class="paragraph">
-<p>As discussed in the introduction, the framework also provides a default implementation, <code>o.a.i.v.ro.rendering.service.conneg.ContentNegotiationServiceXRoDomainType</code>. This handles content negotiation for two of the possible representations, object representations and for action result representations:</p>
+<p>As discussed in the introduction, the framework also provides three implementation of this service, one of which is <code>o.a.i.v.ro.rendering.service.conneg.ContentNegotiationServiceXRoDomainType</code>. This implementation handles content negotiation for two of the possible representations, object representations and for action result representations:</p>
</div>
<div class="ulist">
<ul>
@@ -856,6 +851,25 @@ Impl’n (g: a:)</th>
<div class="paragraph">
<p>If the DTO is annotated with JAXB, then also note that the runtime type must be annotated with the JAXB <code>javax.xml.bind.annotation.XmlRootElement</code> so that RestEasy is able to unambiguously serialize it.</p>
</div>
+<div class="paragraph">
+<p>The other two implementations of <code>ContentNegotiationService</code> are:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p><code>ContentNegotiationServiceForRestfulObjectsV1_0</code><br></p>
+<div class="paragraph">
+<p>which returns representations according to the <a href="http://restfulobjects.org">Restful Objects</a> spec</p>
+</div>
+</li>
+<li>
+<p><code>ContentNegotiationServiceOrgApacheIsisV1</code><br></p>
+<div class="paragraph">
+<p>which returns <a href="ugvro.html#_ugvro_simplified-representations">simplified representations</a></p>
+</div>
+</li>
+</ul>
+</div>
</div>
<div class="sect3">
<h4 id="_usage">2.1.3. Usage</h4>
@@ -925,7 +939,7 @@ Impl’n (g: a:)</th>
<div class="paragraph">
<p>Assuming that the <code>configuration-and-annotation</code> services installer is configured (implicit if using the
<code>AppManifest</code> to <a href="rgcms.html#_rgcms_classes_AppManifest-bootstrapping">bootstrap the app</a>) then Apache Isis' default
-implementation of <code>ContentNegotiationService</code> service is automatically registered and injected (it is annotated with
+implementations of <code>ContentNegotiationService</code> service are automatically registered and injected (it is annotated with
<code>@DomainService</code>) so no further configuration is required.</p>
</div>
<div class="paragraph">
@@ -974,25 +988,20 @@ in the <a href="rgsvc.html#_rgsvc_intro_overriding-the-services">introduction</a
<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">RepresentationService</span> {
- <span class="annotation">@Programmatic</span>
Response objectRepresentation( <i class="conum" data-value="1"></i><b>(1)</b>
<span class="predefined-type">Context</span> rendererContext,
ObjectAdapter objectAdapter);
- <span class="annotation">@Programmatic</span>
Response propertyDetails( <i class="conum" data-value="2"></i><b>(2)</b>
<span class="predefined-type">Context</span> rendererContext,
ObjectAndProperty objectAndProperty,
MemberReprMode memberReprMode);
- <span class="annotation">@Programmatic</span>
Response collectionDetails( <i class="conum" data-value="3"></i><b>(3)</b>
<span class="predefined-type">Context</span> rendererContext,
ObjectAndCollection objectAndCollection,
MemberReprMode memberReprMode);
- <span class="annotation">@Programmatic</span>
Response actionPrompt( <i class="conum" data-value="4"></i><b>(4)</b>
<span class="predefined-type">Context</span> rendererContext,
ObjectAndAction objectAndAction);
- <span class="annotation">@Programmatic</span>
Response actionResult( <i class="conum" data-value="5"></i><b>(5)</b>
<span class="predefined-type">Context</span> rendererContext,
ObjectAndActionInvocation objectAndActionInvocation,
@@ -1053,7 +1062,7 @@ in the <a href="rgsvc.html#_rgsvc_intro_overriding-the-services">introduction</a
<div class="sect3">
<h4 id="_implementation_2">2.2.2. Implementation</h4>
<div class="paragraph">
-<p>As discussed in the introduction, the framework provides a default implementation, <code>o.a.i.v.ro.rendering.service.RepresentationServiceForRestfulObjects</code>. This delegates to <a href="#_rgfis_spi_ContentNegotiationService"><code>ContentNegotiationService</code></a> to generate an alternative representation; but if none is provided then it falls back on generating the representations as defined in the <a href="http://restfulobjects.org">Restful Objects spec</a> v1.0.</p>
+<p>As discussed in the introduction, the framework provides a default implementation, <code>o.a.i.v.ro.rendering.service.RepresentationServiceContentNegotiator</code>. This delegates to <a href="#_rgfis_spi_ContentNegotiationService"><code>ContentNegotiationService</code></a> to generate an alternative representation; but if none is provided then it falls back on generating the representations as defined in the <a href="http://restfulobjects.org">Restful Objects spec</a> v1.0.</p>
</div>
<div class="paragraph">
<p>To use an alternative implementation, use
@@ -1107,6 +1116,18 @@ Impl’n (g: a:)</th>
</thead>
<tbody>
<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgfis_spi_AuthenticationSessionProvider"><code>o.a.i.core.commons.</code><br>
+<code>authentication.</code><br>
+<code>AuthenticationSessionProvider</code></a></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Simply responsible for obtaining the current <code>AuthenticationSession</code> (the framework’s internal representation of the currently logged-in user).</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>AuthenticationSession-</code><br>
+<code>ProviderDefault</code><br>
+<code>isis-core-runtime</code></p></td>
+<td class="tableblock halign-left valign-top"><div><div class="paragraph">
+<p>Default implementation looks up from <code>IsisSessionFactory</code> singleton’s thread-local</p>
+</div></div></td>
+</tr>
+<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgfis_spi_CommandDtoServiceInternal"><code>o.a.i.c.m.s.command</code><br>
<code>CommandDtoServiceInternal</code></a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">Creates memento of current action invocation, for use as a serializable XML reified command. The
@@ -1115,17 +1136,26 @@ most notable usage of this is to allow the execution of the <code>Command</code>
<a href="rgant.html#_rgant-Property_command"><code>@Property#commandExecuteIn()</code></a>.</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>CommandDtoService-</code><br>
<code>InternalServiceDefault</code><br>
-<code>o.a.i.c.r.s.command</code><br>
<code>isis-core-runtime</code></p></td>
<td class="tableblock halign-left valign-top"><div></div></td>
</tr>
<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgfis_spi_MessageBrokerServiceInternal"><code>o.a.i.c.m.s.msgbroker</code><br>
+<code>MessageBrokerServiceInternal</code></a></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">A wrapper around <a href="rgsvc.html#_rgsvc_api_MessageService"><code>MessageService</code></a>.</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">MessageBrokerService-`<br>
+<code>InternalDefault</code><br>
+<code>isis-core-runtime</code></p></td>
+<td class="tableblock halign-left valign-top"><div><div class="paragraph">
+<p>This service does not provide any additional capabilities over <code>MessageService</code>, and will (most likely) be conflated with that service in the future.</p>
+</div></div></td>
+</tr>
+<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgfis_spi_InteractionDtoServiceInternal"><code>o.a.i.c.m.s.ixn</code><br>
<code>InteractionDtoServiceInternal</code></a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">Creates DTO for the current execution of an action invocation or property edit, for use either as a reified command or for implementations of the <a href="rgsvc.html#_rgsvc_spi_PublishingService"><code>PublishingService</code></a>.</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>CommandDtoService-</code><br>
<code>InternalServiceDefault</code><br>
-<code>o.a.i.c.m.s.command</code><br>
<code>isis-core-metamodel</code></p></td>
<td class="tableblock halign-left valign-top"><div></div></td>
</tr>
@@ -1151,7 +1181,35 @@ most notable usage of this is to allow the execution of the <code>Command</code>
</ul>
</div>
<div class="sect2">
-<h3 id="_rgfis_spi_CommandDtoServiceInternal">3.1. <code>CommandDtoServiceInternal</code></h3>
+<h3 id="_rgfis_spi_AuthenticationSessionProvider">3.1. <code>AuthenticationSessionProvider</code></h3>
+<div class="paragraph">
+<p>The (internal) <code>AuthenticationSessionProvider</code> domain service is simply responsible for obtaining the <code>AuthenticationSession</code> (being the framework’s internal representation of the currently logged in user).</p>
+</div>
+<div class="sect3">
+<h4 id="_spi_and_implementation">3.1.1. SPI and Implementation</h4>
+<div class="paragraph">
+<p>The SPI of the service 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">AuthenticationSessionProvider</span> {
+ AuthenticationSession getAuthenticationSession();
+}</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>The framework provides a default implementation of the service, <code>AuthenticationSessionProviderDefault</code>, which looks up
+the current <code>AuthenticationSession</code> from <code>IsisSessionFactory</code> singleton service:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="CodeRay highlight"><code data-lang="java">isisSessionFactory.getCurrentSession().getAuthenticationSession();</code></pre>
+</div>
+</div>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_rgfis_spi_CommandDtoServiceInternal">3.2. <code>CommandDtoServiceInternal</code></h3>
<div class="paragraph">
<p>The <code>CommandDtoServiceInternal</code> is responsible for creating an memento of the current action
invocation or property edit, to store in the <code>Command</code> object (from
@@ -1160,7 +1218,7 @@ invocation or property edit, to store in the <code>Command</code> object (from
as a <a href="rgsvc.html#_rgsvc_spi_BackgroundCommandService">background command</a>.</p>
</div>
<div class="sect3">
-<h4 id="_spi_implementation">3.1.1. SPI & Implementation</h4>
+<h4 id="_spi_implementation">3.2.1. SPI & Implementation</h4>
<div class="paragraph">
<p>The SPI of the service is:</p>
</div>
@@ -1222,7 +1280,7 @@ targets, for symmetry with actions).</td>
</div>
</div>
<div class="sect3">
-<h4 id="_related_services_3">3.1.2. Related Services</h4>
+<h4 id="_related_services_3">3.2.2. Related Services</h4>
<div class="paragraph">
<p>The design of this service is similar to that of
<a href="#_rgfis_spi_InteractionDtoServiceInternal"><code>InteractionDtoServiceInternal</code></a>, used to create the
@@ -1231,12 +1289,68 @@ targets, for symmetry with actions).</td>
</div>
</div>
<div class="sect2">
-<h3 id="_rgfis_spi_InteractionDtoServiceInternal">3.2. <code>InteractionDtoServiceInternal</code></h3>
+<h3 id="_rgfis_spi_MessageBrokerServiceInternal">3.3. <code>MessageBrokerServiceInternal</code></h3>
+<div class="paragraph">
+<p>The (internal) <code>MessageBrokerServiceInternal</code> domain service is a wrapper around
+<a href="rgsvc.html#_rgsvc_api_MessageService"><code>MessageService</code></a>.</p>
+</div>
+<div class="admonitionblock note">
+<table>
+<tr>
+<td class="icon">
+<i class="fa icon-note" title="Note"></i>
+</td>
+<td class="content">
+<div class="paragraph">
+<p>The service does not provide any additional capabilities over and those of <code>MessageService</code>, and will (most likely) be
+conflated with that service in the future.</p>
+</div>
+</td>
+</tr>
+</table>
+</div>
+<div class="sect3">
+<h4 id="_spi_3">3.3.1. SPI</h4>
+<div class="paragraph">
+<p>The SPI of the service 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">MessageBrokerServiceInternal</span> {
+ <span class="type">void</span> informUser(<span class="predefined-type">String</span> message);
+ <span class="type">void</span> warnUser(<span class="predefined-type">String</span> message);
+ <span class="type">void</span> raiseError(<span class="predefined-type">String</span> message);
+}</code></pre>
+</div>
+</div>
+</div>
+<div class="sect3">
+<h4 id="_runtime_vs_noop_implementation">3.3.2. Runtime vs Noop implementation</h4>
+<div class="paragraph">
+<p>The framework provides two implementations:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p><code>MessageBrokerServiceInternalDefault</code> is provided by <code>isis-core-runtime</code>, and is used during normal use and integration tests</p>
+</li>
+<li>
+<p><code>MessageBrokerServiceInternalNoop</code> is provided as a fallback by <code>isis-core-metamodel</code>, and is provided to allow the <a href="#rgmvn.adoc">maven plugin</a> to be bootstrapped without any "backend" database.</p>
+</li>
+</ul>
+</div>
+<div class="paragraph">
+<p>The <code>…​Default</code> implementation takes priority over the <code>…​Noop</code> implementation.</p>
+</div>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_rgfis_spi_InteractionDtoServiceInternal">3.4. <code>InteractionDtoServiceInternal</code></h3>
<div class="paragraph">
<p>The <code>InteractionDtoServiceInternal</code> internal domain service is used by the framework to create and update DTOs representing member executions, ie the invocation of an action or the editing of a property. The DTO is in all cases a subclass of <code>MemberExecutionDto</code>, from the <a href="rgcms.html#_rgcms_schema-ixn">"ixn" schema</a>, and subsequently accessible from the <code>Interaction</code> object (per the <a href="rgsvc.html#_rgsvc_api_InteractionContext"><code>InteractionContext</code></a> service).</p>
</div>
<div class="sect3">
-<h4 id="_spi_implementation_2">3.2.1. SPI & Implementation</h4>
+<h4 id="_spi_implementation_2">3.4.1. SPI & Implementation</h4>
<div class="paragraph">
<p>The SPI of the service is:</p>
</div>
@@ -1279,7 +1393,7 @@ targets, for symmetry with actions).</td>
</div>
</div>
<div class="sect3">
-<h4 id="_related_services_4">3.2.2. Related Services</h4>
+<h4 id="_related_services_4">3.4.2. Related Services</h4>
<div class="paragraph">
<p>The design of this service is similar to that of
<a href="#_rgfis_spi_CommandDtoServiceInternal"><code>CommandDtoServiceInternal</code></a>, used to create the <code>CommandDto</code>
@@ -1335,6 +1449,17 @@ Impl’n (g: a:)</th>
<td class="tableblock halign-left valign-top"><div></div></td>
</tr>
<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgfis_spi_PersistenceSessionServiceInternal"><code>o.a.i.c.m.s.</code><br>
+<code>persistsession.</code><br>
+<code>PersistenceSessionServiceInternal</code></a></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Acts as a facade to the underlying JDO persistence session / database connection. As such it provides methods for
+querying and for persisting objects.</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>PersistenceSessionService-</code><br>
+<code>InternalDefault</code><br>
+<code>isis-core-runtime</code></p></td>
+<td class="tableblock halign-left valign-top"><div></div></td>
+</tr>
+<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgfis_spi_PublishingServiceInternal"><code>o.a.i.c.m.s.publishing.</code><br>
<code>PublishingServiceInternal</code></a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">Co-ordinates between
@@ -1344,7 +1469,16 @@ Impl’n (g: a:)</th>
<a href="rgsvc.html#_rgsvc_spi_PublishingService"><code>PublishingService</code></a>.</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>PublishingService-</code><br>
<code>InternalDefault</code><br>
-<code>o.a.i.c.r.publishing</code><br>
+<code>isis-core-runtime</code></p></td>
+<td class="tableblock halign-left valign-top"><div></div></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgfis_spi_TransactionStateProviderInternal"><code>o.a.i.c.m.s.</code><br>
+<code>transtate.</code><br>
+<code>TransactionStateProviderInternal</code></a></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Simply provides the ability to check as to the state of the current transaction.</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>TransactionStateProvider-</code><br>
+<code>InternalDefault</code><br>
<code>isis-core-runtime</code></p></td>
<td class="tableblock halign-left valign-top"><div></div></td>
</tr>
@@ -1394,7 +1528,7 @@ create audit entries of those changes.</p>
</table>
</div>
<div class="sect3">
-<h4 id="_spi_and_implementation">4.1.1. SPI and Implementation</h4>
+<h4 id="_spi_and_implementation_2">4.1.1. SPI and Implementation</h4>
<div class="paragraph">
<p>The SPI of the service is:</p>
</div>
@@ -1453,7 +1587,7 @@ various other (internal) domain services, notably
<a href="#_rgfis_spi_PublishingServiceInternal"><code>PublishingServiceInternal</code></a>.</p>
</div>
<div class="sect3">
-<h4 id="_spi_and_implementation_2">4.2.1. SPI and Implementation</h4>
+<h4 id="_spi_and_implementation_3">4.2.1. SPI and Implementation</h4>
<div class="paragraph">
<p>The SPI of the service is:</p>
</div>
@@ -1531,7 +1665,145 @@ this object.</p>
</div>
</div>
<div class="sect2">
-<h3 id="_rgfis_spi_PublishingServiceInternal">4.3. <code>PublishingServiceInternal</code></h3>
+<h3 id="_rgfis_spi_PersistenceSessionServiceInternal">4.3. <code>PersistenceSessionServiceInternal</code></h3>
+<div class="paragraph">
+<p>The (internal) <code>PersistenceSessionServiceInternal</code> domain service acts as a facade to the underlying JDO persistence session / database connection. As such it provides methods for querying and for persisting objects.</p>
+</div>
+<div class="admonitionblock note">
+<table>
+<tr>
+<td class="icon">
+<i class="fa icon-note" title="Note"></i>
+</td>
+<td class="content">
+<div class="paragraph">
+<p>The default implementation of this service is not (as of <code>1.13.0</code>) request-scoped, however all of the methods delegate
+to the <code>PersistenceSession</code> of the current <code>IsisSession</code> - obtained from the thread-local of <code>IsisSessionFactory</code> singleton service.
+So, in effect the service does act as if it is request scoped.</p>
+</div>
+</td>
+</tr>
+</table>
+</div>
+<div class="sect3">
+<h4 id="_spi_4">4.3.1. SPI</h4>
+<div class="paragraph">
+<p>The SPI of the service is a hierarchy of types. First is <code>AdapterManagerBase</code>:</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">AdapterManagerBase</span> {
+ ObjectAdapter getAdapterFor(<span class="predefined-type">Object</span> pojo); <i class="conum" data-value="1"></i><b>(1)</b>
+ ObjectAdapter adapterFor(<span class="predefined-type">Object</span> domainObject); <i class="conum" data-value="2"></i><b>(2)</b></code></pre>
+</div>
+</div>
+<div class="colist arabic">
+<table>
+<tr>
+<td><i class="conum" data-value="1"></i><b>1</b></td>
+<td>Gets the <code>ObjectAdapter</code> for the specified domain object if it exists in the identity map, else returns <code>null</code>.</td>
+</tr>
+<tr>
+<td><i class="conum" data-value="2"></i><b>2</b></td>
+<td>Looks up or creates a standalone (value) or root adapter.</td>
+</tr>
+</table>
+</div>
+<div class="paragraph">
+<p>The <code>AdapterManager</code> is the immediate subtype:</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">AdapterManager</span> <span class="directive">extends</span> AdapterManagerBase {
+ ObjectAdapter getAdapterFor(<span class="predefined-type">Object</span> pojo); <i class="conum" data-value="1"></i><b>(1)</b>
+ ObjectAdapter adapterFor( <i class="conum" data-value="2"></i><b>(2)</b>
+ <span class="predefined-type">Object</span> pojo, ObjectAdapter parentAdapter,
+ OneToManyAssociation collection);
+ ObjectAdapter mapRecreatedPojo(Oid oid, <span class="predefined-type">Object</span> recreatedPojo); <i class="conum" data-value="3"></i><b>(3)</b>
+ <span class="type">void</span> removeAdapter(ObjectAdapter adapter); <i class="conum" data-value="4"></i><b>(4)</b>
+}</code></pre>
+</div>
+</div>
+<div class="colist arabic">
+<table>
+<tr>
+<td><i class="conum" data-value="1"></i><b>1</b></td>
+<td>Gets the <code>ObjectAdapter</code> for the <code>Oid</code> if it exists in the identity map.</td>
+</tr>
+<tr>
+<td><i class="conum" data-value="2"></i><b>2</b></td>
+<td>Looks up or creates a collection adapter.</td>
+</tr>
+<tr>
+<td><i class="conum" data-value="3"></i><b>3</b></td>
+<td>Enable RecreatableObjectFacet to 'temporarily' map an existing pojo to an oid.</td>
+</tr>
+<tr>
+<td><i class="conum" data-value="4"></i><b>4</b></td>
+<td>Enable RecreatableObjectFacet to remove a 'temporarily' mapped an adapter for a pojo.</td>
+</tr>
+</table>
+</div>
+<div class="paragraph">
+<p>Finally, <code>PersistenceSessionServiceInternal</code> is a subtype of <code>AdapterManager</code>:</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">PersistenceSessionServiceInternal</span> <span class="directive">extends</span> AdapterManager {
+
+ <span class="comment">// instantiate</span>
+ ObjectAdapter createTransientInstance(
+ ObjectSpecification spec);
+ ObjectAdapter createViewModelInstance(
+ ObjectSpecification spec, <span class="predefined-type">String</span> memento);
+
+ <span class="comment">// retrieve</span>
+ <span class="type">void</span> resolve(<span class="predefined-type">Object</span> parent);
+ <span class="annotation">@Deprecated</span>
+ <span class="type">void</span> resolve(<span class="predefined-type">Object</span> parent, <span class="predefined-type">Object</span> field);
+ <span class="predefined-type">Object</span> lookup(Bookmark bookmark, <span class="directive">final</span> BookmarkService2.FieldResetPolicy fieldResetPolicy);
+ Bookmark bookmarkFor(<span class="predefined-type">Object</span> domainObject);
+ Bookmark bookmarkFor(<span class="predefined-type">Class</span><?> cls, <span class="predefined-type">String</span> identifier);
+
+ <span class="comment">// beginTran, flush, commit, currentTransaction</span>
+ <span class="type">void</span> beginTran();
+ <span class="type">boolean</span> flush();
+ <span class="type">void</span> commit();
+ Transaction currentTransaction();
+ <span class="type">void</span> executeWithinTransaction(TransactionalClosure transactionalClosure);
+
+ <span class="comment">// makePersistent, remove</span>
+ <span class="type">void</span> makePersistent(ObjectAdapter adapter);
+ <span class="type">void</span> remove(ObjectAdapter adapter);
+ <span class="comment">// allMatchingQuery, firstMatchingQuery</span>
+ <T> <span class="predefined-type">List</span><ObjectAdapter> allMatchingQuery(<span class="predefined-type">Query</span><T> query);
+ <T> ObjectAdapter firstMatchingQuery(<span class="predefined-type">Query</span><T> query);
+}</code></pre>
+</div>
+</div>
+</div>
+<div class="sect3">
+<h4 id="_runtime_vs_noop_implementation_2">4.3.2. Runtime vs Noop implementation</h4>
+<div class="paragraph">
+<p>The framework provides two implementations:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p><code>PersistenceSessionServiceInternalDefault</code> is provided by <code>isis-core-runtime</code>, and is used during normal use and integration tests</p>
+</li>
+<li>
+<p><code>PersistenceSessionServiceInternalNoop</code> is provided as a fallback by <code>isis-core-metamodel</code>, and is provided to allow the <a href="#rgmvn.adoc">maven plugin</a> to be bootstrapped without any "backend" database.</p>
+</li>
+</ul>
+</div>
+<div class="paragraph">
+<p>The <code>…​Default</code> implementation takes priority over the <code>…​Noop</code> implementation.</p>
+</div>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_rgfis_spi_PublishingServiceInternal">4.4. <code>PublishingServiceInternal</code></h3>
<div class="paragraph">
<p>The (internal) <code>PublishingServiceInternal</code> domain service acts as an internal facade to any
configured <a href="rgsvc.html#_rgsvc_spi_PublisherService"><code>PublisherService</code></a> or (deprecated)
@@ -1548,7 +1820,7 @@ those objects that are to be published; these are then passed through to any con
<code>PublishingService</code> implementations.</p>
</div>
<div class="sect3">
-<h4 id="_spi_and_implementation_3">4.3.1. SPI and Implementation</h4>
+<h4 id="_spi_and_implementation_4">4.4.1. SPI and Implementation</h4>
<div class="paragraph">
<p>The SPI of the service is:</p>
</div>
@@ -1601,7 +1873,7 @@ of <code>PropertyEdit</code> (see <a href="rgsvc.html#_rgsvc_api_InteractionCont
</div>
</div>
<div class="sect3">
-<h4 id="_registering_the_service_3">4.3.2. Registering the Service</h4>
+<h4 id="_registering_the_service_3">4.4.2. Registering the Service</h4>
<div class="paragraph">
<p>Assuming that the <code>configuration-and-annotation</code> services installer is configured (implicit if using the
<code>AppManifest</code> to <a href="rgcms.html#_rgcms_classes_AppManifest-bootstrapping">bootstrap the app</a>) then Apache Isis' default
@@ -1610,7 +1882,7 @@ so no further configuration is required.</p>
</div>
</div>
<div class="sect3">
-<h4 id="_related_classes_3">4.3.3. Related Classes</h4>
+<h4 id="_related_classes_3">4.4.3. Related Classes</h4>
<div class="paragraph">
<p>The service delegates between the (internal)
<a href="#_rgfis_spi_ChangedObjectsServiceInternal"><code>ChangedObjectsServiceInternal</code></a> domain service to the
@@ -1624,6 +1896,60 @@ changed objects from <code>ChangedObjectsServiceInternal</code>.</p>
</div>
</div>
</div>
+<div class="sect2">
+<h3 id="_rgfis_spi_TransactionStateProviderInternal">4.5. <code>TransactionStateProviderInternal</code></h3>
+<div class="paragraph">
+<p>The (internal) <code>TransactionStateProviderInternal</code> domain service simply provides the ability to check as to the
+state of the current transaction.</p>
+</div>
+<div class="admonitionblock note">
+<table>
+<tr>
+<td class="icon">
+<i class="fa icon-note" title="Note"></i>
+</td>
+<td class="content">
+<div class="paragraph">
+<p>The service will probably be combined with <a href="rgsvc.html#_rgsvc_api_TransactionService"><code>TransactionService</code></a>
+in the future.</p>
+</div>
+</td>
+</tr>
+</table>
+</div>
+<div class="sect3">
+<h4 id="_spi_and_implementation_5">4.5.1. SPI and Implementation</h4>
+<div class="paragraph">
+<p>The SPI of the service is simply:</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">TransactionStateProviderInternal</span> {
+ TransactionState getTransactionState();
+}</code></pre>
+</div>
+</div>
+</div>
+<div class="sect3">
+<h4 id="_runtime_vs_noop_implementation_3">4.5.2. Runtime vs Noop implementation</h4>
+<div class="paragraph">
+<p>The framework provides two implementations:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p><code>TransactionStateProviderInternalDefault</code> is provided by <code>isis-core-runtime</code>, and is used during normal use and integration tests</p>
+</li>
+<li>
+<p><code>TransactionStateProviderInternalNoop</code> is provided as a fallback by <code>isis-core-metamodel</code>, and is provided to allow the <a href="#rgmvn.adoc">maven plugin</a> to be bootstrapped without any "backend" database.</p>
+</li>
+</ul>
+</div>
+<div class="paragraph">
+<p>The <code>…​Default</code> implementation takes priority over the <code>…​Noop</code> implementation.</p>
+</div>
+</div>
+</div>
</div>
</div>
</div>
@@ -1672,16 +1998,27 @@ changed objects from <code>ChangedObjectsServiceInternal</code>.</p>
</li>
<li><a href="#_rgfis_application-layer">3. Application Layer</a>
<ul class="sectlevel2">
-<li><a href="#_rgfis_spi_CommandDtoServiceInternal">3.1. <code>CommandDtoServiceInternal</code></a>
+<li><a href="#_rgfis_spi_AuthenticationSessionProvider">3.1. <code>AuthenticationSessionProvider</code></a>
+<ul class="sectlevel3">
+<li><a href="#_spi_and_implementation">3.1.1. SPI and Implementation</a></li>
+</ul>
+</li>
+<li><a href="#_rgfis_spi_CommandDtoServiceInternal">3.2. <code>CommandDtoServiceInternal</code></a>
+<ul class="sectlevel3">
+<li><a href="#_spi_implementation">3.2.1. SPI & Implementation</a></li>
+<li><a href="#_related_services_3">3.2.2. Related Services</a></li>
+</ul>
+</li>
+<li><a href="#_rgfis_spi_MessageBrokerServiceInternal">3.3. <code>MessageBrokerServiceInternal</code></a>
<ul class="sectlevel3">
-<li><a href="#_spi_implementation">3.1.1. SPI & Implementation</a></li>
-<li><a href="#_related_services_3">3.1.2. Related Services</a></li>
+<li><a href="#_spi_3">3.3.1. SPI</a></li>
+<li><a href="#_runtime_vs_noop_implementation">3.3.2. Runtime vs Noop implementation</a></li>
</ul>
</li>
-<li><a href="#_rgfis_spi_InteractionDtoServiceInternal">3.2. <code>InteractionDtoServiceInternal</code></a>
+<li><a href="#_rgfis_spi_InteractionDtoServiceInternal">3.4. <code>InteractionDtoServiceInternal</code></a>
<ul class="sectlevel3">
-<li><a href="#_spi_implementation_2">3.2.1. SPI & Implementation</a></li>
-<li><a href="#_related_services_4">3.2.2. Related Services</a></li>
+<li><a href="#_spi_implementation_2">3.4.1. SPI & Implementation</a></li>
+<li><a href="#_related_services_4">3.4.2. Related Services</a></li>
</ul>
</li>
</ul>
@@ -1690,23 +2027,35 @@ changed objects from <code>ChangedObjectsServiceInternal</code>.</p>
<ul class="sectlevel2">
<li><a href="#_rgfis_spi_AuditingServiceInternal">4.1. <code>AuditingServiceInternal</code></a>
<ul class="sectlevel3">
-<li><a href="#_spi_and_implementation">4.1.1. SPI and Implementation</a></li>
+<li><a href="#_spi_and_implementation_2">4.1.1. SPI and Implementation</a></li>
<li><a href="#_registering_the_service">4.1.2. Registering the Service</a></li>
<li><a href="#_related_classes">4.1.3. Related Classes</a></li>
</ul>
</li>
<li><a href="#_rgfis_spi_ChangedObjectsServiceInternal">4.2. <code>ChangedObjectsServiceInternal</code></a>
<ul class="sectlevel3">
-<li><a href="#_spi_and_implementation_2">4.2.1. SPI and Implementation</a></li>
+<li><a href="#_spi_and_implementation_3">4.2.1. SPI and Implementation</a></li>
<li><a href="#_registering_the_service_2">4.2.2. Registering the Service</a></li>
<li><a href="#_related_classes_2">4.2.3. Related Classes</a></li>
</ul>
</li>
-<li><a href="#_rgfis_spi_PublishingServiceInternal">4.3. <code>PublishingServiceInternal</code></a>
+<li><a href="#_rgfis_spi_PersistenceSessionServiceInternal">4.3. <code>PersistenceSessionServiceInternal</code></a>
+<ul class="sectlevel3">
+<li><a href="#_spi_4">4.3.1. SPI</a></li>
+<li><a href="#_runtime_vs_noop_implementation_2">4.3.2. Runtime vs Noop implementation</a></li>
+</ul>
+</li>
+<li><a href="#_rgfis_spi_PublishingServiceInternal">4.4. <code>PublishingServiceInternal</code></a>
+<ul class="sectlevel3">
+<li><a href="#_spi_and_implementation_4">4.4.1. SPI and Implementation</a></li>
+<li><a href="#_registering_the_service_3">4.4.2. Registering the Service</a></li>
+<li><a href="#_related_classes_3">4.4.3. Related Classes</a></li>
+</ul>
+</li>
+<li><a href="#_rgfis_spi_TransactionStateProviderInternal">4.5. <code>TransactionStateProviderInternal</code></a>
<ul class="sectlevel3">
-<li><a href="#_spi_and_implementation_3">4.3.1. SPI and Implementation</a></li>
-<li><a href="#_registering_the_service_3">4.3.2. Registering the Service</a></li>
-<li><a href="#_related_classes_3">4.3.3. Related Classes</a></li>
+<li><a href="#_spi_and_implementation_5">4.5.1. SPI and Implementation</a></li>
+<li><a href="#_runtime_vs_noop_implementation_3">4.5.2. Runtime vs Noop implementation</a></li>
</ul>
</li>
</ul>
[2/7] isis-site git commit: internal services introduced in 1.13.0
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/c5f2b2e1/content/guides/ugfun.pdf
----------------------------------------------------------------------
diff --git a/content/guides/ugfun.pdf b/content/guides/ugfun.pdf
index 536b44e..627c838 100644
--- a/content/guides/ugfun.pdf
+++ b/content/guides/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:20160712064148+01'00')
-/ModDate (D:20160712064148+01'00')
+/CreationDate (D:20160712234852+01'00')
+/ModDate (D:20160712234852+01'00')
>>
endobj
2 0 obj
<< /Type /Catalog
/Pages 3 0 R
/Names 16 0 R
-/Outlines 1127 0 R
-/PageLabels 1172 0 R
+/Outlines 1126 0 R
+/PageLabels 1171 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 119
-/Kids [7 0 R 10 0 R 12 0 R 14 0 R 41 0 R 50 0 R 53 0 R 56 0 R 59 0 R 77 0 R 87 0 R 91 0 R 100 0 R 111 0 R 116 0 R 125 0 R 130 0 R 141 0 R 149 0 R 163 0 R 179 0 R 186 0 R 191 0 R 197 0 R 202 0 R 208 0 R 221 0 R 246 0 R 278 0 R 302 0 R 322 0 R 331 0 R 335 0 R 347 0 R 350 0 R 362 0 R 370 0 R 378 0 R 385 0 R 391 0 R 397 0 R 404 0 R 410 0 R 417 0 R 422 0 R 428 0 R 446 0 R 450 0 R 453 0 R 461 0 R 469 0 R 476 0 R 479 0 R 488 0 R 496 0 R 501 0 R 506 0 R 517 0 R 521 0 R 527 0 R 535 0 R 551 0 R 577 0 R 585 0 R 600 0 R 605 0 R 610 0 R 620 0 R 625 0 R 628 0 R 630 0 R 637 0 R 647 0 R 654 0 R 671 0 R 709 0 R 734 0 R 769 0 R 781 0 R 783 0 R 789 0 R 791 0 R 794 0 R 796 0 R 802 0 R 804 0 R 806 0 R 820 0 R 823 0 R 836 0 R 843 0 R 848 0 R 853 0 R 869 0 R 882 0 R 886 0 R 891 0 R 895 0 R 898 0 R 905 0 R 908 0 R 913 0 R 921 0 R 936 0 R 939 0 R 942 0 R 952 0 R 957 0 R 960 0 R 965 0 R 976 0 R 981 0 R 991 0 R 993 0 R 1004 0 R 1007 0 R 1017 0 R 1023 0 R 1025 0 R]
+/Kids [7 0 R 10 0 R 12 0 R 14 0 R 41 0 R 50 0 R 53 0 R 56 0 R 59 0 R 77 0 R 87 0 R 91 0 R 100 0 R 111 0 R 116 0 R 125 0 R 130 0 R 141 0 R 149 0 R 163 0 R 179 0 R 186 0 R 191 0 R 197 0 R 202 0 R 208 0 R 221 0 R 246 0 R 277 0 R 306 0 R 322 0 R 330 0 R 334 0 R 346 0 R 349 0 R 361 0 R 369 0 R 377 0 R 384 0 R 390 0 R 396 0 R 403 0 R 409 0 R 416 0 R 421 0 R 427 0 R 445 0 R 449 0 R 452 0 R 460 0 R 468 0 R 475 0 R 478 0 R 487 0 R 495 0 R 500 0 R 505 0 R 516 0 R 520 0 R 526 0 R 534 0 R 550 0 R 576 0 R 584 0 R 599 0 R 604 0 R 609 0 R 619 0 R 624 0 R 627 0 R 629 0 R 636 0 R 646 0 R 653 0 R 670 0 R 708 0 R 733 0 R 768 0 R 780 0 R 782 0 R 788 0 R 790 0 R 793 0 R 795 0 R 801 0 R 803 0 R 805 0 R 819 0 R 822 0 R 835 0 R 842 0 R 847 0 R 852 0 R 868 0 R 881 0 R 885 0 R 890 0 R 894 0 R 897 0 R 904 0 R 907 0 R 912 0 R 920 0 R 935 0 R 938 0 R 941 0 R 951 0 R 956 0 R 959 0 R 964 0 R 975 0 R 980 0 R 990 0 R 992 0 R 1003 0 R 1006 0 R 1016 0 R 1022 0 R 1024 0 R]
>>
endobj
4 0 obj
@@ -80,11 +80,11 @@ endobj
<< /Type /Font
/BaseFont /AAAADI+NotoSerif
/Subtype /TrueType
-/FontDescriptor 1174 0 R
+/FontDescriptor 1173 0 R
/FirstChar 32
/LastChar 255
-/Widths 1176 0 R
-/ToUnicode 1175 0 R
+/Widths 1175 0 R
+/ToUnicode 1174 0 R
>>
endobj
9 0 obj
@@ -1639,7 +1639,7 @@ endobj
/F1.0 8 0 R
>>
>>
-/Annots [1042 0 R 1043 0 R 1044 0 R 1045 0 R 1046 0 R 1047 0 R 1048 0 R 1049 0 R 1050 0 R 1051 0 R 1052 0 R 1053 0 R 1054 0 R 1055 0 R 1056 0 R 1057 0 R 1058 0 R 1059 0 R 1060 0 R 1061 0 R 1062 0 R 1063 0 R 1064 0 R 1065 0 R 1066 0 R 1067 0 R 1068 0 R 1069 0 R 1070 0 R 1071 0 R 1072 0 R 1073 0 R 1074 0 R 1075 0 R 1076 0 R 1077 0 R 1078 0 R 1079 0 R 1080 0 R 1081 0 R 1082 0 R 1083 0 R 1084 0 R 1085 0 R 1086 0 R 1087 0 R 1088 0 R 1089 0 R 1090 0 R 1091 0 R 1092 0 R 1093 0 R 1094 0 R 1095 0 R 1096 0 R 1097 0 R 1098 0 R 1099 0 R 1100 0 R 1101 0 R 1102 0 R 1103 0 R 1104 0 R 1105 0 R 1106 0 R 1107 0 R 1108 0 R 1109 0 R 1110 0 R 1111 0 R 1112 0 R 1113 0 R 1114 0 R 1115 0 R 1116 0 R 1117 0 R]
+/Annots [1041 0 R 1042 0 R 1043 0 R 1044 0 R 1045 0 R 1046 0 R 1047 0 R 1048 0 R 1049 0 R 1050 0 R 1051 0 R 1052 0 R 1053 0 R 1054 0 R 1055 0 R 1056 0 R 1057 0 R 1058 0 R 1059 0 R 1060 0 R 1061 0 R 1062 0 R 1063 0 R 1064 0 R 1065 0 R 1066 0 R 1067 0 R 1068 0 R 1069 0 R 1070 0 R 1071 0 R 1072 0 R 1073 0 R 1074 0 R 1075 0 R 1076 0 R 1077 0 R 1078 0 R 1079 0 R 1080 0 R 1081 0 R 1082 0 R 1083 0 R 1084 0 R 1085 0 R 1086 0 R 1087 0 R 1088 0 R 1089 0 R 1090 0 R 1091 0 R 1092 0 R 1093 0 R 1094 0 R 1095 0 R 1096 0 R 1097 0 R 1098 0 R 1099 0 R 1100 0 R 1101 0 R 1102 0 R 1103 0 R 1104 0 R 1105 0 R 1106 0 R 1107 0 R 1108 0 R 1109 0 R 1110 0 R 1111 0 R 1112 0 R 1113 0 R 1114 0 R 1115 0 R 1116 0 R]
>>
endobj
11 0 obj
@@ -1822,7 +1822,7 @@ endobj
/Font << /F1.0 8 0 R
>>
>>
-/Annots [1118 0 R 1119 0 R 1120 0 R 1121 0 R 1122 0 R 1123 0 R 1124 0 R 1125 0 R]
+/Annots [1117 0 R 1118 0 R 1119 0 R 1120 0 R 1121 0 R 1122 0 R 1123 0 R 1124 0 R]
>>
endobj
13 0 obj
@@ -2552,7 +2552,7 @@ endobj
/Font << /F2.0 18 0 R
/F1.0 8 0 R
>>
-/XObject << /Stamp1 1126 0 R
+/XObject << /Stamp1 1125 0 R
>>
>>
/Annots [19 0 R 20 0 R 21 0 R 22 0 R 23 0 R 24 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 39 0 R]
@@ -2567,18 +2567,18 @@ endobj
>>
endobj
17 0 obj
-<< /Kids [119 0 R 299 0 R 120 0 R 504 0 R 568 0 R 715 0 R 195 0 R 561 0 R 692 0 R 342 0 R 787 0 R 542 0 R 910 0 R 474 0 R 682 0 R]
+<< /Kids [119 0 R 298 0 R 120 0 R 503 0 R 567 0 R 714 0 R 195 0 R 560 0 R 691 0 R 341 0 R 786 0 R 541 0 R 909 0 R 473 0 R 681 0 R]
>>
endobj
18 0 obj
<< /Type /Font
/BaseFont /AAAADJ+NotoSerif-Bold
/Subtype /TrueType
-/FontDescriptor 1178 0 R
+/FontDescriptor 1177 0 R
/FirstChar 32
/LastChar 255
-/Widths 1180 0 R
-/ToUnicode 1179 0 R
+/Widths 1179 0 R
+/ToUnicode 1178 0 R
>>
endobj
19 0 obj
@@ -3466,7 +3466,7 @@ endobj
/F3.1 43 0 R
/F4.0 47 0 R
>>
-/XObject << /Stamp1 1126 0 R
+/XObject << /Stamp1 1125 0 R
>>
>>
/Annots [46 0 R]
@@ -3479,11 +3479,11 @@ endobj
<< /Type /Font
/BaseFont /AAAADK+FontAwesome
/Subtype /TrueType
-/FontDescriptor 1182 0 R
+/FontDescriptor 1181 0 R
/FirstChar 32
/LastChar 255
-/Widths 1184 0 R
-/ToUnicode 1183 0 R
+/Widths 1183 0 R
+/ToUnicode 1182 0 R
>>
endobj
44 0 obj
@@ -3507,11 +3507,11 @@ endobj
<< /Type /Font
/BaseFont /AAAADL+NotoSerif-BoldItalic
/Subtype /TrueType
-/FontDescriptor 1186 0 R
+/FontDescriptor 1185 0 R
/FirstChar 32
/LastChar 255
-/Widths 1188 0 R
-/ToUnicode 1187 0 R
+/Widths 1187 0 R
+/ToUnicode 1186 0 R
>>
endobj
48 0 obj
@@ -4234,7 +4234,7 @@ endobj
/F4.0 47 0 R
/F2.0 18 0 R
>>
-/XObject << /Stamp1 1126 0 R
+/XObject << /Stamp1 1125 0 R
>>
>>
>>
@@ -4243,11 +4243,11 @@ endobj
<< /Type /Font
/BaseFont /AAAADM+NotoSerif-Italic
/Subtype /TrueType
-/FontDescriptor 1190 0 R
+/FontDescriptor 1189 0 R
/FirstChar 32
/LastChar 255
-/Widths 1192 0 R
-/ToUnicode 1191 0 R
+/Widths 1191 0 R
+/ToUnicode 1190 0 R
>>
endobj
52 0 obj
@@ -5038,7 +5038,7 @@ endobj
/F2.0 18 0 R
/F5.0 51 0 R
>>
-/XObject << /Stamp1 1126 0 R
+/XObject << /Stamp1 1125 0 R
>>
>>
>>
@@ -5882,7 +5882,7 @@ endobj
/F4.0 47 0 R
/F5.0 51 0 R
>>
-/XObject << /Stamp1 1126 0 R
+/XObject << /Stamp1 1125 0 R
>>
>>
>>
@@ -6887,7 +6887,7 @@ endobj
/F5.0 51 0 R
/F6.0 72 0 R
>>
-/XObject << /Stamp1 1126 0 R
+/XObject << /Stamp1 1125 0 R
>>
>>
/Annots [60 0 R 61 0 R 62 0 R 63 0 R 64 0 R 65 0 R 66 0 R 67 0 R 68 0 R 69 0 R 73 0 R 74 0 R 75 0 R]
@@ -7010,22 +7010,22 @@ endobj
<< /Type /Font
/BaseFont /AAAADN+NotoSerif
/Subtype /TrueType
-/FontDescriptor 1194 0 R
+/FontDescriptor 1193 0 R
/FirstChar 32
/LastChar 255
-/Widths 1196 0 R
-/ToUnicode 1195 0 R
+/Widths 1195 0 R
+/ToUnicode 1194 0 R
>>
endobj
72 0 obj
<< /Type /Font
/BaseFont /AAAADO+mplus1mn-regular
/Subtype /TrueType
-/FontDescriptor 1198 0 R
+/FontDescriptor 1197 0 R
/FirstChar 32
/LastChar 255
-/Widths 1200 0 R
-/ToUnicode 1199 0 R
+/Widths 1199 0 R
+/ToUnicode 1198 0 R
>>
endobj
73 0 obj
@@ -7652,7 +7652,7 @@ endobj
/F2.0 18 0 R
/F4.0 47 0 R
>>
-/XObject << /Stamp1 1126 0 R
+/XObject << /Stamp1 1125 0 R
>>
>>
/Annots [78 0 R 79 0 R 81 0 R 83 0 R 84 0 R]
@@ -8576,7 +8576,7 @@ endobj
/Contents 86 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/XObject << /I1 85 0 R
-/Stamp1 1126 0 R
+/Stamp1 1125 0 R
>>
/Font << /F5.0 51 0 R
/F1.0 8 0 R
@@ -9422,7 +9422,7 @@ endobj
/F5.0 51 0 R
/F6.0 72 0 R
>>
-/XObject << /Stamp1 1126 0 R
+/XObject << /Stamp1 1125 0 R
>>
>>
/Annots [94 0 R 95 0 R 96 0 R 97 0 R 98 0 R]
@@ -10311,7 +10311,7 @@ endobj
/F2.0 18 0 R
/F5.0 51 0 R
>>
-/XObject << /Stamp1 1126 0 R
+/XObject << /Stamp1 1125 0 R
>>
>>
/Annots [101 0 R 102 0 R 103 0 R 104 0 R 105 0 R 106 0 R]
@@ -11027,7 +11027,7 @@ endobj
/F2.0 18 0 R
/F5.0 51 0 R
>>
-/XObject << /Stamp1 1126 0 R
+/XObject << /Stamp1 1125 0 R
>>
>>
/Annots [113 0 R]
@@ -11763,7 +11763,7 @@ endobj
/F2.0 18 0 R
/F5.0 51 0 R
>>
-/XObject << /Stamp1 1126 0 R
+/XObject << /Stamp1 1125 0 R
>>
>>
/Annots [122 0 R 123 0 R]
@@ -11777,12 +11777,12 @@ endobj
endobj
119 0 obj
<< /Limits [(_ugfun) (_ugfun_core-concepts_building-blocks_oid)]
-/Names [(_ugfun) 15 0 R (_ugfun_core-concepts) 42 0 R (_ugfun_core-concepts_add-ons) 298 0 R (_ugfun_core-concepts_building-blocks) 175 0 R (_ugfun_core-concepts_building-blocks_domain-events) 214 0 R (_ugfun_core-concepts_building-blocks_domain-services) 205 0 R (_ugfun_core-concepts_building-blocks_metamodel) 176 0 R (_ugfun_core-concepts_building-blocks_mixins-and-contributions) 211 0 R (_ugfun_core-concepts_building-blocks_objects-members) 193 0 R (_ugfun_core-concepts_building-blocks_oid) 218 0 R]
+/Names [(_ugfun) 15 0 R (_ugfun_core-concepts) 42 0 R (_ugfun_core-concepts_add-ons) 297 0 R (_ugfun_core-concepts_building-blocks) 175 0 R (_ugfun_core-concepts_building-blocks_domain-events) 214 0 R (_ugfun_core-concepts_building-blocks_domain-services) 205 0 R (_ugfun_core-concepts_building-blocks_metamodel) 176 0 R (_ugfun_core-concepts_building-blocks_mixins-and-contributions) 211 0 R (_ugfun_core-concepts_building-blocks_objects-members) 193 0 R (_ugfun_core-concepts_building-blocks_oid) 218 0 R]
>>
endobj
120 0 obj
<< /Limits [(_ugfun_core-concepts_principles) (_ugfun_getting-started_datanucleus-enhancer)]
-/Names [(_ugfun_core-concepts_principles) 118 0 R (_ugfun_core-concepts_principles_apache-isis-vs) 131 0 R (_ugfun_core-concepts_principles_apache-isis-vs_cqrs) 147 0 R (_ugfun_core-concepts_principles_apache-isis-vs_event-sourcing) 160 0 R (_ugfun_core-concepts_principles_apache-isis-vs_metawidget) 171 0 R (_ugfun_core-concepts_principles_apache-isis-vs_mvc-server-side-frameworks) 132 0 R (_ugfun_core-concepts_principles_isis-itself) 126 0 R (_ugfun_core-concepts_principles_your-apps) 121 0 R (_ugfun_faqs) 982 0 R (_ugfun_faqs_enabling-logging) 984 0 R (_ugfun_faqs_enhance-only) 997 0 R (_ugfun_faqs_how-run-fixtures-on-app-startup) 1033 0 R (_ugfun_faqs_how-to-handle-void-and-null-results) 1018 0 R (_ugfun_faqs_how-to-implement-a-spellchecker) 1026 0 R (_ugfun_faqs_i18n-label-in-wicket-viewer) 1008 0 R (_ugfun_faqs_per-user-themes) 998 0 R (_ugfun_faqs_restful-image-property) 994 0 R (_ugfun_faqs_subtype-entity-not-fully-populated) 988 0 R (_ugfun_getting-started) 336 0 R (_ugfun_g
etting-started_datanucleus-enhancer) 439 0 R]
+/Names [(_ugfun_core-concepts_principles) 118 0 R (_ugfun_core-concepts_principles_apache-isis-vs) 131 0 R (_ugfun_core-concepts_principles_apache-isis-vs_cqrs) 147 0 R (_ugfun_core-concepts_principles_apache-isis-vs_event-sourcing) 160 0 R (_ugfun_core-concepts_principles_apache-isis-vs_metawidget) 171 0 R (_ugfun_core-concepts_principles_apache-isis-vs_mvc-server-side-frameworks) 132 0 R (_ugfun_core-concepts_principles_isis-itself) 126 0 R (_ugfun_core-concepts_principles_your-apps) 121 0 R (_ugfun_faqs) 981 0 R (_ugfun_faqs_enabling-logging) 983 0 R (_ugfun_faqs_enhance-only) 996 0 R (_ugfun_faqs_how-run-fixtures-on-app-startup) 1032 0 R (_ugfun_faqs_how-to-handle-void-and-null-results) 1017 0 R (_ugfun_faqs_how-to-implement-a-spellchecker) 1025 0 R (_ugfun_faqs_i18n-label-in-wicket-viewer) 1007 0 R (_ugfun_faqs_per-user-themes) 997 0 R (_ugfun_faqs_restful-image-property) 993 0 R (_ugfun_faqs_subtype-entity-not-fully-populated) 987 0 R (_ugfun_getting-started) 335 0 R (_ugfun_g
etting-started_datanucleus-enhancer) 438 0 R]
>>
endobj
121 0 obj
@@ -12477,7 +12477,7 @@ endobj
/F3.1 43 0 R
/F2.0 18 0 R
>>
-/XObject << /Stamp1 1126 0 R
+/XObject << /Stamp1 1125 0 R
>>
>>
>>
@@ -13418,7 +13418,7 @@ endobj
/F2.0 18 0 R
/F5.0 51 0 R
>>
-/XObject << /Stamp1 1126 0 R
+/XObject << /Stamp1 1125 0 R
>>
>>
/Annots [133 0 R 134 0 R 135 0 R 136 0 R 137 0 R 138 0 R 139 0 R]
@@ -14347,7 +14347,7 @@ endobj
/F5.0 51 0 R
/F6.0 72 0 R
>>
-/XObject << /Stamp1 1126 0 R
+/XObject << /Stamp1 1125 0 R
>>
>>
/Annots [142 0 R 143 0 R 144 0 R 145 0 R 146 0 R]
@@ -15523,7 +15523,7 @@ endobj
/F2.0 18 0 R
/F5.0 51 0 R
>>
-/XObject << /Stamp1 1126 0 R
+/XObject << /Stamp1 1125 0 R
>>
>>
/Annots [150 0 R 151 0 R 152 0 R 153 0 R 154 0 R 156 0 R 157 0 R 158 0 R 159 0 R 161 0 R]
@@ -15588,11 +15588,11 @@ endobj
<< /Type /Font
/BaseFont /AAAADP+mplus-1p-regular
/Subtype /TrueType
-/FontDescriptor 1202 0 R
+/FontDescriptor 1201 0 R
/FirstChar 32
/LastChar 255
-/Widths 1204 0 R
-/ToUnicode 1203 0 R
+/Widths 1203 0 R
+/ToUnicode 1202 0 R
>>
endobj
156 0 obj
@@ -16650,7 +16650,7 @@ endobj
/F6.0 72 0 R
/F2.0 18 0 R
>>
-/XObject << /Stamp1 1126 0 R
+/XObject << /Stamp1 1125 0 R
>>
>>
/Annots [164 0 R 165 0 R 166 0 R 167 0 R 168 0 R 169 0 R 170 0 R 172 0 R 173 0 R 174 0 R 177 0 R]
@@ -17856,7 +17856,7 @@ endobj
/F2.0 18 0 R
/F5.0 51 0 R
>>
-/XObject << /Stamp1 1126 0 R
+/XObject << /Stamp1 1125 0 R
>>
>>
/Annots [180 0 R 182 0 R 183 0 R 184 0 R]
@@ -18574,7 +18574,7 @@ endobj
/F6.0 72 0 R
>>
/XObject << /I2 188 0 R
-/Stamp1 1126 0 R
+/Stamp1 1125 0 R
>>
>>
/Annots [187 0 R 189 0 R]
@@ -19774,7 +19774,7 @@ endobj
/F2.0 18 0 R
/F7.0 155 0 R
>>
-/XObject << /Stamp1 1126 0 R
+/XObject << /Stamp1 1125 0 R
>>
>>
/Annots [192 0 R]
@@ -19799,7 +19799,7 @@ endobj
endobj
195 0 obj
<< /Limits [(auto-complete-for-action-param) (constructor-injection)]
-/Names [(auto-complete-for-action-param) 757 0 R (auto-complete-for-property) 740 0 R (auto-complete-repository-based) 770 0 R (best-of-both-worlds) 977 0 R (building-the-app) 352 0 R (choices-for-action-parameter) 749 0 R (choices-for-property) 736 0 R (class-object) 554 0 R (code-bigdecimal-code-s-precision) 485 0 R (code-bigdecimal-code-s-precision-2) 513 0 R (code-membergrouplayout-code) 825 0 R (code-memberorder-code) 813 0 R (code-meta-inf-persistence-xml-code) 454 0 R (code-string-code-s-length) 480 0 R (code-string-code-s-length-2) 512 0 R (collections) 199 0 R (collections-2) 560 0 R (collections-3) 893 0 R (constructor-injection) 522 0 R]
+/Names [(auto-complete-for-action-param) 756 0 R (auto-complete-for-property) 739 0 R (auto-complete-repository-based) 769 0 R (best-of-both-worlds) 976 0 R (building-the-app) 351 0 R (choices-for-action-parameter) 748 0 R (choices-for-property) 735 0 R (class-object) 553 0 R (code-bigdecimal-code-s-precision) 484 0 R (code-bigdecimal-code-s-precision-2) 512 0 R (code-membergrouplayout-code) 824 0 R (code-memberorder-code) 812 0 R (code-meta-inf-persistence-xml-code) 453 0 R (code-string-code-s-length) 479 0 R (code-string-code-s-length-2) 511 0 R (collections) 199 0 R (collections-2) 559 0 R (collections-3) 892 0 R (constructor-injection) 521 0 R]
>>
endobj
196 0 obj
@@ -22077,7 +22077,7 @@ endobj
/F2.0 18 0 R
/F3.1 43 0 R
>>
-/XObject << /Stamp1 1126 0 R
+/XObject << /Stamp1 1125 0 R
>>
>>
>>
@@ -22086,11 +22086,11 @@ endobj
<< /Type /Font
/BaseFont /AAAADQ+mplus1mn-bold
/Subtype /TrueType
-/FontDescriptor 1206 0 R
+/FontDescriptor 1205 0 R
/FirstChar 32
/LastChar 255
-/Widths 1208 0 R
-/ToUnicode 1207 0 R
+/Widths 1207 0 R
+/ToUnicode 1206 0 R
>>
endobj
199 0 obj
@@ -22914,7 +22914,7 @@ endobj
/F2.0 18 0 R
/F7.0 155 0 R
>>
-/XObject << /Stamp1 1126 0 R
+/XObject << /Stamp1 1125 0 R
>>
>>
/Annots [204 0 R]
@@ -23647,7 +23647,7 @@ endobj
/F1.0 8 0 R
/F3.1 43 0 R
>>
-/XObject << /Stamp1 1126 0 R
+/XObject << /Stamp1 1125 0 R
>>
>>
/Annots [209 0 R 210 0 R 212 0 R 213 0 R 215 0 R 217 0 R 219 0 R]
@@ -24746,7 +24746,7 @@ endobj
/F2.0 18 0 R
/F3.1 43 0 R
>>
-/XObject << /Stamp1 1126 0 R
+/XObject << /Stamp1 1125 0 R
>>
>>
/Annots [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 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]
@@ -24990,7 +24990,7 @@ endobj
>>
endobj
245 0 obj
-<< /Length 14805
+<< /Length 14476
>>
stream
q
@@ -25091,7 +25091,7 @@ ET
BT
66.24000000000001 750.366 Td
/F6.0 10.5 Tf
-<436f6d6d616e644d656d656e746f53657276696365> Tj
+<496e746572616374696f6e436f6e74657874> Tj
ET
0.000 0.000 0.000 SCN
@@ -25100,7 +25100,7 @@ ET
0.200 0.200 0.200 SCN
BT
-176.49 750.366 Td
+160.74 750.366 Td
/F1.0 10.5 Tf
<202853504929> Tj
ET
@@ -25128,43 +25128,6 @@ ET
BT
66.24000000000001 728.586 Td
/F6.0 10.5 Tf
-<496e746572616374696f6e436f6e74657874> 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
-160.74 728.586 Td
-/F1.0 10.5 Tf
-<202853504929> 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 706.806 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.694 0.129 0.275 scn
-0.694 0.129 0.275 SCN
-
-BT
-66.24000000000001 706.806 Td
-/F6.0 10.5 Tf
<4175646974696e6753657276696365> Tj
ET
@@ -25174,7 +25137,7 @@ ET
0.200 0.200 0.200 SCN
BT
-144.99 706.806 Td
+144.99 728.586 Td
/F1.0 10.5 Tf
<20285350492920286465707265636174656429> Tj
ET
@@ -25187,7 +25150,7 @@ ET
0.200 0.200 0.200 SCN
BT
-56.88050000000001 685.0260000000001 Td
+56.88050000000001 706.806 Td
/F1.0 10.5 Tf
<a5> Tj
ET
@@ -25200,7 +25163,7 @@ ET
0.694 0.129 0.275 SCN
BT
-66.24000000000001 685.0260000000001 Td
+66.24000000000001 706.806 Td
/F6.0 10.5 Tf
<4175646974657253657276696365> Tj
ET
@@ -25211,7 +25174,7 @@ ET
0.200 0.200 0.200 SCN
BT
-139.74 685.0260000000001 Td
+139.74 706.806 Td
/F1.0 10.5 Tf
<202853504929> Tj
ET
@@ -25224,7 +25187,7 @@ ET
0.200 0.200 0.200 SCN
BT
-56.88050000000001 663.2460000000001 Td
+56.88050000000001 685.0260000000001 Td
/F1.0 10.5 Tf
<a5> Tj
ET
@@ -25237,7 +25200,7 @@ ET
0.694 0.129 0.275 SCN
BT
-66.24000000000001 665.4300000000002 Td
+66.24000000000001 687.2100000000002 Td
/F6.0 10.5 Tf
<4261636b67726f756e6453657276696365> Tj
ET
@@ -25250,7 +25213,7 @@ ET
0.200 0.200 0.200 SCN
BT
-56.88050000000001 645.2460000000001 Td
+56.88050000000001 667.0260000000001 Td
/F1.0 10.5 Tf
<a5> Tj
ET
@@ -25263,7 +25226,7 @@ ET
0.694 0.129 0.275 SCN
BT
-66.24000000000001 645.2460000000001 Td
+66.24000000000001 667.0260000000001 Td
/F6.0 10.5 Tf
<4261636b67726f756e64436f6d6d616e6453657276696365> Tj
ET
@@ -25274,7 +25237,7 @@ ET
0.200 0.200 0.200 SCN
BT
-192.24 645.2460000000001 Td
+192.24 667.0260000000001 Td
/F1.0 10.5 Tf
<202853504929> Tj
ET
@@ -25287,7 +25250,7 @@ ET
0.200 0.200 0.200 SCN
BT
-56.88050000000001 623.4660000000001 Td
+56.88050000000001 645.2460000000001 Td
/F1.0 10.5 Tf
<a5> Tj
ET
@@ -25300,7 +25263,7 @@ ET
0.694 0.129 0.275 SCN
BT
-66.24000000000001 623.4660000000001 Td
+66.24000000000001 645.2460000000001 Td
/F6.0 10.5 Tf
<5075626c697368696e6753657276696365> Tj
ET
@@ -25311,7 +25274,7 @@ ET
0.200 0.200 0.200 SCN
BT
-155.49 623.4660000000001 Td
+155.49 645.2460000000001 Td
/F1.0 10.5 Tf
<20285350492920286465707265636174656429> Tj
ET
@@ -25324,7 +25287,7 @@ ET
0.200 0.200 0.200 SCN
BT
-56.88050000000001 601.6860000000001 Td
+56.88050000000001 623.4660000000001 Td
/F1.0 10.5 Tf
<a5> Tj
ET
@@ -25337,7 +25300,7 @@ ET
0.694 0.129 0.275 SCN
BT
-66.24000000000001 601.6860000000001 Td
+66.24000000000001 623.4660000000001 Td
/F6.0 10.5 Tf
<5075626c6973686572657253657276696365> Tj
ET
@@ -25348,7 +25311,7 @@ ET
0.200 0.200 0.200 SCN
BT
-160.74 601.6860000000001 Td
+160.74 623.4660000000001 Td
/F1.0 10.5 Tf
<202853504929> Tj
ET
@@ -25361,7 +25324,7 @@ ET
0.200 0.200 0.200 SCN
BT
-56.88050000000001 579.9060000000002 Td
+56.88050000000001 601.6860000000001 Td
/F1.0 10.5 Tf
<a5> Tj
ET
@@ -25374,7 +25337,7 @@ ET
0.694 0.129 0.275 SCN
BT
-66.24000000000001 582.0900000000003 Td
+66.24000000000001 603.8700000000002 Td
/F6.0 10.5 Tf
<4d65747269637353657276696365> Tj
ET
@@ -25385,7 +25348,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24000000000001 555.9060000000002 Td
+48.24000000000001 577.6860000000001 Td
/F1.0 10.5 Tf
<496e666f726d6174696f6e2053686172696e673a> Tj
ET
@@ -25398,7 +25361,7 @@ ET
0.200 0.200 0.200 SCN
BT
-56.88050000000001 528.1260000000002 Td
+56.88050000000001 549.9060000000002 Td
/F1.0 10.5 Tf
<a5> Tj
ET
@@ -25411,7 +25374,7 @@ ET
0.694 0.129 0.275 SCN
BT
-66.24000000000001 530.3100000000003 Td
+66.24000000000001 552.0900000000003 Td
/F6.0 10.5 Tf
<53637261746368706164> Tj
ET
@@ -25424,7 +25387,7 @@ ET
0.200 0.200 0.200 SCN
BT
-56.88050000000001 510.12600000000026 Td
+56.88050000000001 531.9060000000002 Td
/F1.0 10.5 Tf
<a5> Tj
ET
@@ -25437,7 +25400,7 @@ ET
0.694 0.129 0.275 SCN
BT
-66.24000000000001 512.3100000000003 Td
+66.24000000000001 534.0900000000003 Td
/F6.0 10.5 Tf
<416374696f6e496e766f636174696f6e436f6e74657874> Tj
ET
@@ -25450,7 +25413,7 @@ ET
0.200 0.200 0.200 SCN
BT
-56.88050000000001 492.12600000000026 Td
+56.88050000000001 513.9060000000002 Td
/F1.0 10.5 Tf
<a5> Tj
ET
@@ -25463,7 +25426,7 @@ ET
0.694 0.129 0.275 SCN
BT
-66.24000000000001 494.3100000000003 Td
+66.24000000000001 516.0900000000003 Td
/F6.0 10.5 Tf
<5175657279526573756c74734361636865> Tj
ET
@@ -25474,7 +25437,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24000000000001 468.12600000000026 Td
+48.24000000000001 489.90600000000023 Td
/F1.0 10.5 Tf
<557365724d616e6167656d656e743a> Tj
ET
@@ -25487,7 +25450,7 @@ ET
0.200 0.200 0.200 SCN
BT
-56.88050000000001 440.3460000000003 Td
+56.88050000000001 462.12600000000026 Td
/F1.0 10.5 Tf
<a5> Tj
ET
@@ -25500,7 +25463,7 @@ ET
0.694 0.129 0.275 SCN
BT
-66.24000000000001 440.3460000000003 Td
+66.24000000000001 462.12600000000026 Td
/F6.0 10.5 Tf
<5573657250726f66696c6553657276696365> Tj
ET
@@ -25511,7 +25474,7 @@ ET
0.200 0.200 0.200 SCN
BT
-160.74 440.3460000000003 Td
+160.74 462.12600000000026 Td
/F1.0 10.5 Tf
<202853504929> Tj
ET
@@ -25524,7 +25487,7 @@ ET
0.200 0.200 0.200 SCN
BT
-56.88050000000001 418.5660000000003 Td
+56.88050000000001 440.3460000000003 Td
/F1.0 10.5 Tf
<a5> Tj
ET
@@ -25537,7 +25500,7 @@ ET
0.694 0.129 0.275 SCN
BT
-66.24000000000001 418.5660000000003 Td
+66.24000000000001 440.3460000000003 Td
/F6.0 10.5 Tf
<55736572526567697374726174696f6e53657276696365> Tj
ET
@@ -25548,7 +25511,7 @@ ET
0.200 0.200 0.200 SCN
BT
-186.99 418.5660000000003 Td
+186.99 440.3460000000003 Td
/F1.0 10.5 Tf
<202853504929> Tj
ET
@@ -25561,7 +25524,7 @@ ET
0.200 0.200 0.200 SCN
BT
-56.88050000000001 396.78600000000034 Td
+56.88050000000001 418.5660000000003 Td
/F1.0 10.5 Tf
<a5> Tj
ET
@@ -25574,7 +25537,7 @@ ET
0.694 0.129 0.275 SCN
BT
-66.24000000000001 396.78600000000034 Td
+66.24000000000001 418.5660000000003 Td
/F6.0 10.5 Tf
<456d61696c4e6f74696669636174696f6e53657276696365> Tj
ET
@@ -25585,7 +25548,7 @@ ET
0.200 0.200 0.200 SCN
BT
-192.24 396.78600000000034 Td
+192.24 418.5660000000003 Td
/F1.0 10.5 Tf
<202853504929> Tj
ET
@@ -25596,7 +25559,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24000000000001 369.00600000000037 Td
+48.24000000000001 390.78600000000034 Td
/F1.0 10.5 Tf
<426f6f6b6d61726b7320616e64204d656d656e746f733a> Tj
ET
@@ -25609,7 +25572,7 @@ ET
0.200 0.200 0.200 SCN
BT
-56.88050000000001 341.2260000000004 Td
+56.88050000000001 363.00600000000037 Td
/F1.0 10.5 Tf
<a5> Tj
ET
@@ -25622,7 +25585,7 @@ ET
0.694 0.129 0.275 SCN
BT
-66.24000000000001 343.4100000000004 Td
+66.24000000000001 365.1900000000004 Td
/F6.0 10.5 Tf
<426f6f6b6d61726b53657276696365> Tj
ET
@@ -25635,7 +25598,7 @@ ET
0.200 0.200 0.200 SCN
BT
-56.88050000000001 323.2260000000004 Td
+56.88050000000001 345.00600000000037 Td
/F1.0 10.5 Tf
<a5> Tj
ET
@@ -25648,7 +25611,7 @@ ET
0.694 0.129 0.275 SCN
BT
-66.24000000000001 325.4100000000004 Td
+66.24000000000001 347.1900000000004 Td
/F6.0 10.5 Tf
<4d656d656e746f53657276696365> Tj
ET
@@ -25661,7 +25624,7 @@ ET
0.200 0.200 0.200 SCN
BT
-56.88050000000001 305.2260000000004 Td
+56.88050000000001 327.00600000000037 Td
/F1.0 10.5 Tf
<a5> Tj
ET
@@ -25674,7 +25637,7 @@ ET
0.694 0.129 0.275 SCN
BT
-66.24000000000001 307.4100000000004 Td
+66.24000000000001 329.1900000000004 Td
/F6.0 10.5 Tf
<446565704c696e6b53657276696365> Tj
ET
@@ -25687,7 +25650,7 @@ ET
0.200 0.200 0.200 SCN
BT
-56.88050000000001 287.2260000000004 Td
+56.88050000000001 309.00600000000037 Td
/F1.0 10.5 Tf
<a5> Tj
ET
@@ -25700,7 +25663,7 @@ ET
0.694 0.129 0.275 SCN
BT
-66.24000000000001 289.4100000000004 Td
+66.24000000000001 311.1900000000004 Td
/F6.0 10.5 Tf
<4a61786253657276696365> Tj
ET
@@ -25713,7 +25676,7 @@ ET
0.200 0.200 0.200 SCN
BT
-56.88050000000001 269.2260000000004 Td
+56.88050000000001 291.00600000000037 Td
/F1.0 10.5 Tf
<a5> Tj
ET
@@ -25726,7 +25689,7 @@ ET
0.694 0.129 0.275 SCN
BT
-66.24000000000001 271.4100000000004 Td
+66.24000000000001 293.1900000000004 Td
/F6.0 10.5 Tf
<586d6c536e617073686f7453657276696365> Tj
ET
@@ -25737,7 +25700,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24000000000001 245.2260000000004 Td
+48.24000000000001 267.00600000000037 Td
/F1.0 10.5 Tf
[<4c61> 20.01953125 <796f757420616e64205549204d616e6167656d656e743a>] TJ
ET
@@ -25750,7 +25713,7 @@ ET
0.200 0.200 0.200 SCN
BT
-56.88050000000001 217.4460000000004 Td
+56.88050000000001 239.2260000000004 Td
/F1.0 10.5 Tf
<a5> Tj
ET
@@ -25763,7 +25726,7 @@ ET
0.694 0.129 0.275 SCN
BT
-66.24000000000001 219.6300000000004 Td
+66.24000000000001 241.4100000000004 Td
/F6.0 10.5 Tf
<486f6d655061676550726f766964657253657276696365> Tj
ET
@@ -25776,7 +25739,7 @@ ET
0.200 0.200 0.200 SCN
BT
-56.88050000000001 199.4460000000004 Td
+56.88050000000001 221.2260000000004 Td
/F1.0 10.5 Tf
<a5> Tj
ET
@@ -25789,7 +25752,7 @@ ET
0.694 0.129 0.275 SCN
BT
-66.24000000000001 201.6300000000004 Td
+66.24000000000001 223.4100000000004 Td
/F6.0 10.5 Tf
<4c61796f757453657276696365> Tj
ET
@@ -25802,7 +25765,7 @@ ET
0.200 0.200 0.200 SCN
BT
-56.88050000000001 181.4460000000004 Td
+56.88050000000001 203.2260000000004 Td
/F1.0 10.5 Tf
<a5> Tj
ET
@@ -25815,7 +25778,7 @@ ET
0.694 0.129 0.275 SCN
BT
-66.24000000000001 181.4460000000004 Td
+66.24000000000001 203.2260000000004 Td
/F6.0 10.5 Tf
<477269644c6f6164657253657276696365> Tj
ET
@@ -25826,7 +25789,7 @@ ET
0.200 0.200 0.200 SCN
BT
-155.49 181.4460000000004 Td
+155.49 203.2260000000004 Td
/F1.0 10.5 Tf
<202853504929> Tj
ET
@@ -25839,7 +25802,7 @@ ET
0.200 0.200 0.200 SCN
BT
-56.88050000000001 159.6660000000004 Td
+56.88050000000001 181.4460000000004 Td
/F1.0 10.5 Tf
<a5> Tj
ET
@@ -25852,7 +25815,7 @@ ET
0.694 0.129 0.275 SCN
BT
-66.24000000000001 159.6660000000004 Td
+66.24000000000001 181.4460000000004 Td
/F6.0 10.5 Tf
<4772696453657276696365> Tj
ET
@@ -25863,7 +25826,7 @@ ET
0.200 0.200 0.200 SCN
BT
-123.99000000000001 159.6660000000004 Td
+123.99000000000001 181.4460000000004 Td
/F1.0 10.5 Tf
<202853504929> Tj
ET
@@ -25876,7 +25839,7 @@ ET
0.200 0.200 0.200 SCN
BT
-56.88050000000001 137.8860000000004 Td
+56.88050000000001 159.6660000000004 Td
/F1.0 10.5 Tf
<a5> Tj
ET
@@ -25889,7 +25852,7 @@ ET
0.694 0.129 0.275 SCN
BT
-66.24000000000001 137.8860000000004 Td
+66.24000000000001 159.6660000000004 Td
/F6.0 10.5 Tf
<4772696453797374656d53657276696365> Tj
ET
@@ -25900,7 +25863,7 @@ ET
0.200 0.200 0.200 SCN
BT
-155.49 137.8860000000004 Td
+155.49 159.6660000000004 Td
/F1.0 10.5 Tf
<202853504929> Tj
ET
@@ -25913,7 +25876,7 @@ ET
0.200 0.200 0.200 SCN
BT
-56.88050000000001 116.10600000000039 Td
+56.88050000000001 137.8860000000004 Td
/F1.0 10.5 Tf
<a5> Tj
ET
@@ -25926,7 +25889,7 @@ ET
0.694 0.129 0.275 SCN
BT
-66.24000000000001 116.10600000000039 Td
+66.24000000000001 137.8860000000004 Td
/F6.0 10.5 Tf
<48696e7453746f7265> Tj
ET
@@ -25937,7 +25900,7 @@ ET
0.200 0.200 0.200 SCN
BT
-113.49000000000001 116.10600000000039 Td
+113.49000000000001 137.8860000000004 Td
/F1.0 10.5 Tf
<202853504929> Tj
ET
@@ -25950,7 +25913,7 @@ ET
0.200 0.200 0.200 SCN
BT
-56.88050000000001 94.32600000000039 Td
+56.88050000000001 116.10600000000039 Td
/F1.0 10.5 Tf
<a5> Tj
ET
@@ -25963,7 +25926,7 @@ ET
0.694 0.129 0.275 SCN
BT
-66.24000000000001 94.32600000000039 Td
+66.24000000000001 116.10600000000039 Td
/F6.0 10.5 Tf
<526f7574696e6753657276696365> Tj
ET
@@ -25974,7 +25937,7 @@ ET
0.200 0.200 0.200 SCN
BT
-139.74 94.32600000000039 Td
+139.74 116.10600000000039 Td
/F1.0 10.5 Tf
<202853504929> Tj
ET
@@ -25987,7 +25950,7 @@ ET
0.200 0.200 0.200 SCN
BT
-56.88050000000001 72.54600000000039 Td
+56.88050000000001 94.32600000000039 Td
/F1.0 10.5 Tf
<a5> Tj
ET
@@ -26000,7 +25963,7 @@ ET
0.694 0.129 0.275 SCN
BT
-66.24000000000001 72.54600000000039 Td
+66.24000000000001 94.32600000000039 Td
/F6.0 10.5 Tf
<55726c456e636f64696e6753657276696365> Tj
ET
@@ -26011,13 +25974,24 @@ ET
0.200 0.200 0.200 SCN
BT
-160.74 72.54600000000039 Td
+160.74 94.32600000000039 Td
/F1.0 10.5 Tf
<202853504929> 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 66.54600000000039 Td
+/F1.0 10.5 Tf
+[<524553> 20.01953125 <5420537570706f72743a>] 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
@@ -26051,10 +26025,10 @@ endobj
/Font << /F1.0 8 0 R
/F6.0 72 0 R
>>
-/XObject << /Stamp1 1126 0 R
+/XObject << /Stamp1 1125 0 R
>>
>>
-/Annots [247 0 R 248 0 R 249 0 R 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]
+/Annots [247 0 R 248 0 R 249 0 R 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]
>>
endobj
247 0 obj
@@ -26083,335 +26057,313 @@ endobj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
-/URI (rgsvc.pdf#_rgsvc_spi_CommandMementoService)
->>
-/Subtype /Link
-/Rect [66.24000000000001 748.896 176.49 759.396]
-/Type /Annot
->>
-endobj
-250 0 obj
-<< /Border [0 0 0]
-/A << /Type /Action
-/S /URI
/URI (rgsvc.pdf#_rgsvc_api_InteractionContext)
>>
/Subtype /Link
-/Rect [66.24000000000001 727.116 160.74 737.616]
+/Rect [66.24000000000001 748.896 160.74 759.396]
/Type /Annot
>>
endobj
-251 0 obj
+250 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
/URI (rgsvc.pdf#_rgsvc_spi_AuditingService)
>>
/Subtype /Link
-/Rect [66.24000000000001 705.336 144.99 715.836]
+/Rect [66.24000000000001 727.116 144.99 737.616]
/Type /Annot
>>
endobj
-252 0 obj
+251 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
/URI (rgsvc.pdf#_rgsvc_spi_AuditerService)
>>
/Subtype /Link
-/Rect [66.24000000000001 683.556 139.74 694.056]
+/Rect [66.24000000000001 705.336 139.74 715.836]
/Type /Annot
>>
endobj
-253 0 obj
+252 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
/URI (rgsvc.pdf#_rgsvc_api_BackgroundService)
>>
/Subtype /Link
-/Rect [66.24000000000001 663.9600000000002 155.49 674.4600000000002]
+/Rect [66.24000000000001 685.7400000000001 155.49 696.2400000000001]
/Type /Annot
>>
endobj
-254 0 obj
+253 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
/URI (rgsvc.pdf#_rgsvc_spi_BackgroundCommandService)
>>
/Subtype /Link
-/Rect [66.24000000000001 643.7760000000001 192.24 654.2760000000001]
+/Rect [66.24000000000001 665.556 192.24 676.056]
/Type /Annot
>>
endobj
-255 0 obj
+254 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
/URI (rgsvc.pdf#_rgsvc_spi_PublishingService)
>>
/Subtype /Link
-/Rect [66.24000000000001 621.9960000000001 155.49 632.4960000000001]
+/Rect [66.24000000000001 643.7760000000001 155.49 654.2760000000001]
/Type /Annot
>>
endobj
-256 0 obj
+255 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
/URI (rgsvc.pdf#_rgsvc_spi_PublisherService)
>>
/Subtype /Link
-/Rect [66.24000000000001 600.2160000000001 160.74 610.7160000000001]
+/Rect [66.24000000000001 621.9960000000001 160.74 632.4960000000001]
/Type /Annot
>>
endobj
-257 0 obj
+256 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
/URI (rgsvc.pdf#_rgsvc_api_MetricsService)
>>
/Subtype /Link
-/Rect [66.24000000000001 580.6200000000002 139.74 591.1200000000002]
+/Rect [66.24000000000001 602.4000000000002 139.74 612.9000000000002]
/Type /Annot
>>
endobj
-258 0 obj
+257 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
/URI (rgsvc.pdf#_rgsvc_api_Scratchpad)
>>
/Subtype /Link
-/Rect [66.24000000000001 528.8400000000003 118.74000000000001 539.3400000000003]
+/Rect [66.24000000000001 550.6200000000002 118.74000000000001 561.1200000000002]
/Type /Annot
>>
endobj
-259 0 obj
+258 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
/URI (rgsvc.pdf#_rgsvc_api_ActionInvocationContext)
>>
/Subtype /Link
-/Rect [66.24000000000001 510.84000000000026 186.99 521.3400000000003]
+/Rect [66.24000000000001 532.6200000000002 186.99 543.1200000000002]
/Type /Annot
>>
endobj
-260 0 obj
+259 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
/URI (rgsvc.pdf#_rgsvc_api_QueryResultsCache)
>>
/Subtype /Link
-/Rect [66.24000000000001 492.84000000000026 155.49 503.34000000000026]
+/Rect [66.24000000000001 514.6200000000002 155.49 525.1200000000002]
/Type /Annot
>>
endobj
-261 0 obj
+260 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
/URI (rgsvc.pdf#_rgsvc_spi_UserProfileService)
>>
/Subtype /Link
-/Rect [66.24000000000001 438.87600000000026 160.74 449.37600000000026]
+/Rect [66.24000000000001 460.65600000000023 160.74 471.15600000000023]
/Type /Annot
>>
endobj
-262 0 obj
+261 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
/URI (rgsvc.pdf#_rgsvc_spi_UserRegistrationService)
>>
/Subtype /Link
-/Rect [66.24000000000001 417.0960000000003 186.99 427.5960000000003]
+/Rect [66.24000000000001 438.87600000000026 186.99 449.37600000000026]
/Type /Annot
>>
endobj
-263 0 obj
+262 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
/URI (rgsvc.pdf#_rgsvc_spi_EmailNotificationService)
>>
/Subtype /Link
-/Rect [66.24000000000001 395.3160000000003 192.24 405.8160000000003]
+/Rect [66.24000000000001 417.0960000000003 192.24 427.5960000000003]
/Type /Annot
>>
endobj
-264 0 obj
+263 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
/URI (rgsvc.pdf#_rgsvc_api_BookmarkService)
>>
/Subtype /Link
-/Rect [66.24000000000001 341.9400000000004 144.99 352.4400000000004]
+/Rect [66.24000000000001 363.72000000000037 144.99 374.22000000000037]
/Type /Annot
>>
endobj
-265 0 obj
+264 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
/URI (rgsvc.pdf#_rgsvc_api_MementoService)
>>
/Subtype /Link
-/Rect [66.24000000000001 323.9400000000004 139.74 334.4400000000004]
+/Rect [66.24000000000001 345.72000000000037 139.74 356.22000000000037]
/Type /Annot
>>
endobj
-266 0 obj
+265 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
/URI (rgsvc.pdf#_rgsvc_api_DeepLinkService)
>>
/Subtype /Link
-/Rect [66.24000000000001 305.9400000000004 144.99 316.4400000000004]
+/Rect [66.24000000000001 327.72000000000037 144.99 338.22000000000037]
/Type /Annot
>>
endobj
-267 0 obj
+266 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
/URI (rgsvc.pdf#_rgsvc_api_JaxbService)
>>
/Subtype /Link
-/Rect [66.24000000000001 287.9400000000004 123.99000000000001 298.4400000000004]
+/Rect [66.24000000000001 309.72000000000037 123.99000000000001 320.22000000000037]
/Type /Annot
>>
endobj
-268 0 obj
+267 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
/URI (rgsvc.pdf#_rgsvc_api_XmlSnapshotService)
>>
/Subtype /Link
-/Rect [66.24000000000001 269.9400000000004 160.74 280.4400000000004]
+/Rect [66.24000000000001 291.72000000000037 160.74 302.22000000000037]
/Type /Annot
>>
endobj
-269 0 obj
+268 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
/URI (rgsvc.pdf#_rgsvc_api_HomePageProviderService)
>>
/Subtype /Link
-/Rect [66.24000000000001 218.1600000000004 186.99 228.6600000000004]
+/Rect [66.24000000000001 239.9400000000004 186.99 250.4400000000004]
/Type /Annot
>>
endobj
-270 0 obj
+269 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
/URI (rgsvc.pdf#_rgsvc_api_LayoutService)
>>
/Subtype /Link
-/Rect [66.24000000000001 200.1600000000004 134.49 210.6600000000004]
+/Rect [66.24000000000001 221.9400000000004 134.49 232.4400000000004]
/Type /Annot
>>
endobj
-271 0 obj
+270 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
/URI (rgsvc.pdf#_rgsvc_spi_GridLoaderService)
>>
/Subtype /Link
-/Rect [66.24000000000001 179.9760000000004 155.49 190.4760000000004]
+/Rect [66.24000000000001 201.7560000000004 155.49 212.2560000000004]
/Type /Annot
>>
endobj
-272 0 obj
+271 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
/URI (rgsvc.pdf#_rgsvc_spi_GridService)
>>
/Subtype /Link
-/Rect [66.24000000000001 158.1960000000004 123.99000000000001 168.6960000000004]
+/Rect [66.24000000000001 179.9760000000004 123.99000000000001 190.4760000000004]
/Type /Annot
>>
endobj
-273 0 obj
+272 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
/URI (rgsvc.pdf#_rgsvc_spi_GridSystemService)
>>
/Subtype /Link
-/Rect [66.24000000000001 136.4160000000004 155.49 146.9160000000004]
+/Rect [66.24000000000001 158.1960000000004 155.49 168.6960000000004]
/Type /Annot
>>
endobj
-274 0 obj
+273 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
/URI (rgsvc.pdf#_rgsvc_spi_HintStore)
>>
/Subtype /Link
-/Rect [66.24000000000001 114.6360000000004 113.49000000000001 125.1360000000004]
+/Rect [66.24000000000001 136.4160000000004 113.49000000000001 146.9160000000004]
/Type /Annot
>>
endobj
-275 0 obj
+274 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
/URI (rgsvc.pdf#_rgsvc_spi_RoutingService)
>>
/Subtype /Link
-/Rect [66.24000000000001 92.85600000000039 139.74 103.35600000000039]
+/Rect [66.24000000000001 114.6360000000004 139.74 125.1360000000004]
/Type /Annot
>>
endobj
-276 0 obj
+275 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
/URI (rgsvc.pdf#_rgsvc_spi_UrlEncodingService)
>>
/Subtype /Link
-/Rect [66.24000000000001 71.07600000000039 160.74 81.57600000000039]
+/Rect [66.24000000000001 92.85600000000039 160.74 103.35600000000039]
/Type /Annot
>>
endobj
-277 0 obj
-<< /Length 13455
+276 0 obj
+<< /Length 15763
>>
stream
q
-/DeviceRGB cs
-0.200 0.200 0.200 scn
-/DeviceRGB CS
-0.200 0.200 0.200 SCN
-
-BT
-48.24 794.6759999999999 Td
-/F1.0 10.5 Tf
-[<524553> 20.01953125 <5420537570706f72743a>] TJ
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.500 Tc
+/DeviceRGB cs
0.200 0.200 0.200 scn
+/DeviceRGB CS
0.200 0.200 0.200 SCN
BT
-56.88050000000001 766.896 Td
+56.88050000000001 793.9259999999999 Td
/F1.0 10.5 Tf
<a5> Tj
ET
@@ -26424,7 +26376,7 @@ ET
0.694 0.129 0.275 SCN
BT
-66.24000000000001 769.08 Td
+66.24000000000001 796.11 Td
/F6.0 10.5 Tf
<41636365707448656164657253657276696365> Tj
ET
@@ -26437,7 +26389,7 @@ ET
0.200 0.200 0.200 SCN
BT
-56.88050000000001 748.896 Td
+56.88050000000001 775.9259999999999 Td
/F1.0 10.5 Tf
<a5> Tj
ET
@@ -26450,7 +26402,7 @@ ET
0.694 0.129 0.275 SCN
BT
-66.24000000000001 751.08 Td
+66.24000000000001 778.11 Td
/F6.0 10.5 Tf
<5377616767657253657276696365> Tj
ET
@@ -26463,7 +26415,7 @@ ET
0.200 0.200 0.200 SCN
BT
-56.88050000000001 730.896 Td
+56.88050000000001 757.9259999999999 Td
/F1.0 10.5 Tf
<a5> Tj
ET
@@ -26476,7 +26428,7 @@ ET
0.694 0.129 0.275 SCN
BT
-66.24000000000001 730.896 Td
+66.24000000000001 757.9259999999999 Td
/F6.0 10.5 Tf
<436f6e74656e744d617070696e6753657276696365> Tj
ET
@@ -26487,7 +26439,7 @@ ET
0.200 0.200 0.200 SCN
BT
-176.49 730.896 Td
+176.49 757.9259999999999 Td
/F1.0 10.5 Tf
<202853504929> Tj
ET
@@ -26498,7 +26450,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24000000000001 703.116 Td
+48.24000000000001 730.146 Td
/F1.0 10.5 Tf
<4d6574616d6f64656c3a> Tj
ET
@@ -26511,7 +26463,7 @@ ET
0.200 0.200 0.200 SCN
BT
-56.88050000000001 675.336 Td
+56.88050000000001 702.366 Td
/F1.0 10.5 Tf
<a5> Tj
ET
@@ -26524,7 +26476,7 @@ ET
0.694 0.129 0.275 SCN
BT
-66.24000000000001 677.5200000000001 Td
+66.24000000000001 704.5500000000001 Td
/F6.0 10.5 Tf
<4170706c69636174696f6e466561747572655265706f7369746f7279> Tj
ET
@@ -26537,7 +26489,7 @@ ET
0.200 0.200 0.200 SCN
BT
-56.88050000000001 657.336 Td
+56.88050000000001 684.366 Td
/F1.0 10.5 Tf
<a5> Tj
ET
@@ -26550,7 +26502,7 @@ ET
0.694 0.129 0.275 SCN
BT
-66.24000000000001 659.5200000000001 Td
+66.24000000000001 686.5500000000001 Td
/F6.0 10.5 Tf
<4d6574616d6f64656c53657276696365> Tj
ET
@@ -26561,7 +26513,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24000000000001 633.336 Td
+48.24000000000001 660.366 Td
/F1.0 10.5 Tf
<4f74686572204150493a> Tj
ET
@@ -26574,7 +26526,7 @@ ET
0.200 0.200 0.200 SCN
BT
-56.88050000000001 605.556 Td
+56.88050000000001 632.586 Td
/F1.0 10.5 Tf
<a5> Tj
ET
@@ -26587,7 +26539,7 @@ ET
0.694 0.129 0.275 SCN
BT
-66.24000000000001 607.7400000000001 Td
+66.24000000000001 634.7700000000001 Td
/F6.0 10.5 Tf
<466978747572655363726970747344656661756c74> Tj
ET
@@ -26600,7 +26552,7 @@ ET
0.200 0.200 0.200 SCN
BT
-56.88050000000001 587.556 Td
+56.88050000000001 614.586 Td
/F1.0 10.5 Tf
<a5> Tj
ET
@@ -26613,7 +26565,7 @@ ET
0.694 0.129 0.275 SCN
BT
-66.24000000000001 589.7400000000001 Td
+66.24000000000001 616.7700000000001 Td
/F6.0 10.5 Tf
<47756963654265616e50726f7669646572> Tj
ET
@@ -26626,7 +26578,7 @@ ET
0.200 0.200 0.200 SCN
BT
-56.88050000000001 569.556 Td
+56.88050000000001 596.586 Td
/F1.0 10.5 Tf
<a5> Tj
ET
@@ -26639,7 +26591,7 @@ ET
0.694 0.129 0.275 SCN
BT
-66.24000000000001 571.7400000000001 Td
+66.24000000000001 598.7700000000001 Td
/F6.0 10.5 Tf
<5375646f53657276696365> Tj
ET
@@ -26652,7 +26604,7 @@ ET
0.200 0.200 0.200 SCN
BT
-56.88050000000001 551.556 Td
+56.88050000000001 578.586 Td
/F1.0 10.5 Tf
<a5> Tj
ET
@@ -26665,7 +26617,7 @@ ET
0.694 0.129 0.275 SCN
BT
-66.24000000000001 553.7400000000001 Td
+66.24000000000001 580.7700000000001 Td
/F6.0 10.5 Tf
<5472616e73616374696f6e53657276696365> Tj
ET
@@ -26676,7 +26628,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24000000000001 527.556 Td
+48.24000000000001 554.586 Td
/F1.0 10.5 Tf
<4f74686572205350493a> Tj
ET
@@ -26689,7 +26641,7 @@ ET
0.200 0.200 0.200 SCN
BT
-56.88050000000001 499.7760000000001 Td
+56.88050000000001 526.806 Td
/F1.0 10.5 Tf
<a5> Tj
ET
@@ -26702,7 +26654,7 @@ ET
0.694 0.129 0.275 SCN
BT
-66.24000000000001 499.7760000000001 Td
+66.24000000000001 526.806 Td
/F6.0 10.5 Tf
<436c617373446973636f7665727953657276696365> Tj
ET
@@ -26713,7 +26665,7 @@ ET
0.200 0.200 0.200 SCN
BT
-176.49 499.7760000000001 Td
+176.49 526.806 Td
/F1.0 10.5 Tf
<202853504929> Tj
ET
@@ -26726,7 +26678,7 @@ ET
0.200 0.200 0.200 SCN
BT
-56.88050000000001 477.99600000000015 Td
+56.88050000000001 505.0260000000001 Td
/F1.0 10.5 Tf
<a5> Tj
ET
@@ -26739,7 +26691,7 @@ ET
0.694 0.129 0.275 SCN
BT
-66.24000000000001 477.99600000000015 Td
+66.24000000000001 505.0260000000001 Td
/F6.0 10.5 Tf
<4572726f725265706f7274696e6753657276696365> Tj
ET
@@ -26750,7 +26702,7 @@ ET
0.200 0.200 0.200 SCN
BT
-176.49 477.99600000000015 Td
+176.49 505.0260000000001 Td
/F1.0 10.5 Tf
<202853504929> Tj
ET
@@ -26763,7 +26715,7 @@ ET
0.200 0.200 0.200 SCN
BT
-56.88050000000001 456.2160000000002 Td
+56.88050000000001 483.24600000000015 Td
/F1.0 10.5 Tf
<a5> Tj
ET
@@ -26776,7 +26728,7 @@ ET
0.694 0.129 0.275 SCN
BT
-66.24000000000001 456.2160000000002 Td
+66.24000000000001 483.24600000000015 Td
/F6.0 10.5 Tf
<4576656e7453657269616c697a6572> Tj
ET
@@ -26787,7 +26739,7 @@ ET
0.200 0.200 0.200 SCN
BT
-144.99 456.2160000000002 Td
+144.99 483.24600000000015 Td
/F1.0 10.5 Tf
<202853504929> Tj
ET
@@ -26800,7 +26752,7 @@ ET
0.200 0.200 0.200 SCN
BT
-56.88050000000001 434.4360000000002 Td
+56.88050000000001 461.4660000000002 Td
/F1.0 10.5 Tf
<a5> Tj
ET
@@ -26813,7 +26765,7 @@ ET
0.694 0.129 0.275 SCN
BT
-66.24000000000001 434.4360000000002 Td
+66.24000000000001 461.4660000000002 Td
/F6.0 10.5 Tf
<457863657074696f6e5265636f676e697a6572> Tj
ET
@@ -26824,7 +26776,7 @@ ET
0.200 0.200 0.200 SCN
BT
-165.99 434.4360000000002 Td
+165.99 461.4660000000002 Td
/F1.0 10.5 Tf
<202853504929> Tj
ET
@@ -26837,7 +26789,7 @@ ET
0.200 0.200 0.200 SCN
BT
-56.88050000000001 412.65600000000023 Td
+56.88050000000001 439.6860000000002 Td
/F1.0 10.5 Tf
<a5> Tj
ET
@@ -26850,7 +26802,7 @@ ET
0.694 0.129 0.275 SCN
BT
-66.24000000000001 412.65600000000023 Td
+66.24000000000001 439.6860000000002 Td
/F6.0 10.5 Tf
<466978747572655363726970747353706563696669636174696f6e50726f7669646572> Tj
ET
@@ -26861,7 +26813,7 @@ ET
0.200 0.200 0.200 SCN
BT
-249.99 412.65600000000023 Td
+249.99 439.6860000000002 Td
/F1.0 10.5 Tf
<202853504929> Tj
ET
@@ -26874,7 +26826,7 @@ ET
0.200 0.200 0.200 SCN
BT
-56.88050000000001 390.87600000000026 Td
+56.88050000000001 417.90600000000023 Td
/F1.0 10.5 Tf
<a5> Tj
ET
@@ -26887,7 +26839,7 @@ ET
0.694 0.129 0.275 SCN
BT
-66.24000000000001 390.87600000000026 Td
+66.24000000000001 417.90600000000023 Td
/F6.0 10.5 Tf
<4c6f63616c6550726f7669646572> Tj
ET
@@ -26898,7 +26850,7 @@ ET
0.200 0.200 0.200 SCN
BT
-139.74 390.87600000000026 Td
+139.74 417.90600000000023 Td
/F1.0 10.5 Tf
<202853504929> Tj
ET
@@ -26911,7 +26863,7 @@ ET
0.200 0.200 0.200 SCN
BT
-56.88050000000001 369.0960000000003 Td
+56.88050000000001 396.12600000000026 Td
/F1.0 10.5 Tf
<a5> Tj
ET
@@ -26924,7 +26876,7 @@ ET
0.694 0.129 0.275 SCN
BT
-66.24000000000001 369.0960000000003 Td
+66.24000000000001 396.12600000000026 Td
/F6.0 10.5 Tf
<5472616e736c6174696f6e53657276696365> Tj
ET
@@ -26935,7 +26887,7 @@ ET
0.200 0.200 0.200 SCN
BT
-160.74 369.0960000000003 Td
+160.74 396.12600000000026 Td
/F1.0 10.5 Tf
<202853504929> Tj
ET
@@ -26948,7 +26900,7 @@ ET
0.200 0.200 0.200 SCN
BT
-56.88050000000001 347.3160000000003 Td
+56.88050000000001 374.3460000000003 Td
/F1.0 10.5 Tf
<a5> Tj
ET
@@ -26961,7 +26913,7 @@ ET
0.694 0.129 0.275 SCN
BT
-66.24000000000001 347.3160000000003 Td
+66.24000000000001 374.3460000000003 Td
/F6.0 10.5 Tf
<5472616e736c6174696f6e735265736f6c766572> Tj
ET
@@ -26972,7 +26924,7 @@ ET
0.200 0.200 0.200 SCN
BT
-171.24 347.3160000000003 Td
+171.24 374.3460000000003 Td
/F1.0 10.5 Tf
<202853504929> Tj
ET
@@ -26985,7 +26937,7 @@ ET
0.200 0.200 0.200 SCN
BT
-56.88050000000001 325.53600000000034 Td
+56.88050000000001 352.5660000000003 Td
/F1.0 10.5 Tf
<a5> Tj
ET
@@ -26998,7 +26950,7 @@ ET
0.694 0.129 0.275 SCN
BT
-66.24000000000001 325.53600000000034 Td
+66.24000000000001 352.5660000000003 Td
/F6.0 10.5 Tf
<5472616e736c6174696f6e735265736f6c766572> Tj
ET
@@ -27009,7 +26961,7 @@ ET
0.200 0.200 0.200 SCN
BT
-171.24 325.53600000000034 Td
+171.24 352.5660000000003 Td
/F1.0 10.5 Tf
<202853504929> Tj
ET
@@ -27020,7 +26972,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24000000000001 297.75600000000037 Td
+48.24000000000001 324.78600000000034 Td
/F1.0 10.5 Tf
<412066756c6c206c697374206f662073657276696365732063616e20626520666f756e6420696e2074686520> Tj
ET
@@ -27031,7 +26983,7 @@ ET
0.259 0.545 0.792 SCN
BT
-250.87950000000004 297.75600000000037 Td
+250.87950000000004 324.78600000000034 Td
/F1.0 10.5 Tf
<446f6d61696e205365727669636573> Tj
ET
@@ -27042,7 +26994,7 @@ ET
0.200 0.200 0.200 SCN
BT
-334.43850000000003 297.75600000000037 Td
+334.43850000000003 324.78600000000034 Td
/F1.0 10.5 Tf
<207265666572656e63652067756964652e> Tj
ET
@@ -27053,7 +27005,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24000000000001 257.9160000000004 Td
+48.24000000000001 284.94600000000037 Td
/F2.0 18 Tf
[<322e352e20497369732041> 20.01953125 <64642d6f6e73>] TJ
ET
@@ -27066,7 +27018,7 @@ ET
0.856 Tw
BT
-48.24000000000001 229.89600000000038 Td
+48.24000000000001 256.92600000000033 Td
/F1.0 10.5 Tf
<54686520> Tj
ET
@@ -27081,7 +27033,7 @@ ET
0.856 Tw
BT
-70.51633607700893 229.89600000000038 Td
+70.51633607700893 256.92600000000033 Td
/F1.0 10.5 Tf
[<497369732041> 20.01953125 <64646f6e73>] TJ
ET
@@ -27096,7 +27048,7 @@ ET
0.856 Tw
BT
-128.39796707589284 229.89600000000038 Td
+128.39796707589284 256.92600000000033 Td
/F1.0 10.5 Tf
<20776562736974652070726f76696465732061206e756d626572206f66207265757361626c65206d6f64756c657320616e64206f7468657220657874656e73696f6e7320666f7220417061636865> Tj
ET
@@ -27111,7 +27063,7 @@ ET
0.918 Tw
BT
-48.24000000000001 214.11600000000038 Td
+48.24000000000001 241.14600000000033 Td
/F1.0 10.5 Tf
<497369732e202054686973206368617074657220666f6375736573206a757374206f6e20746865206d6f64756c65732c20616c6c206f6620776869636820686176652061206e616d65206f662074686520666f726d20> Tj
ET
@@ -27126,7 +27078,7 @@ ET
0.918 Tw
BT
-484.03999999999996 214.11600000000038 Td
+484.03999999999996 241.14600000000033 Td
/F6.0 10.5 Tf
<697369732d6d6f64756c652d> Tj
ET
@@ -27139,7 +27091,7 @@ ET
0.694 0.129 0.275 SCN
BT
-48.24000000000001 198.33600000000038 Td
+48.24000000000001 225.36600000000033 Td
/F6.0 10.5 Tf
<787878> Tj
ET
@@ -27150,7 +27102,7 @@ ET
0.200 0.200 0.200 SCN
BT
-63.99000000000001 198.33600000000038 Td
+63.99000000000001 225.36600000000033 Td
/F1.0 10.5 Tf
<2e> Tj
ET
@@ -27160,8 +27112,8 @@ ET
q
0.5 w
0.933 0.933 0.933 SCN
-113.807 142.960 m
-113.807 182.520 l
+113.807 169.990 m
+113.807 209.550 l
S
Q
0.749 0.412 0.000 scn
@@ -27172,7 +27124,7 @@ Q
0.749 0.412 0.000 SCN
BT
-75.02333333333334 154.16000000000042 Td
+75.02333333333334 181.19000000000034 Td
/F3.1 24 Tf
<23> Tj
ET
@@ -27185,7 +27137,7 @@ ET
1.026 Tw
BT
-125.80666666666667 166.55600000000038 Td
+125.80666666666667 193.58600000000033 Td
/F1.0 10.5 Tf
[<4e6f746520746861742049736973206164646f6e732c207768696c65206d61696e7461696e65642062> 20.01953125 <7920417061636865204973697320636f6d6d6974746572732c20617265206e6f742070617274>] TJ
ET
@@ -27198,7 +27150,7 @@ ET
0.200 0.200 0.200 SCN
BT
-125.80666666666667 150.77600000000038 Td
+125.80666666666667 177.80600000000032 Td
/F1.0 10.5 Tf
<6f6620746865204153462e> Tj
ET
@@ -27209,7 +27161,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24000000000001 118.99600000000038 Td
+48.24000000000001 146.02600000000032 Td
/F1.0 10.5 Tf
<546865206d6f64756c6573207468656d73656c7665732066616c6c20696e746f20666f75722062726f61642067726f7570733a> Tj
ET
@@ -27222,7 +27174,7 @@ ET
0.200 0.200 0.200 SCN
BT
-56.88050000000001 91.21600000000038 Td
+56.88050000000001 118.24600000000032 Td
/F1.0 10.5 Tf
<a5> Tj
ET
@@ -27235,7 +27187,7 @@ ET
0.200 0.200 0.200 SCN
BT
-66.24000000000001 91.21600000000038 Td
+66.24000000000001 118.24600000000032 Td
/F1.0 10.5 Tf
[<6d6f64756c657320746861742070726f7669646520616e20696d706c656d656e746174696f6e73206f662041504920646566696e65642062> 20.01953125 <79204170616368652049736973>] TJ
ET
@@ -27248,7 +27200,7 @@ ET
0.351 Tw
BT
-66.24000000000001 63.43600000000038 Td
+66.24000000000001 90.46600000000032 Td
/F1.0 10.5 Tf
[<77686572652041706163686520497369732068617320686f6f6b7320746f2075736520746865207365727669636520696620646566696e65642062> 20.01953125 <792070726f7669646573206e6f20696d706c656d656e746174696f6e73206f6620697473>] TJ
ET
@@ -27257,6 +27209,182 @@ 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.958 Tw
+
+BT
+66.24000000000001 74.68600000000032 Td
+/F1.0 10.5 Tf
+<6f776e2e202054686520> 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.958 Tw
+
+BT
+123.47019230769232 74.68600000000032 Td
+/F1.0 10.5 Tf
+<636f6d6d616e64> 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.958 Tw
+
+BT
+173.62869230769232 74.68600000000032 Td
+/F1.0 10.5 Tf
+<2c20> 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.958 Tw
+
+BT
+180.93142307692307 74.68600000000032 Td
+/F1.0 10.5 Tf
+<6175646974696e67> 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.958 Tw
+
+BT
+222.74242307692307 74.68600000000032 Td
+/F1.0 10.5 Tf
+<2c20> 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.958 Tw
+
+BT
+230.04515384615385 74.68600000000032 Td
+/F1.0 10.5 Tf
+<7075626c697368696e67> 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.958 Tw
+
+BT
+283.3431538461539 74.68600000000032 Td
+/F1.0 10.5 Tf
+<2c20> 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.958 Tw
+
+BT
+290.6458846153846 74.68600000000032 Td
+/F1.0 10.5 Tf
+<7365637572697479> 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.958 Tw
+
+BT
+330.73488461538466 74.68600000000032 Td
+/F1.0 10.5 Tf
+<2020616e6420> 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.958 Tw
+
+BT
+363.87807692307695 74.68600000000032 Td
+/F1.0 10.5 Tf
+<73657373696f6e6c6f67676572> 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.958 Tw
+
+BT
+431.0570769230769 74.68600000000032 Td
+/F1.0 10.5 Tf
+<206d6f64756c65732066616c6c20696e746f2074686973> 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 58.90600000000032 Td
+/F1.0 10.5 Tf
+[<63617465676f7279> 89.84375 <2e20205479706963616c6c792074686520646f6d61696e206f626a65637473207468656d73656c76657320776f756c646ed57420696e746572> 20.01953125 <6163742077697468207468657365207365727669636573>] 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
@@ -27281,441 +27409,320 @@ Q
endstream
endobj
-278 0 obj
+277 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 277 0 R
+/Contents 276 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/Font << /F1.0 8 0 R
/F6.0 72 0 R
/F2.0 18 0 R
/F3.1 43 0 R
>>
-/XObject << /Stamp1 1126 0 R
+/XObject << /Stamp1 1125 0 R
>>
>>
-/Annots [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 294 0 R 295 0 R 296 0 R 297 0 R 300 0 R]
+/Annots [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 294 0 R 295 0 R 296 0 R 299 0 R 300 0 R 301 0 R 302 0 R 303 0 R 304 0 R]
>>
endobj
-279 0 obj
+278 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
/URI (rgsvc.pdf#_rgsvc_api_AcceptHeaderService)
>>
/Subtype /Link
-/Rect [66.24000000000001 767.61 165.99 778.11]
+/Rect [66.24000000000001 794.64 165.99 805.14]
/Type /Annot
>>
endobj
-280 0 obj
+279 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
/URI (rgsvc.pdf#_rgsvc_api_SwaggerService)
>>
/Subtype /Link
-/Rect [66.24000000000001 749.61 139.74 760.11]
+/Rect [66.24000000000001 776.64 139.74 787.14]
/Type /Annot
>>
endobj
-281 0 obj
+280 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
/URI (rgsvc.pdf#_rgsvc_spi_ContentMappingService)
>>
/Subtype /Link
-/Rect [66.24000000000001 729.4259999999999 176.49 739.9259999999999]
+/Rect [66.24000000000001 756.4559999999999 176.49 766.9559999999999]
/Type /Annot
>>
endobj
-282 0 obj
+281 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
/URI (rgsvc.pdf#_rgsvc_api_ApplicationFeatureRepository)
>>
/Subtype /Link
-/Rect [66.24000000000001 676.0500000000001 213.24 686.5500000000001]
+/Rect [66.24000000000001 703.08 213.24 713.58]
/Type /Annot
>>
endobj
-283 0 obj
+282 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
/URI (rgsvc.pdf#_rgsvc_api_MetamodelService)
>>
/Subtype /Link
-/Rect [66.24000000000001 658.0500000000001 150.24 668.5500000000001]
+/Rect [66.24000000000001 685.08 150.24 695.58]
/Type /Annot
>>
endobj
-284 0 obj
+283 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
/URI (rgsvc.pdf#_rgsvc_api_FixtureScriptsDefault)
>>
/Subtype /Link
-/Rect [66.24000000000001 606.2700000000001 176.49 616.7700000000001]
+/Rect [66.24000000000001 633.3000000000001 176.49 643.8000000000001]
/Type /Annot
>>
endobj
-285 0 obj
+284 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
/URI (rgsvc.pdf#_rgsvc_api_GuiceBeanProvider)
>>
/Subtype /Link
-/Rect [66.24000000000001 588.2700000000001 155.49 598.7700000000001]
+/Rect [66.24000000000001 615.3000000000001 155.49 625.8000000000001]
/Type /Annot
>>
endobj
-286 0 obj
+285 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
/URI (rgsvc.pdf#_rgsvc_api_SudoService)
>>
/Subtype /Link
-/Rect [66.24000000000001 570.2700000000001 123.99000000000001 580.7700000000001]
+/Rect [66.24000000000001 597.3000000000001 123.99000000000001 607.8000000000001]
/Type /Annot
>>
endobj
-287 0 obj
+286 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
/URI (rgsvc.pdf#_rgsvc_api_TransactionService)
>>
/Subtype /Link
-/Rect [66.24000000000001 552.2700000000001 160.74 562.7700000000001]
+/Rect [66.24000000000001 579.3000000000001 160.74 589.8000000000001]
/Type /Annot
>>
endobj
-288 0 obj
+287 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
/URI (rgsvc.pdf#_rgsvc_spi_ClassDiscoveryService)
>>
/Subtype /Link
-/Rect [66.24000000000001 498.3060000000001 176.49 508.8060000000001]
+/Rect [66.24000000000001 525.336 176.49 535.836]
/Type /Annot
>>
endobj
-289 0 obj
+288 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
/URI (rgsvc.pdf#_rgsvc_spi_ErrorReportingService)
>>
/Subtype /Link
-/Rect [66.24000000000001 476.5260000000001 176.49 487.0260000000001]
+/Rect [66.24000000000001 503.5560000000001 176.49 514.056]
/Type /Annot
>>
endobj
-290 0 obj
+289 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
/URI (rgsvc.pdf#_rgsvc_spi_EventSerializer)
>>
/Subtype /Link
-/Rect [66.24000000000001 454.74600000000015 144.99 465.24600000000015]
+/Rect [66.24000000000001 481.7760000000001 144.99 492.2760000000001]
/Type /Annot
>>
endobj
-291 0 obj
+290 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
/URI (rgsvc.pdf#_rgsvc_spi_ExceptionRecognizer)
>>
/Subtype /Link
-/Rect [66.24000000000001 432.9660000000002 165.99 443.4660000000002]
+/Rect [66.24000000000001 459.99600000000015 165.99 470.49600000000015]
/Type /Annot
>>
endobj
-292 0 obj
+291 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
/URI (rgsvc.pdf#_rgsvc_spi_FixtureScriptsSpecificationProvider)
>>
/Subtype /Link
-/Rect [66.24000000000001 411.1860000000002 249.99 421.6860000000002]
+/Rect [66.24000000000001 438.2160000000002 249.99 448.7160000000002]
/Type /Annot
>>
endobj
-293 0 obj
+292 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
/URI (rgsvc.pdf#_rgsvc_spi_LocaleProvider)
>>
/Subtype /Link
-/Rect [66.24000000000001 389.40600000000023 139.74 399.90600000000023]
+/Rect [66.24000000000001 416.4360000000002 139.74 426.9360000000002]
/Type /Annot
>>
endobj
-294 0 obj
+293 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
/URI (rgsvc.pdf#_rgsvc_spi_TranslationService)
>>
/Subtype /Link
-/Rect [66.24000000000001 367.62600000000026 160.74 378.12600000000026]
+/Rect [66.24000000000001 394.65600000000023 160.74 405.15600000000023]
/Type /Annot
>>
endobj
-295 0 obj
+294 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
/URI (rgsvc.pdf#_rgsvc_spi_TranslationsResolver)
>>
/Subtype /Link
-/Rect [66.24000000000001 345.8460000000003 171.24 356.3460000000003]
+/Rect [66.24000000000001 372.87600000000026 171.24 383.37600000000026]
/Type /Annot
>>
endobj
-296 0 obj
+295 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
/URI (rgsvc.pdf#_rgsvc_spi_TranslationsResolver)
>>
/Subtype /Link
-/Rect [66.24000000000001 324.0660000000003 171.24 334.5660000000003]
+/Rect [66.24000000000001 351.0960000000003 171.24 361.5960000000003]
/Type /Annot
>>
endobj
-297 0 obj
+296 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
/URI (rgsvc.pdf#_rgsvc)
>>
/Subtype /Link
-/Rect [250.87950000000004 294.6900000000004 334.43850000000003 308.97000000000037]
+/Rect [250.87950000000004 321.72000000000037 334.43850000000003 336.00000000000034]
/Type /Annot
>>
endobj
+297 0 obj
+[277 0 R /XYZ 0 308.97000000000037 null]
+endobj
298 0 obj
-[278 0 R /XYZ 0 281.9400000000004 null]
+<< /Limits [(_ugfun_core-concepts_building-blocks_types-of-domain-objects) (_ugfun_core-concepts_philosophy_naked-objects-pattern_object-interface-mapping)]
+/Names [(_ugfun_core-concepts_building-blocks_types-of-domain-objects) 181 0 R (_ugfun_core-concepts_building-blocks_value-objects) 231 0 R (_ugfun_core-concepts_framework-provided-services) 232 0 R (_ugfun_core-concepts_other-deployment-options) 313 0 R (_ugfun_core-concepts_philosophy) 44 0 R (_ugfun_core-concepts_philosophy_aop) 88 0 R (_ugfun_core-concepts_philosophy_domain-driven-design) 45 0 R (_ugfun_core-concepts_philosophy_domain-driven-design_ubiquitous-language) 48 0 R (_ugfun_core-concepts_philosophy_hexagonal-architecture) 82 0 R (_ugfun_core-concepts_philosophy_how-eases-ddd) 107 0 R (_ugfun_core-concepts_philosophy_naked-objects-pattern) 57 0 R (_ugfun_core-concepts_philosophy_naked-objects-pattern_object-interface-mapping) 70 0 R]
+>>
endobj
299 0 obj
-<< /Limits [(_ugfun_core-concepts_building-blocks_types-of-domain-objects) (_ugfun_core-concepts_philosophy_naked-objects-pattern_object-interface-mapping)]
-/Names [(_ugfun_core-concepts_building-blocks_types-of-domain-objects) 181 0 R (_ugfun_core-concepts_building-blocks_value-objects) 231 0 R (_ugfun_core-concepts_framework-provided-services) 232 0 R (_ugfun_core-concepts_other-deployment-options) 314 0 R (_ugfun_core-concepts_philosophy) 44 0 R (_ugfun_core-concepts_philosophy_aop) 88 0 R (_ugfun_core-concepts_philosophy_domain-driven-design) 45 0 R (_ugfun_core-concepts_philosophy_domain-driven-design_ubiquitous-language) 48 0 R (_ugfun_core-concepts_philosophy_hexagonal-architecture) 82 0 R (_ugfun_core-concepts_philosophy_how-eases-ddd) 107 0 R (_ugfun_core-concepts_philosophy_naked-objects-pattern) 57 0 R (_ugfun_core-concepts_philosophy_naked-objects-pattern_object-interface-mapping) 70 0 R]
+<< /Border [0 0 0]
+/A << /Type /Action
+/S /URI
+/URI (http://www.isisaddons.org)
+>>
+/Subtype /Link
+/Rect [70.51633607700893 253.86000000000033 128.39796707589284 268.1400000000003]
+/Type /Annot
>>
endobj
300 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
-/URI (http://www.isisaddons.org)
+/URI (http://github.com/isisaddons/isis-module-command)
>>
/Subtype /Link
-/Rect [70.51633607700893 226.83000000000038 128.39796707589284 241.11000000000038]
+/Rect [123.47019230769232 71.62000000000032 173.62869230769232 85.90000000000032]
/Type /Annot
>>
endobj
301 0 obj
-<< /Length 17382
+<< /Border [0 0 0]
+/A << /Type /Action
+/S /URI
+/URI (http://github.com/isisaddons/isis-module-audit)
+>>
+/Subtype /Link
+/Rect [180.93142307692307 71.62000000000032 222.74242307692307 85.90000000000032]
+/Type /Annot
+>>
+endobj
+302 0 obj
+<< /Border [0 0 0]
+/A << /Type /Action
+/S /URI
+/URI (http://github.com/isisaddons/isis-module-publishing)
+>>
+/Subtype /Link
+/Rect [230.04515384615385 71.62000000000032 283.3431538461539 85.90000000000032]
+/Type /Annot
+>>
+endobj
+303 0 obj
+<< /Border [0 0 0]
+/A << /Type /Action
+/S /URI
+/URI (http://github.com/isisaddons/isis-module-security)
+>>
+/Subtype /Link
+/Rect [290.6458846153846 71.62000000000032 330.73488461538466 85.90000000000032]
+/Type /Annot
+>>
+endobj
+304 0 obj
+<< /Border [0 0 0]
+/A << /Type /Action
+/S /URI
+/URI (http://github.com/isisaddons/isis-module-sessionlogger)
+>>
+/Subtype /Link
+/Rect [363.87807692307695 71.62000000000032 431.0570769230769 85.90000000000032]
+/Type /Annot
+>>
+endobj
+305 0 obj
+<< /Length 15564
>>
stream
q
-/DeviceRGB cs
-0.200 0.200 0.200 scn
-/DeviceRGB CS
-0.200 0.200 0.200 SCN
-
-1.958 Tw
-
-BT
-66.24000000000001 794.6759999999999 Td
-/F1.0 10.5 Tf
-<6f776e2e202054686520> 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.958 Tw
-
-BT
-123.47019230769232 794.6759999999999 Td
-/F1.0 10.5 Tf
-<636f6d6d616e64> 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.958 Tw
-
-BT
-173.62869230769232 794.6759999999999 Td
-/F1.0 10.5 Tf
-<2c20> 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.958 Tw
-
-BT
-180.93142307692307 794.6759999999999 Td
-/F1.0 10.5 Tf
-<6175646974696e67> 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.958 Tw
-
-BT
-222.74242307692307 794.6759999999999 Td
-/F1.0 10.5 Tf
-<2c20> 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.958 Tw
-
-BT
-230.04515384615385 794.6759999999999 Td
-/F1.0 10.5 Tf
-<7075626c697368696e67> 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.958 Tw
-
-BT
-283.3431538461539 794.6759999999999 Td
-/F1.0 10.5 Tf
-<2c20> 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.958 Tw
-
-BT
-290.6458846153846 794.6759999999999 Td
-/F1.0 10.5 Tf
-<7365637572697479> 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.958 Tw
-
-BT
-330.73488461538466 794.6759999999999 Td
-/F1.0 10.5 Tf
-<2020616e6420> 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.958 Tw
-
-BT
-363.87807692307695 794.6759999999999 Td
-/F1.0 10.5 Tf
-<73657373696f6e6c6f67676572> 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.958 Tw
-
-BT
-431.0570769230769 794.6759999999999 Td
-/F1.0 10.5 Tf
-<206d6f64756c65732066616c6c20696e746f2074686973> 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.896 Td
-/F1.0 10.5 Tf
-[<63617465676f7279> 89.84375 <2e20205479706963616c6c792074686520646f6d61696e206f626a65637473207468656d73656c76657320776f756c646ed57420696e746572> 20.01953125 <6163742077697468207468657365207365727669636573>] TJ
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.500 Tc
+/DeviceRGB cs
0.200 0.200 0.200 scn
+/DeviceRGB CS
0.200 0.200 0.200 SCN
BT
-56.88050000000001 751.116 Td
+56.88050000000001 793.9259999999999 Td
/F1.0 10.5 Tf
<a5> Tj
ET
@@ -27728,7 +27735,7 @@ ET
0.200 0.200 0.200 SCN
BT
-66.24000000000001 751.116 Td
+66.24000000000001 793.9259999999999 Td
/F1.0 10.5 Tf
<6d6f64756c657320746861742070726f76696465207374616e64616c6f6e6520646f6d61696e2073657276696365732077697468207468656972206f776e2041504920616e6420696d706c656d656e746174696f6e> Tj
ET
@@ -27741,7 +27748,7 @@ ET
3.474 Tw
BT
-66.24000000000001 723.336 Td
+66.24000000000001 766.146 Td
/F1.0 10.5 Tf
[<5468657365206172652073696d706c7920696e74656e64656420746f20626520757365642062> 20.01953125 <7920646f6d61696e206f626a656374732e202054686520>] TJ
ET
@@ -27756,7 +27763,7 @@ ET
3.474 Tw
BT
-416.3937589843749 723.336 Td
+416.3937589843749 766.146 Td
/F1.0 10.5 Tf
<646f6378> Tj
ET
@@ -27771,7 +27778,7 @@ ET
3.474 Tw
BT
-440.12375898437494 723.336 Td
+440.12375898437494 766.146 Td
/F1.0 10.5 Tf
<2c20> Tj
ET
@@ -27786,7 +27793,7 @@ ET
3.474 Tw
BT
-448.94200598958327 723.336 Td
+448.94200598958327 766.146 Td
/F1.0 10.5 Tf
<657863656c> Tj
ET
@@ -27801,7 +27808,7 @@ ET
3.474 Tw
BT
-474.6670059895833 723.336 Td
+474.6670059895833 766.146 Td
/F1.0 10.5 Tf
<2c20> Tj
ET
@@ -27816,7 +27823,7 @@ ET
3.474 Tw
BT
-483.4852529947916 723.336 Td
+483.4852529947916 766.146 Td
/F1.0 10.5 Tf
<73657474696e6773> Tj
ET
@@ -27831,7 +27838,7 @@ ET
3.474 Tw
BT
-521.7367529947917 723.336 Td
+521.7367529947917 766.146 Td
/F1.0 10.5 Tf
<20616e64> Tj
ET
@@ -27844,7 +27851,7 @@ ET
0.259 0.545 0.792 SCN
BT
-66.24000000000001 707.556 Td
+66.24000000000001 750.366 Td
/F1.0 10.5 Tf
<737472696e67696e746572706f6c61746f72> Tj
ET
@@ -27855,7 +27862,7 @@ ET
0.200 0.200 0.200 SCN
BT
-156.12 707.556 Td
+156.12 750.366 Td
/F1.0 10.5 Tf
[<2066616c6c20696e746f20746869732063617465676f7279> 89.84375 <2e>] TJ
ET
@@ -27868,7 +27875,7 @@ ET
0.200 0.200 0.200 SCN
BT
-56.88050000000001 679.7760000000001 Td
+56.88050000000001 722.586 Td
/F1.0 10.5 Tf
<a5> Tj
ET
@@ -27883,7 +27890,7 @@ ET
2.413 Tw
BT
-66.24000000000001 679.7760000000001 Td
+66.24000000000001 722.586 Td
/F1.0 10.5 Tf
<6d6f64756c657320746861742070726f76696465207374616e64616c6f6e6520646f6d61696e20656e7469746965732028616e6420737570706f7274696e672073657276696365732920666f72206120706172746963756c6172> Tj
ET
@@ -27896,7 +27903,7 @@ ET
0.200 0.200 0.200 SCN
BT
-66.24000000000001 663.9960000000001 Td
+66.24000000000001 706.806 Td
/F1.0 10.5 Tf
<737562646f6d61696e> Tj
ET
@@ -27907,7 +27914,7 @@ ET
0.200 0.200 0.200 SCN
BT
-66.24000000000001 636.2160000000001 Td
+66.24000000000001 679.0260000000001 Td
/F1.0 10.5 Tf
<54686520> Tj
ET
@@ -27918,7 +27925,7 @@ ET
0.259 0.545 0.792 SCN
BT
-87.66000000000001 636.2160000000001 Td
+87.66000000000001 679.0260000000001 Td
/F1.0 10.5 Tf
<74616773> Tj
ET
@@ -27929,7 +27936,7 @@ ET
0.200 0.200 0.200 SCN
BT
-107.64150000000001 636.2160000000001 Td
+107.64150000000001 679.0260000000001 Td
/F1.0 10.5 Tf
<206d6f64756c652066616c6c7320696e746f20746869732063617465676f7279> Tj
ET
@@ -27942,7 +27949,7 @@ ET
0.200 0.200 0.200 SCN
BT
-56.88050000000001 608.4360000000001 Td
+56.88050000000001 651.2460000000001 Td
/F1.0 10.5 Tf
<a5> Tj
ET
@@ -27955,7 +27962,7 @@ ET
0.200 0.200 0.200 SCN
BT
-66.24000000000001 608.4360000000001 Td
+66.24000000000001 651.2460000000001 Td
/F1.0 10.5 Tf
<6d6f64756c657320746861742070726f7669646520646576656c6f706572207574696c6974696573> Tj
ET
@@ -27968,7 +27975,7 @@ ET
1.013 Tw
BT
-66.24000000000001 580.6560000000002 Td
+66.24000000000001 623.4660000000001 Td
/F1.0 10.5 Tf
[<4e6f7420696e74656e64656420666f72207573652062> 20.01953125 <792065697468657220746865206672> 20.01953125 <616d65776f726b206f7220646f6d61696e206f626a656374732c206275742070726f76696465207574696c6974696573207468617420746865>] TJ
ET
@@ -27981,7 +27988,7 @@ ET
0.200 0.200 0.200 SCN
BT
-66.24000000000001 564.8760000000002 Td
+66.24000000000001 607.6860000000001 Td
/F1.0 10.5 Tf
<646576656c6f706572207468656d73656c766573206d69676874207573652e202054686520> Tj
ET
@@ -27992,7 +27999,7 @@ ET
0.259 0.545 0.792 SCN
BT
-256.14300000000003 564.8760000000002 Td
+256.14300000000003 607.6860000000001 Td
/F1.0 10.5 Tf
<6465767574696c73> Tj
ET
@@ -28003,7 +28010,7 @@ ET
0.200 0.200 0.200 SCN
BT
-295.96950000000004 564.8760000000002 Td
+295.96950000000004 607.6860000000001 Td
/F1.0 10.5 Tf
<206d6f64756c6520286e6f7420737570726973696e676c79292066616c6c7320696e746f20746869732063617465676f7279> Tj
ET
@@ -28016,7 +28023,7 @@ ET
0.958 Tw
BT
-48.24000000000001 531.0960000000002 Td
+48.24000000000001 573.9060000000002 Td
/F1.0 10.5 Tf
[<45616368206f6620746865206d6f64756c65732068617320612066756c6c20524541444d4520616e64206578616d706c65206170706c69636174696f6e2064656d6f6e737472> 20.01953125 <6174696e672074686569722075736167652e2020546865>] TJ
ET
@@ -28029,7 +28036,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24000000000001 515.3160000000003 Td
+48.24000000000001 558.1260000000002 Td
/F1.0 10.5 Tf
<73656374696f6e732062656c6f772062726965666c79206f75746c696e6520746865206361706162696c6974696573206f66207468657365206d6f64756c65732e> Tj
ET
@@ -28040,7 +28047,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24000000000001 475.47600000000034 Td
+48.24000000000001 518.2860000000003 Td
/F2.0 18 Tf
[<322e362e204f74686572204465706c6f> 20.01953125 <796d656e74204f7074696f6e73>] TJ
ET
@@ -28053,7 +28060,7 @@ ET
1.378 Tw
BT
-48.24000000000001 447.4560000000003 Td
+48.24000000000001 490.2660000000003 Td
/F1.0 10.5 Tf
[<41706163686520497369732069732061206d617475726520706c6174666f726d207375697461626c6520666f722070726f64756374696f6e206465706c6f> 20.01953125 <796d656e742c207769746820697473202273776565742073706f7422206265696e67>] TJ
ET
@@ -28068,7 +28075,7 @@ ET
0.469 Tw
BT
-48.24000000000001 431.6760000000003 Td
+48.24000000000001 474.48600000000033 Td
/F1.0 10.5 Tf
<6c696e652d6f662d627573696e65737320656e7465727072697365206170706c69636174696f6e732e2020536f20696620796f75d57265206c6f6f6b696e6720746f20646576656c6f70207468617420736f7274206f66206170706c69636174696f6e2c207765> Tj
ET
@@ -28081,7 +28088,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24000000000001 415.8960000000003 Td
+48.24000000000001 458.7060000000003 Td
/F1.0 10.5 Tf
<6365727461696e6c7920686f706520796f75d56c6c20736572696f75736c79206576616c756174652069742e> Tj
ET
@@ -28094,7 +28101,7 @@ ET
0.457 Tw
BT
-48.24000000000001 388.11600000000027 Td
+48.24000000000001 430.92600000000033 Td
/F1.0 10.5 Tf
[<42757420746865726520617265206f74686572207761> 20.01953125 <7973207468617420796f752063616e206d616b> 20.01953125 <6520417061636865204973697320776f726b20666f7220796f753b20696e20746869732063686170746572207765206578706c6f72652061>] TJ
ET
@@ -28107,7 +28114,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24000000000001 372.33600000000024 Td
+48.24000000000001 415.1460000000003 Td
/F1.0 10.5 Tf
<666577206f66207468656d2e> Tj
ET
@@ -28118,7 +28125,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24000000000001 337.83600000000024 Td
+48.24000000000001 380.6460000000003 Td
/F2.0 13 Tf
[<322e362e312e204465706c6f> 20.01953125 <7920746f2070726f64756374696f6e>] TJ
ET
@@ -28131,7 +28138,7 @@ ET
1.958 Tw
BT
-48.24000000000001 311.27600000000024 Td
+48.24000000000001 354.0860000000003 Td
/F1.0 10.5 Tf
<4c6574d5732073746172742074686f7567682077697468207468652064656661756c7420757365206361736520666f722041706163686520497369733a206275696c64696e67206c696e652d6f662d627573696e65737320656e7465727072697365> Tj
ET
@@ -28144,7 +28151,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24000000000001 295.4960000000002 Td
+48.24000000000001 338.30600000000027 Td
/F1.0 10.5 Tf
[<6170706c69636174696f6e732c206f6e20746f70206f6620697473205769636b> 20.01953125 <6574207669657765722e>] TJ
ET
@@ -28157,7 +28164,7 @@ ET
2.050 Tw
BT
-48.24000000000001 267.71600000000024 Td
+48.24000000000001 310.5260000000003 Td
/F1.0 10.5 Tf
[<417061636865205769636b> 20.01953125 <65742c20616e64207468657265666f726520417061636865204973697320696e207468697320636f6e6669677572> 20.01953125 <6174696f6e2c206973206120737461746566756c206172636869746563747572652e202041732061>] TJ
ET
@@ -28172,7 +28179,7 @@ ET
0.804 Tw
BT
-48.24000000000001 251.93600000000023 Td
+48.24000000000001 294.7460000000003 Td
/F1.0 10.5 Tf
[<706c6174666f726d206974206973206365727461696e6c792063617061626c65206f6620737570706f7274696e672075736572206261736573206f66207365766572> 20.01953125 <616c2074686f7573616e642028776974682070657268617073206f6e65206f72>] TJ
ET
@@ -28187,7 +28194,7 @@ ET
0.383 Tw
BT
-48.24000000000001 236.15600000000023 Td
+48.24000000000001 278.9660000000003 Td
/F1.0 10.5 Tf
<74776f2068756e6472656420636f6e63757272656e74293b20686f77657665722069742069736ed57420616e20617263686974656374757265207468617420796f752073686f756c642074727920746f207363616c6520757020746f2074656e73206f66> Tj
ET
@@ -28200,7 +28207,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24000000000001 220.37600000000023 Td
+48.24000000000001 263.18600000000026 Td
/F1.0 10.5 Tf
<74686f7573616e6473206f6620636f6e63757272656e742075736572732e> Tj
ET
@@ -28213,7 +28220,7 @@ ET
0.590 Tw
BT
-48.24000000000001 192.59600000000023 Td
+48.24000000000001 235.4060000000003 Td
/F1.0 10.5 Tf
[<5468652055492055492067656e6572> 20.01953125 <617465642062> 20.01953125 <7920746865205769636b> 20.01953125 <6574207669657765722069732077656c6c2073756974656420746f206d616e> 20.01953125 <79206c696e652d6f662d627573696e65737320617070732c20627574206974d57320616c736f>] TJ
ET
@@ -28228,7 +28235,7 @@ ET
1.873 Tw
BT
-48.24000000000001 176.81600000000023 Td
+48.24000000000001 219.6260000000003 Td
/F1.0 10.5 Tf
[<776f727468206b6e6f77696e6720746861742028776974682061206c6974746c65206b6e6f776c65646765206f6620746865205769636b> 20.01953125 <65742041504973292069742072656c61746976656c7920737472> 20.01953125 <6169676874666f727761726420746f>] TJ
ET
@@ -28243,7 +28250,7 @@ ET
0.350 Tw
BT
-48.24000000000001 161.03600000000023 Td
+48.24000000000001 203.8460000000003 Td
/F1.0 10.5 Tf
<657874656e642e202041732064657363726962656420696e20> Tj
ET
@@ -28258,7 +28265,7 @@ ET
0.350 Tw
BT
-171.42173502604163 161.03600000000023 Td
+171.42173502604163 203.8460000000003 Td
/F1.0 10.5 Tf
<49736973206164646f6e73> Tj
ET
@@ -28273,7 +28280,7 @@ ET
0.350 Tw
BT
-227.50558203124996 161.03600000000023 Td
+227.50558203124996 203.8460000000003 Td
/F1.0 10.5 Tf
[<20636861707465722c207468652076696577657220616c72656164792068617320696e74656772> 20.01953125 <6174696f6e73207769746820>] TJ
ET
@@ -28288,7 +28295,7 @@ ET
0.350 Tw
BT
-482.0731529947916 161.03600000000023 Td
+482.0731529947916 203.8460000000003 Td
/F1.0 10.5 Tf
<676f6f676c65206d617073> Tj
ET
@@ -28303,7 +28310,7 @@ ET
0.350 Tw
BT
-544.415 161.03600000000023 Td
+544.415 203.8460000000003 Td
/F1.0 10.5 Tf
<2c> Tj
ET
@@ -28318,7 +28325,7 @@ ET
1.698 Tw
BT
-48.24000000000001 145.25600000000023 Td
+48.24000000000001 188.0660000000003 Td
/F1.0 10.5 Tf
<612066756c6c2063616c656e646172> Tj
ET
@@ -28333,7 +28340,7 @@ ET
1.698 Tw
BT
-124.01217417279413 145.25600000000023 Td
+124.01217417279413 188.0660000000003 Td
/F1.0 10.5 Tf
<20616e6420616e20> Tj
ET
@@ -28348,7 +28355,7 @@ ET
1.698 Tw
BT
-169.04768543198531 145.25600000000023 Td
+169.04768543198531 188.0660000000003 Td
/F1.0 10.5 Tf
<6578706f727420746f20457863656c> Tj
ET
@@ -28363,7 +28370,7 @@ ET
1.698 Tw
BT
-247.10885960477944 145.25600000000023 Td
+247.10885960477944 188.0660000000003 Td
/F1.0 10.5 Tf
[<20636f6d706f6e656e742e202057> 60.05859375 <652061726520616c736f206177617265206f6620696e74656772> 20.01953125 <6174696f6e7320776974682053> 20.01953125 <56> 20.01953125 <47>] TJ
ET
@@ -28378,7 +28385,7 @@ ET
0.711 Tw
BT
-48.24000000000001 129.47600000000023 Td
+48.24000000000001 172.28600000000029 Td
/F1.0 10.5 Tf
[<696d616765732028666f7220666c6f6f72206d617073206f662073686f7070696e672063656e7465722920616e64206f6620637573746f6d207769646765747320646973706c61> 20.01953125 <79696e67206120636174616c6f67756520287465787420616e64>] TJ
ET
@@ -28391,7 +28398,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24000000000001 113.69600000000023 Td
+48.24000000000001 156.50600000000028 Td
/F1.0 10.5 Tf
<696d6167657329206f66206d65646963616c2064697365617365732e> Tj
ET
@@ -28404,7 +28411,7 @@ ET
1.396 Tw
BT
-48.24000000000001 85.91600000000022 Td
+48.24000000000001 128.72600000000028 Td
/F1.0 10.5 Tf
[<4465706c6f> 20.01953125 <79696e67206f6e204170616368652049736973206d65616e73207468617420746865206672> 20.01953125 <616d65776f726b20616c736f206d616e61676573206f626a6563742070657273697374656e63652e202046> 40.0390625 <6f72206d616e> 20.01953125 <79>] TJ
ET
@@ -28419,7 +28426,7 @@ ET
0.282 Tw
BT
-48.24000000000001 70.13600000000022 Td
+48.24000000000001 112.94600000000028 Td
/F1.0 10.5 Tf
<6c696e652d6f662d627573696e657373206170706c69636174696f6e7320746869732077696c6c206d65616e207573696e6720612072656c6174696f6e616c2064617461626173652e2020497420697320616c736f20706f737369626c652028636f757274657379> Tj
ET
@@ -28434,7 +28441,7 @@ ET
2.266 Tw
BT
-48.24000000000001 54.35600000000022 Td
+48.24000000000001 97.16600000000028 Td
/F1.0 10.5 Tf
[<6f662069747320696e74656772> 20.01953125 <6174696e6f6e207769746820>] TJ
ET
@@ -28449,7 +28456,7 @@ ET
2.266 Tw
BT
-175.00889142922793 54.35600000000022 Td
+175.00889142922793 97.16600000000028 Td
/F1.0 10.5 Tf
<446174614e75636c657573> Tj
ET
@@ -28464,7 +28471,7 @@ ET
2.266 Tw
BT
-238.23989142922792 54.35600000000022 Td
+238.23989142922792 97.16600000000028 Td
/F1.0 10.5 Tf
[<2920746f206465706c6f> 20.01953125 <7920616e20497369732061707020746f2061204e6f53514c2073746f72652073756368206173204e656f344a206f72>] TJ
ET
@@ -28473,6 +28480,39 @@ 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 81.38600000000028 Td
+/F1.0 10.5 Tf
+[<4d6f6e676f44423b20616e6420697420697320616c736f20706f737369626c6520746f206465706c6f> 20.01953125 <7920746f20636c6f756420706c6174666f726d73207375636820617320>] 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
+393.54279492187504 81.38600000000028 Td
+/F1.0 10.5 Tf
+<476f6f676c652041707020456e67696e65202847414529> 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
+519.500794921875 81.38600000000028 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
@@ -28497,73 +28537,29 @@ Q
endstream
endobj
-302 0 obj
+306 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 301 0 R
+/Contents 305 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/Font << /F1.0 8 0 R
/F2.0 18 0 R
>>
-/XObject << /Stamp1 1126 0 R
->>
+/XObject << /Stamp1 1125 0 R
>>
-/Annots [303 0 R 304 0 R 305 0 R 306 0 R 307 0 R 308 0 R 309 0 R 310 0 R 311 0 R 312 0 R 313 0 R 316 0 R 317 0 R 318 0 R 319 0 R 320 0 R]
->>
-endobj
-303 0 obj
-<< /Border [0 0 0]
-/A << /Type /Action
-/S /URI
-/URI (http://github.com/isisaddons/isis-module-command)
->>
-/Subtype /Link
-/Rect [123.47019230769232 791.6099999999999 173.62869230769232 805.89]
-/Type /Annot
->>
-endobj
-304 0 obj
-<< /Border [0 0 0]
-/A << /Type /Action
-/S /URI
-/URI (http://github.com/isisaddons/isis-module-audit)
->>
-/Subtype /Link
-/Rect [180.93142307692307 791.6099999999999 222.74242307692307 805.89]
-/Type /Annot
->>
-endobj
-305 0 obj
-<< /Border [0 0 0]
-/A << /Type /Action
-/S /URI
-/URI (http://github.com/isisaddons/isis-module-publishing)
->>
-/Subtype /Link
-/Rect [230.04515384615385 791.6099999999999 283.3431538461539 805.89]
-/Type /Annot
->>
-endobj
-306 0 obj
-<< /Border [0 0 0]
-/A << /Type /Action
-/S /URI
-/URI (http://github.com/isisaddons/isis-module-security)
>>
-/Subtype /Link
-/Rect [290.6458846153846 791.6099999999999 330.73488461538466 805.89]
-/Type /Annot
+/Annots [307 0 R 308 0 R 309 0 R 310 0 R 311 0 R 312 0 R 315 0 R 316 0 R 317 0 R 318 0 R 319 0 R 320 0 R]
>>
endobj
307 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
-/URI (http://github.com/isisaddons/isis-module-sessionlogger)
+/URI (http://github.com/isisaddons/isis-module-docx)
>>
/Subtype /Link
-/Rect [363.87807692307695 791.6099999999999 431.0570769230769 805.89]
+/Rect [416.3937589843749 763.0799999999999 440.12375898437494 777.36]
/Type /Annot
>>
endobj
@@ -28571,10 +28567,10 @@ endobj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
-/URI (http://github.com/isisaddons/isis-module-docx)
+/URI (http://github.com/isisaddons/isis-module-excel)
>>
/Subtype /Link
-/Rect [416.3937589843749 720.27 440.12375898437494 734.5500000000001]
+/Rect [448.94200598958327 763.0799999999999 474.6670059895833 777.36]
/Type /Annot
>>
endobj
@@ -28582,10 +28578,10 @@ endobj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
-/URI (http://github.com/isisaddons/isis-module-excel)
+/URI (http://github.com/isisaddons/isis-module-settings)
>>
/Subtype /Link
-/Rect [448.94200598958327 720.27 474.6670059895833 734.5500000000001]
+/Rect [483.4852529947916 763.0799999999999 521.7367529947917 777.36]
/Type /Annot
>>
endobj
@@ -28593,10 +28589,10 @@ endobj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
-/URI (http://github.com/isisaddons/isis-module-settings)
+/URI (http://github.com/isisaddons/isis-module-stringinterpolator)
>>
/Subtype /Link
-/Rect [483.4852529947916 720.27 521.7367529947917 734.5500000000001]
+/Rect [66.24000000000001 747.3 156.12 761.58]
/Type /Annot
>>
endobj
@@ -28604,10 +28600,10 @@ endobj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
-/URI (http://github.com/isisaddons/isis-module-stringinterpolator)
+/URI (http://github.com/isisaddons/isis-module-tags)
>>
/Subtype /Link
-/Rect [66.24000000000001 704.49 156.12 718.7700000000001]
+/Rect [87.66000000000001 675.96 107.64150000000001 690.2400000000001]
/Type /Annot
>>
endobj
@@ -28615,35 +28611,35 @@ endobj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
-/URI (http://github.com/isisaddons/isis-module-tags)
+/URI (http://github.com/isisaddons/isis-module-devutils)
>>
/Subtype /Link
-/Rect [87.66000000000001 633.1500000000001 107.64150000000001 647.4300000000002]
+/Rect [256.14300000000003 604.6200000000001 295.96950000000004 618.9000000000002]
/Type /Annot
>>
endobj
313 0 obj
-<< /Border [0 0 0]
-/A << /Type /Action
-/S /URI
-/URI (http://github.com/isisaddons/isis-module-devutils)
->>
-/Subtype /Link
-/Rect [256.14300000000003 561.8100000000002 295.96950000000004 576.0900000000003]
-/Type /Annot
->>
+[306 0 R /XYZ 0 542.3100000000003 null]
endobj
314 0 obj
-[302 0 R /XYZ 0 499.50000000000034 null]
+[306 0 R /XYZ 0 399.3300000000003 null]
endobj
315 0 obj
-[302 0 R /XYZ 0 356.52000000000027 null]
+<< /Border [0 0 0]
+/Dest (_ugfun_core-concepts_add-ons)
+/Subtype /Link
+/Rect [171.42173502604163 200.78000000000029 227.50558203124996 215.0600000000003]
+/Type /Annot
+>>
endobj
316 0 obj
<< /Border [0 0 0]
-/Dest (_ugfun_core-concepts_add-ons)
+/A << /Type /Action
+/S /URI
+/URI (https://github.com/isisaddons/isis-wicket-gmap3)
+>>
/Subtype /Link
-/Rect [171.42173502604163 157.97000000000023 227.50558203124996 172.25000000000023]
+/Rect [482.0731529947916 200.78000000000029 544.415 215.0600000000003]
/Type /Annot
>>
endobj
@@ -28651,10 +28647,10 @@ endobj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
-/URI (https://github.com/isisaddons/isis-wicket-gmap3)
+/URI (https://github.com/isisaddons/isis-wicket-fullcalendar2)
>>
/Subtype /Link
-/Rect [482.0731529947916 157.97000000000023 544.415 172.25000000000023]
+/Rect [48.24000000000001 185.00000000000028 124.01217417279413 199.28000000000029]
/Type /Annot
>>
endobj
@@ -28662,10 +28658,10 @@ endobj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
-/URI (https://github.com/isisaddons/isis-wicket-fullcalendar2)
+/URI (https://github.com/isisaddons/isis-wicket-excel)
>>
/Subtype /Link
-/Rect [48.24000000000001 142.19000000000023 124.01217417279413 156.47000000000023]
+/Rect [169.04768543198531 185.00000000000028 247.10885960477944 199.28000000000029]
/Type /Annot
>>
endobj
@@ -28673,10 +28669,10 @@ endobj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
-/URI (https://github.com/isisaddons/isis-wicket-excel)
+/URI (http://www.datanucleus.org)
>>
/Subtype /Link
-/Rect [169.04768543198531 142.19000000000023 247.10885960477944 156.47000000000023]
+/Rect [175.00889142922793 94.10000000000028 238.23989142922792 108.38000000000028]
/Type /Annot
>>
endobj
@@ -28684,15 +28680,15 @@ endobj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
-/URI (http://www.datanucleus.org)
+/URI (https://cloud.google.com/appengine/docs)
>>
/Subtype /Link
-/Rect [175.00889142922793 51.29000000000022 238.23989142922792 65.57000000000022]
+/Rect [393.54279492187504 78.32000000000028 519.500794921875 92.60000000000028]
/Type /Annot
>>
endobj
321 0 obj
-<< /Length 13877
+<< /Length 13536
>>
stream
q
@@ -28702,40 +28698,7 @@ q
0.200 0.200 0.200 SCN
BT
-48.24 794.6759999999999 Td
-/F1.0 10.5 Tf
-[<4d6f6e676f44423b20616e6420697420697320616c736f20706f737369626c6520746f206465706c6f> 20.01953125 <7920746f20636c6f756420706c6174666f726d73207375636820617320>] 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
-393.54279492187504 794.6759999999999 Td
-/F1.0 10.5 Tf
-<476f6f676c652041707020456e67696e65202847414529> 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
-519.500794921875 794.6759999999999 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.24 760.176 Td
+48.24 792.006 Td
<TRUNCATED>
[4/7] isis-site git commit: internal services introduced in 1.13.0
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/c5f2b2e1/content/guides/rgsvc.pdf
----------------------------------------------------------------------
diff --git a/content/guides/rgsvc.pdf b/content/guides/rgsvc.pdf
index e54a9ef..2397f0e 100644
--- a/content/guides/rgsvc.pdf
+++ b/content/guides/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:20160712064029+01'00')
-/ModDate (D:20160712064029+01'00')
+/CreationDate (D:20160712234709+01'00')
+/ModDate (D:20160712234709+01'00')
>>
endobj
2 0 obj
<< /Type /Catalog
/Pages 3 0 R
-/Names 16 0 R
-/Outlines 2119 0 R
-/PageLabels 2200 0 R
+/Names 18 0 R
+/Outlines 2154 0 R
+/PageLabels 2237 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 169
-/Kids [7 0 R 10 0 R 12 0 R 14 0 R 35 0 R 47 0 R 59 0 R 68 0 R 74 0 R 103 0 R 108 0 R 129 0 R 164 0 R 198 0 R 208 0 R 219 0 R 226 0 R 239 0 R 245 0 R 251 0 R 255 0 R 261 0 R 269 0 R 284 0 R 299 0 R 314 0 R 335 0 R 348 0 R 366 0 R 376 0 R 388 0 R 404 0 R 419 0 R 428 0 R 434 0 R 461 0 R 499 0 R 520 0 R 529 0 R 541 0 R 551 0 R 561 0 R 573 0 R 586 0 R 598 0 R 600 0 R 602 0 R 612 0 R 624 0 R 626 0 R 637 0 R 644 0 R 666 0 R 673 0 R 680 0 R 696 0 R 707 0 R 716 0 R 727 0 R 737 0 R 745 0 R 754 0 R 760 0 R 774 0 R 781 0 R 804 0 R 812 0 R 825 0 R 844 0 R 853 0 R 872 0 R 877 0 R 905 0 R 930 0 R 937 0 R 942 0 R 949 0 R 961 0 R 977 0 R 988 0 R 990 0 R 1001 0 R 1011 0 R 1015 0 R 1023 0 R 1031 0 R 1038 0 R 1054 0 R 1066 0 R 1073 0 R 1077 0 R 1080 0 R 1086 0 R 1095 0 R 1107 0 R 1121 0 R 1135 0 R 1141 0 R 1153 0 R 1162 0 R 1166 0 R 1195 0 R 1212 0 R 1217 0 R 1232 0 R 1249 0 R 1255 0 R 1271 0 R 1277 0 R 1284 0 R 1300 0 R 1302 0 R 1314 0 R 1322 0 R 1326 0 R 1329 0 R 1336 0 R 1343 0 R 1371 0 R 1387 0 R 1
400 0 R 1408 0 R 1419 0 R 1433 0 R 1441 0 R 1457 0 R 1466 0 R 1501 0 R 1516 0 R 1524 0 R 1532 0 R 1534 0 R 1564 0 R 1574 0 R 1580 0 R 1587 0 R 1591 0 R 1601 0 R 1613 0 R 1617 0 R 1623 0 R 1634 0 R 1637 0 R 1643 0 R 1647 0 R 1651 0 R 1656 0 R 1664 0 R 1691 0 R 1709 0 R 1712 0 R 1724 0 R 1731 0 R 1748 0 R 1756 0 R 1761 0 R 1773 0 R 1785 0 R 1794 0 R 1811 0 R 1822 0 R 1828 0 R 1835 0 R 1852 0 R 1857 0 R 1866 0 R 1872 0 R 1888 0 R 1895 0 R]
+/Count 170
+/Kids [7 0 R 10 0 R 12 0 R 14 0 R 16 0 R 37 0 R 49 0 R 61 0 R 70 0 R 76 0 R 105 0 R 110 0 R 131 0 R 166 0 R 200 0 R 210 0 R 221 0 R 228 0 R 241 0 R 247 0 R 253 0 R 257 0 R 263 0 R 271 0 R 286 0 R 301 0 R 316 0 R 337 0 R 350 0 R 368 0 R 378 0 R 390 0 R 406 0 R 421 0 R 430 0 R 436 0 R 463 0 R 501 0 R 522 0 R 531 0 R 543 0 R 553 0 R 563 0 R 575 0 R 588 0 R 600 0 R 602 0 R 604 0 R 614 0 R 626 0 R 628 0 R 639 0 R 646 0 R 668 0 R 675 0 R 682 0 R 698 0 R 709 0 R 718 0 R 729 0 R 739 0 R 747 0 R 756 0 R 762 0 R 776 0 R 783 0 R 806 0 R 814 0 R 827 0 R 846 0 R 855 0 R 874 0 R 879 0 R 907 0 R 932 0 R 939 0 R 944 0 R 951 0 R 963 0 R 979 0 R 990 0 R 992 0 R 1003 0 R 1013 0 R 1017 0 R 1025 0 R 1033 0 R 1040 0 R 1056 0 R 1068 0 R 1075 0 R 1079 0 R 1082 0 R 1088 0 R 1097 0 R 1109 0 R 1123 0 R 1137 0 R 1143 0 R 1155 0 R 1164 0 R 1168 0 R 1197 0 R 1214 0 R 1219 0 R 1234 0 R 1251 0 R 1258 0 R 1274 0 R 1279 0 R 1287 0 R 1303 0 R 1305 0 R 1317 0 R 1325 0 R 1329 0 R 1332 0 R 1339 0 R 1346 0 R 1374 0 R 139
0 0 R 1403 0 R 1413 0 R 1424 0 R 1437 0 R 1445 0 R 1461 0 R 1470 0 R 1514 0 R 1526 0 R 1536 0 R 1544 0 R 1553 0 R 1559 0 R 1589 0 R 1599 0 R 1605 0 R 1612 0 R 1616 0 R 1626 0 R 1638 0 R 1642 0 R 1648 0 R 1659 0 R 1662 0 R 1668 0 R 1672 0 R 1676 0 R 1681 0 R 1689 0 R 1716 0 R 1734 0 R 1737 0 R 1750 0 R 1759 0 R 1775 0 R 1785 0 R 1797 0 R 1809 0 R 1819 0 R 1837 0 R 1847 0 R 1853 0 R 1860 0 R 1877 0 R 1882 0 R 1890 0 R 1896 0 R 1912 0 R 1919 0 R]
>>
endobj
4 0 obj
@@ -80,11 +80,11 @@ endobj
<< /Type /Font
/BaseFont /AAAACG+NotoSerif
/Subtype /TrueType
-/FontDescriptor 2202 0 R
+/FontDescriptor 2239 0 R
/FirstChar 32
/LastChar 255
-/Widths 2204 0 R
-/ToUnicode 2203 0 R
+/Widths 2241 0 R
+/ToUnicode 2240 0 R
>>
endobj
9 0 obj
@@ -1932,16 +1932,16 @@ endobj
/MediaBox [0 0 595.28 841.89]
/Contents 9 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F2.0 18 0 R
+/Font << /F2.0 20 0 R
/F1.0 8 0 R
-/F3.0 40 0 R
+/F3.0 42 0 R
>>
>>
-/Annots [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 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]
+/Annots [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 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]
>>
endobj
11 0 obj
-<< /Length 38715
+<< /Length 40296
>>
stream
q
@@ -2665,9 +2665,20 @@ ET
0.200 0.200 0.200 SCN
BT
-159.30124999999992 535.9559999999997 Td
+153.4485 535.9559999999997 Td
/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<20286465707265636174656429> 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
+223.43524999999994 535.9559999999997 Td
+/F1.0 10.5 Tf
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -3093,7 +3104,7 @@ ET
BT
79.9485 369.63599999999957 Td
/F3.0 10.5 Tf
-<466978747572655363726970747344656661756c74> Tj
+<457865637574696f6e506172616d657465727353657276696365> Tj
ET
0.000 0.000 0.000 SCN
@@ -3102,9 +3113,9 @@ ET
0.200 0.200 0.200 SCN
BT
-191.36824999999993 369.63599999999957 Td
+218.09074999999996 369.63599999999957 Td
/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -3122,7 +3133,7 @@ ET
BT
529.4314999999999 369.63599999999957 Td
/F1.0 10.5 Tf
-<313234> Tj
+<313235> Tj
ET
0.000 0.000 0.000 SCN
@@ -3144,7 +3155,7 @@ ET
BT
79.9485 351.15599999999955 Td
/F3.0 10.5 Tf
-<5375646f53657276696365> Tj
+<466978747572655363726970747344656661756c74> Tj
ET
0.000 0.000 0.000 SCN
@@ -3153,9 +3164,9 @@ ET
0.200 0.200 0.200 SCN
BT
-143.26774999999992 351.15599999999955 Td
+191.36824999999993 351.15599999999955 Td
/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -3246,7 +3257,7 @@ ET
BT
529.4314999999999 332.67599999999953 Td
/F1.0 10.5 Tf
-<313237> Tj
+<313236> Tj
ET
0.000 0.000 0.000 SCN
@@ -3255,9 +3266,20 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24 314.1959999999995 Td
+60.24 314.1959999999995 Td
/F1.0 10.5 Tf
-[<31302e2050657273697374656e6365204c61> 20.01953125 <79657220415049>] TJ
+<392e342e20> 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 314.1959999999995 Td
+/F3.0 10.5 Tf
+<5375646f53657276696365> Tj
ET
0.000 0.000 0.000 SCN
@@ -3266,9 +3288,9 @@ ET
0.200 0.200 0.200 SCN
BT
-175.33474999999993 314.1959999999995 Td
+143.26774999999992 314.1959999999995 Td
/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -3286,7 +3308,7 @@ ET
BT
529.4314999999999 314.1959999999995 Td
/F1.0 10.5 Tf
-<313239> Tj
+<313237> Tj
ET
0.000 0.000 0.000 SCN
@@ -3297,6 +3319,108 @@ ET
BT
60.24 295.7159999999995 Td
/F1.0 10.5 Tf
+<392e352e20> 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 295.7159999999995 Td
+/F3.0 10.5 Tf
+<5377697463685573657253657276696365> 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
+169.1985 295.7159999999995 Td
+/F1.0 10.5 Tf
+<20286465707265636174656429> 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
+239.46874999999994 295.7159999999995 Td
+/F1.0 10.5 Tf
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+
+BT
+528.07175 295.7159999999995 Td
+/F1.0 5.25 Tf
+<ca> Tj
+ET
+
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+529.4314999999999 295.7159999999995 Td
+/F1.0 10.5 Tf
+<313238> 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 277.2359999999995 Td
+/F1.0 10.5 Tf
+[<31302e2050657273697374656e6365204c61> 20.01953125 <79657220415049>] 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
+175.33474999999993 277.2359999999995 Td
+/F1.0 10.5 Tf
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+
+BT
+528.07175 277.2359999999995 Td
+/F1.0 5.25 Tf
+<ca> Tj
+ET
+
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+529.4314999999999 277.2359999999995 Td
+/F1.0 10.5 Tf
+<313330> 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 258.75599999999946 Td
+/F1.0 10.5 Tf
<31302e312e20> Tj
ET
@@ -3306,7 +3430,7 @@ ET
0.694 0.129 0.275 SCN
BT
-85.81800000000001 295.7159999999995 Td
+85.81800000000001 258.75599999999946 Td
/F3.0 10.5 Tf
<497369734a646f537570706f7274> Tj
ET
@@ -3317,7 +3441,7 @@ ET
0.200 0.200 0.200 SCN
BT
-164.6457499999999 295.7159999999995 Td
+164.6457499999999 258.75599999999946 Td
/F1.0 10.5 Tf
<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
@@ -3326,7 +3450,7 @@ ET
0.000 0.000 0.000 scn
BT
-528.07175 295.7159999999995 Td
+528.07175 258.75599999999946 Td
/F1.0 5.25 Tf
<ca> Tj
ET
@@ -3335,9 +3459,9 @@ ET
0.200 0.200 0.200 SCN
BT
-529.4314999999999 295.7159999999995 Td
+529.4314999999999 258.75599999999946 Td
/F1.0 10.5 Tf
-<313239> Tj
+<313330> Tj
ET
0.000 0.000 0.000 SCN
@@ -3346,7 +3470,7 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 277.2359999999995 Td
+60.24 240.27599999999947 Td
/F1.0 10.5 Tf
<31302e322e20> Tj
ET
@@ -3357,7 +3481,7 @@ ET
0.694 0.129 0.275 SCN
BT
-85.81800000000001 277.2359999999995 Td
+85.81800000000001 240.27599999999947 Td
/F3.0 10.5 Tf
<4d65747269637353657276696365> Tj
ET
@@ -3368,7 +3492,7 @@ ET
0.200 0.200 0.200 SCN
BT
-164.6457499999999 277.2359999999995 Td
+164.6457499999999 240.27599999999947 Td
/F1.0 10.5 Tf
<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
@@ -3377,7 +3501,7 @@ ET
0.000 0.000 0.000 scn
BT
-528.07175 277.2359999999995 Td
+528.07175 240.27599999999947 Td
/F1.0 5.25 Tf
<ca> Tj
ET
@@ -3386,9 +3510,9 @@ ET
0.200 0.200 0.200 SCN
BT
-529.4314999999999 277.2359999999995 Td
+529.4314999999999 240.27599999999947 Td
/F1.0 10.5 Tf
-<313334> Tj
+<313335> Tj
ET
0.000 0.000 0.000 SCN
@@ -3397,7 +3521,7 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 258.75599999999946 Td
+60.24 221.79599999999948 Td
/F1.0 10.5 Tf
<31302e332e20> Tj
ET
@@ -3408,7 +3532,7 @@ ET
0.694 0.129 0.275 SCN
BT
-85.81800000000001 258.75599999999946 Td
+85.81800000000001 221.79599999999948 Td
/F3.0 10.5 Tf
<5175657279526573756c74734361636865> Tj
ET
@@ -3419,7 +3543,7 @@ ET
0.200 0.200 0.200 SCN
BT
-180.6792499999999 258.75599999999946 Td
+180.6792499999999 221.79599999999948 Td
/F1.0 10.5 Tf
<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
@@ -3428,7 +3552,7 @@ ET
0.000 0.000 0.000 scn
BT
-528.07175 258.75599999999946 Td
+528.07175 221.79599999999948 Td
/F1.0 5.25 Tf
<ca> Tj
ET
@@ -3437,9 +3561,9 @@ ET
0.200 0.200 0.200 SCN
BT
-529.4314999999999 258.75599999999946 Td
+529.4314999999999 221.79599999999948 Td
/F1.0 10.5 Tf
-<313335> Tj
+<313336> Tj
ET
0.000 0.000 0.000 SCN
@@ -3448,7 +3572,7 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 240.27599999999947 Td
+60.24 203.3159999999995 Td
/F1.0 10.5 Tf
<31302e342e20> Tj
ET
@@ -3459,7 +3583,7 @@ ET
0.694 0.129 0.275 SCN
BT
-85.81800000000001 240.27599999999947 Td
+85.81800000000001 203.3159999999995 Td
/F3.0 10.5 Tf
<5265706f7369746f727953657276696365> Tj
ET
@@ -3470,7 +3594,7 @@ ET
0.200 0.200 0.200 SCN
BT
-180.6792499999999 240.27599999999947 Td
+180.6792499999999 203.3159999999995 Td
/F1.0 10.5 Tf
<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
@@ -3479,7 +3603,7 @@ ET
0.000 0.000 0.000 scn
BT
-528.07175 240.27599999999947 Td
+528.07175 203.3159999999995 Td
/F1.0 5.25 Tf
<ca> Tj
ET
@@ -3488,9 +3612,9 @@ ET
0.200 0.200 0.200 SCN
BT
-529.4314999999999 240.27599999999947 Td
+529.4314999999999 203.3159999999995 Td
/F1.0 10.5 Tf
-<313338> Tj
+<313339> Tj
ET
0.000 0.000 0.000 SCN
@@ -3499,7 +3623,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24 221.79599999999948 Td
+48.24 184.8359999999995 Td
/F1.0 10.5 Tf
[<31312e2050657273697374656e6365204c61> 20.01953125 <79657220535049>] TJ
ET
@@ -3510,7 +3634,7 @@ ET
0.200 0.200 0.200 SCN
BT
-175.33474999999993 221.79599999999948 Td
+175.33474999999993 184.8359999999995 Td
/F1.0 10.5 Tf
<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
@@ -3519,7 +3643,7 @@ ET
0.000 0.000 0.000 scn
BT
-528.07175 221.79599999999948 Td
+528.07175 184.8359999999995 Td
/F1.0 5.25 Tf
<ca> Tj
ET
@@ -3528,9 +3652,9 @@ ET
0.200 0.200 0.200 SCN
BT
-529.4314999999999 221.79599999999948 Td
+529.4314999999999 184.8359999999995 Td
/F1.0 10.5 Tf
-<313435> Tj
+<313436> Tj
ET
0.000 0.000 0.000 SCN
@@ -3539,7 +3663,7 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 203.3159999999995 Td
+60.24 166.3559999999995 Td
/F1.0 10.5 Tf
<31312e312e20> Tj
ET
@@ -3550,7 +3674,7 @@ ET
0.694 0.129 0.275 SCN
BT
-85.81800000000001 203.3159999999995 Td
+85.81800000000001 166.3559999999995 Td
/F3.0 10.5 Tf
<4175646974657253657276696365> Tj
ET
@@ -3561,7 +3685,7 @@ ET
0.200 0.200 0.200 SCN
BT
-164.6457499999999 203.3159999999995 Td
+164.6457499999999 166.3559999999995 Td
/F1.0 10.5 Tf
<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
@@ -3570,7 +3694,7 @@ ET
0.000 0.000 0.000 scn
BT
-528.07175 203.3159999999995 Td
+528.07175 166.3559999999995 Td
/F1.0 5.25 Tf
<ca> Tj
ET
@@ -3579,9 +3703,9 @@ ET
0.200 0.200 0.200 SCN
BT
-529.4314999999999 203.3159999999995 Td
+529.4314999999999 166.3559999999995 Td
/F1.0 10.5 Tf
-<313436> Tj
+<313437> Tj
ET
0.000 0.000 0.000 SCN
@@ -3590,7 +3714,7 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 184.8359999999995 Td
+60.24 147.87599999999952 Td
/F1.0 10.5 Tf
<31312e322e20> Tj
ET
@@ -3601,7 +3725,7 @@ ET
0.694 0.129 0.275 SCN
BT
-85.81800000000001 184.8359999999995 Td
+85.81800000000001 147.87599999999952 Td
/F3.0 10.5 Tf
<4175646974696e675365727669636533> Tj
ET
@@ -3612,16 +3736,27 @@ ET
0.200 0.200 0.200 SCN
BT
-175.33474999999993 184.8359999999995 Td
+169.818 147.87599999999952 Td
/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<20286465707265636174656429> 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
-528.07175 184.8359999999995 Td
+239.46874999999994 147.87599999999952 Td
+/F1.0 10.5 Tf
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+
+BT
+528.07175 147.87599999999952 Td
/F1.0 5.25 Tf
<ca> Tj
ET
@@ -3630,9 +3765,9 @@ ET
0.200 0.200 0.200 SCN
BT
-529.4314999999999 184.8359999999995 Td
+529.4314999999999 147.87599999999952 Td
/F1.0 10.5 Tf
-<313439> Tj
+<313530> Tj
ET
0.000 0.000 0.000 SCN
@@ -3641,7 +3776,7 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 166.3559999999995 Td
+60.24 129.39599999999953 Td
/F1.0 10.5 Tf
<31312e332e20> Tj
ET
@@ -3652,7 +3787,7 @@ ET
0.694 0.129 0.275 SCN
BT
-85.81800000000001 166.3559999999995 Td
+85.81800000000001 129.39599999999953 Td
/F3.0 10.5 Tf
<4576656e7453657269616c697a6572> Tj
ET
@@ -3663,16 +3798,27 @@ ET
0.200 0.200 0.200 SCN
BT
-169.99024999999995 166.3559999999995 Td
+164.568 129.39599999999953 Td
/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<20286465707265636174656429> 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
-528.07175 166.3559999999995 Td
+234.12424999999996 129.39599999999953 Td
+/F1.0 10.5 Tf
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+
+BT
+528.07175 129.39599999999953 Td
/F1.0 5.25 Tf
<ca> Tj
ET
@@ -3681,9 +3827,9 @@ ET
0.200 0.200 0.200 SCN
BT
-529.4314999999999 166.3559999999995 Td
+529.4314999999999 129.39599999999953 Td
/F1.0 10.5 Tf
-<313530> Tj
+<313531> Tj
ET
0.000 0.000 0.000 SCN
@@ -3692,7 +3838,7 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 147.87599999999952 Td
+60.24 110.91599999999954 Td
/F1.0 10.5 Tf
<31312e342e20> Tj
ET
@@ -3703,7 +3849,7 @@ ET
0.694 0.129 0.275 SCN
BT
-85.81800000000001 147.87599999999952 Td
+85.81800000000001 110.91599999999954 Td
/F3.0 10.5 Tf
<5075626c697368657253657276696365> Tj
ET
@@ -3714,7 +3860,7 @@ ET
0.200 0.200 0.200 SCN
BT
-175.33474999999993 147.87599999999952 Td
+175.33474999999993 110.91599999999954 Td
/F1.0 10.5 Tf
<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
@@ -3723,7 +3869,7 @@ ET
0.000 0.000 0.000 scn
BT
-528.07175 147.87599999999952 Td
+528.07175 110.91599999999954 Td
/F1.0 5.25 Tf
<ca> Tj
ET
@@ -3732,7 +3878,7 @@ ET
0.200 0.200 0.200 SCN
BT
-529.4314999999999 147.87599999999952 Td
+529.4314999999999 110.91599999999954 Td
/F1.0 10.5 Tf
<313533> Tj
ET
@@ -3743,7 +3889,7 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 129.39599999999953 Td
+60.24 92.43599999999955 Td
/F1.0 10.5 Tf
<31312e352e20> Tj
ET
@@ -3754,7 +3900,7 @@ ET
0.694 0.129 0.275 SCN
BT
-85.81800000000001 129.39599999999953 Td
+85.81800000000001 92.43599999999955 Td
/F3.0 10.5 Tf
<5075626c697368696e6753657276696365> Tj
ET
@@ -3765,16 +3911,27 @@ ET
0.200 0.200 0.200 SCN
BT
-180.6792499999999 129.39599999999953 Td
+175.068 92.43599999999955 Td
/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<20286465707265636174656429> 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
+244.81324999999993 92.43599999999955 Td
+/F1.0 10.5 Tf
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
BT
-528.07175 129.39599999999953 Td
+528.07175 92.43599999999955 Td
/F1.0 5.25 Tf
<ca> Tj
ET
@@ -3783,7 +3940,7 @@ ET
0.200 0.200 0.200 SCN
BT
-529.4314999999999 129.39599999999953 Td
+529.4314999999999 92.43599999999955 Td
/F1.0 10.5 Tf
<313536> Tj
ET
@@ -3794,7 +3951,7 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 110.91599999999954 Td
+60.24 73.95599999999956 Td
/F1.0 10.5 Tf
<31312e362e20> Tj
ET
@@ -3805,7 +3962,7 @@ ET
0.694 0.129 0.275 SCN
BT
-85.81800000000001 110.91599999999954 Td
+85.81800000000001 73.95599999999956 Td
/F3.0 10.5 Tf
<55736572526567697374726174696f6e53657276696365> Tj
ET
@@ -3816,7 +3973,7 @@ ET
0.200 0.200 0.200 SCN
BT
-207.40174999999994 110.91599999999954 Td
+207.40174999999994 73.95599999999956 Td
/F1.0 10.5 Tf
<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
@@ -3825,7 +3982,7 @@ ET
0.000 0.000 0.000 scn
BT
-528.07175 110.91599999999954 Td
+528.07175 73.95599999999956 Td
/F1.0 5.25 Tf
<ca> Tj
ET
@@ -3834,7 +3991,7 @@ ET
0.200 0.200 0.200 SCN
BT
-529.4314999999999 110.91599999999954 Td
+529.4314999999999 73.95599999999956 Td
/F1.0 10.5 Tf
<313631> Tj
ET
@@ -3845,7 +4002,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24 92.43599999999955 Td
+48.24 55.47599999999957 Td
/F1.0 10.5 Tf
[<31322e20426f6f74737472> 20.01953125 <617070696e6720535049>] TJ
ET
@@ -3856,7 +4013,7 @@ ET
0.200 0.200 0.200 SCN
BT
-159.30124999999992 92.43599999999955 Td
+159.30124999999992 55.47599999999957 Td
/F1.0 10.5 Tf
<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
@@ -3865,7 +4022,7 @@ ET
0.000 0.000 0.000 scn
BT
-528.07175 92.43599999999955 Td
+528.07175 55.47599999999957 Td
/F1.0 5.25 Tf
<ca> Tj
ET
@@ -3874,18 +4031,43 @@ ET
0.200 0.200 0.200 SCN
BT
-529.4314999999999 92.43599999999955 Td
+529.4314999999999 55.47599999999957 Td
/F1.0 10.5 Tf
<313634> 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 42 0 R
+/F5.0 58 0 R
+>>
+>>
+/Annots [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 2063 0 R 2064 0 R 2065 0 R 2066 0 R 2067 0 R 2068 0 R 2069 0 R 2070 0 R 2071 0 R 2072 0 R 2073 0 R 2074 0 R 2075 0 R 2076 0 R 2077 0 R 2078 0 R 2079 0 R 2080 0 R 2081 0 R 2082 0 R 2083 0 R 2084 0 R 2085 0 R 2086 0 R 2087 0 R 2088 0 R 2089 0 R 2090 0 R 2091 0 R 2092 0 R 2093 0 R 2094 0 R 2095 0 R 2096 0 R 2097 0 R 2098 0 R 2099 0 R 2100 0 R 2101 0 R 2102 0 R 2103 0 R 2104 0 R 2105 0 R 2106 0 R 2107 0 R 2108 0 R 2109 0 R 2110 0 R 2111 0 R 2112 0 R 2113 0 R 2114 0 R 2115 0 R 2116 0 R 2117 0 R 2118 0 R 2119 0 R 2120 0 R 2121 0 R 2122 0 R 2123 0 R 2124 0 R 2125 0 R 2126 0 R 2127 0 R 2128 0 R 2129 0 R 2130 0 R 2131 0 R 2132 0 R 2133 0 R 2134 0 R 2135 0 R 2136 0
R 2137 0 R 2138 0 R 2139 0 R 2140 0 R 2141 0 R 2142 0 R 2143 0 R 2144 0 R 2145 0 R 2146 0 R 2147 0 R 2148 0 R 2149 0 R]
+>>
+endobj
+13 0 obj
+<< /Length 1006
+>>
+stream
+q
+/DeviceRGB cs
0.200 0.200 0.200 scn
+/DeviceRGB CS
0.200 0.200 0.200 SCN
BT
-60.24 73.95599999999956 Td
+60.24 794.6759999999999 Td
/F1.0 10.5 Tf
<31322e312e20> Tj
ET
@@ -3896,7 +4078,7 @@ ET
0.694 0.129 0.275 SCN
BT
-85.81800000000001 73.95599999999956 Td
+85.81800000000001 794.6759999999999 Td
/F3.0 10.5 Tf
<436c617373446973636f7665727953657276696365> Tj
ET
@@ -3907,7 +4089,7 @@ ET
0.200 0.200 0.200 SCN
BT
-202.05724999999995 73.95599999999956 Td
+202.05724999999995 794.6759999999999 Td
/F1.0 10.5 Tf
<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
@@ -3916,7 +4098,7 @@ ET
0.000 0.000 0.000 scn
BT
-528.07175 73.95599999999956 Td
+528.07175 794.6759999999999 Td
/F1.0 5.25 Tf
<ca> Tj
ET
@@ -3925,7 +4107,7 @@ ET
0.200 0.200 0.200 SCN
BT
-529.4314999999999 73.95599999999956 Td
+529.4314999999999 794.6759999999999 Td
/F1.0 10.5 Tf
<313634> Tj
ET
@@ -3936,21 +4118,20 @@ Q
endstream
endobj
-12 0 obj
+14 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 11 0 R
+/Contents 13 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/Font << /F1.0 8 0 R
-/F3.0 40 0 R
-/F5.0 56 0 R
+/F3.0 42 0 R
>>
>>
-/Annots [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 2063 0 R 2064 0 R 2065 0 R 2066 0 R 2067 0 R 2068 0 R 2069 0 R 2070 0 R 2071 0 R 2072 0 R 2073 0 R 2074 0 R 2075 0 R 2076 0 R 2077 0 R 2078 0 R 2079 0 R 2080 0 R 2081 0 R 2082 0 R 2083 0 R 2084 0 R 2085 0 R 2086 0 R 2087 0 R 2088 0 R 2089 0 R 2090 0 R 2091 0 R 2092 0 R 2093 0 R 2094 0 R 2095 0 R 2096 0 R 2097 0 R 2098 0 R 2099 0 R 2100 0 R 2101 0 R 2102 0 R 2103 0 R 2104 0 R 2105 0 R 2106 0 R 2107 0 R 2108 0 R 2109 0 R 2110 0 R 2111 0 R 2112 0
R 2113 0 R 2114 0 R 2115 0 R 2116 0 R 2117 0 R]
+/Annots [2150 0 R 2151 0 R 2152 0 R]
>>
endobj
-13 0 obj
+15 0 obj
<< /Length 9008
>>
stream
@@ -4519,48 +4700,48 @@ Q
endstream
endobj
-14 0 obj
+16 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 13 0 R
+/Contents 15 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F2.0 18 0 R
+/Font << /F2.0 20 0 R
/F1.0 8 0 R
>>
-/XObject << /Stamp1 2118 0 R
+/XObject << /Stamp1 2153 0 R
>>
>>
-/Annots [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]
+/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]
>>
endobj
-15 0 obj
-[14 0 R /XYZ 0 841.89 null]
+17 0 obj
+[16 0 R /XYZ 0 841.89 null]
endobj
-16 0 obj
+18 0 obj
<< /Type /Names
-/Dests 17 0 R
+/Dests 19 0 R
>>
endobj
-17 0 obj
-<< /Kids [1430 0 R 1431 0 R]
+19 0 obj
+<< /Kids [1434 0 R 1435 0 R]
>>
endobj
-18 0 obj
+20 0 obj
<< /Type /Font
/BaseFont /AAAACH+NotoSerif-Bold
/Subtype /TrueType
-/FontDescriptor 2206 0 R
+/FontDescriptor 2243 0 R
/FirstChar 32
/LastChar 255
-/Widths 2208 0 R
-/ToUnicode 2207 0 R
+/Widths 2245 0 R
+/ToUnicode 2244 0 R
>>
endobj
-19 0 obj
-[14 0 R /XYZ 0 705.83 null]
+21 0 obj
+[16 0 R /XYZ 0 705.83 null]
endobj
-20 0 obj
+22 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -4571,7 +4752,7 @@ endobj
/Type /Annot
>>
endobj
-21 0 obj
+23 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -4582,7 +4763,7 @@ endobj
/Type /Annot
>>
endobj
-22 0 obj
+24 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -4593,7 +4774,7 @@ endobj
/Type /Annot
>>
endobj
-23 0 obj
+25 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -4604,7 +4785,7 @@ endobj
/Type /Annot
>>
endobj
-24 0 obj
+26 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -4615,7 +4796,7 @@ endobj
/Type /Annot
>>
endobj
-25 0 obj
+27 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -4626,7 +4807,7 @@ endobj
/Type /Annot
>>
endobj
-26 0 obj
+28 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -4637,7 +4818,7 @@ endobj
/Type /Annot
>>
endobj
-27 0 obj
+29 0 obj
<< /Border [0 0 0]
/Dest ()
/Subtype /Link
@@ -4645,7 +4826,7 @@ endobj
/Type /Annot
>>
endobj
-28 0 obj
+30 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -4656,7 +4837,7 @@ endobj
/Type /Annot
>>
endobj
-29 0 obj
+31 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -4667,7 +4848,7 @@ endobj
/Type /Annot
>>
endobj
-30 0 obj
+32 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -4678,7 +4859,7 @@ endobj
/Type /Annot
>>
endobj
-31 0 obj
+33 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -4689,7 +4870,7 @@ endobj
/Type /Annot
>>
endobj
-32 0 obj
+34 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -4700,7 +4881,7 @@ endobj
/Type /Annot
>>
endobj
-33 0 obj
+35 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -4711,7 +4892,7 @@ endobj
/Type /Annot
>>
endobj
-34 0 obj
+36 0 obj
<< /Length 7036
>>
stream
@@ -5096,30 +5277,30 @@ Q
endstream
endobj
-35 0 obj
+37 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 34 0 R
+/Contents 36 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F2.0 18 0 R
+/Font << /F2.0 20 0 R
/F1.0 8 0 R
-/F3.0 40 0 R
+/F3.0 42 0 R
>>
-/XObject << /I1 38 0 R
-/Stamp1 2118 0 R
+/XObject << /I1 40 0 R
+/Stamp1 2153 0 R
>>
>>
-/Annots [39 0 R 41 0 R 42 0 R 43 0 R 44 0 R 45 0 R]
+/Annots [41 0 R 43 0 R 44 0 R 45 0 R 46 0 R 47 0 R]
>>
endobj
-36 0 obj
-[35 0 R /XYZ 0 841.89 null]
+38 0 obj
+[37 0 R /XYZ 0 841.89 null]
endobj
-37 0 obj
-[35 0 R /XYZ 0 765.1700000000001 null]
+39 0 obj
+[37 0 R /XYZ 0 765.1700000000001 null]
endobj
-38 0 obj
+40 0 obj
<< /Type /XObject
/Subtype /Image
/Height 610
@@ -5233,7 +5414,7 @@ Ts,
\\ufffd\ufffd\ufffd\ufffdE-/\u0698\ufffd\ufffd\ufffd\ufffd0>+\ufffd\ufffd\ufffdj\ufffdd#/&`\ufffd \ufffd\ufffdd\ufffdDu\ufffd\ufffd\ufffd\ufffd\ufffd7\ufffd \ufffd%\ufffd\ufffd\ufffdr{\u02bb @\ufffdU\ufffd\ufffd\ufffd\ufffd!\ufffd\ufffdo\ufffd\ufffd (QH_B\ufffd\ufffd\ufffd\ufffdC m\ufffd \ufffdD ( \ufffdJ 0\ufffd \ufffd\ufffdD c( \ufffdXU\ufffd \ufffd?t.0V\ufffd\ufffdD\ufffd\ufffdW\ufffd~] \ufffdVt.0V\ufffd\ufffdDO-ZW\ufffdu \ufffd\ufffdp\ufffd\ufffd\ufffdv.0V\ufffd\ufffdD\ufffdB!UJD!\ufffd\ufffdB!\ufffd\ufffdD\ufffdB!M\ufffd\ufffdB!\ufffd\ufffdB!\ufffd4Q"B!\ufffd\ufffd&JD!\ufffd\ufffdD\ufffd!\ufffdB\ufffd(!\ufffdBH%"\ufffdBi\ufffdD\ufffdB!M\ufffd\ufffdB!\ufffd\ufffdB!\ufffd4Q"B!\ufffd\ufffd&JD!\ufffd\ufffdD\ufffd!\ufffdB\ufffd(!\ufffdB\ufffd\ufffd\ufffd \ufffd[\ufffd
endstream
endobj
-39 0 obj
+41 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -5244,18 +5425,18 @@ endobj
/Type /Annot
>>
endobj
-40 0 obj
+42 0 obj
<< /Type /Font
/BaseFont /AAAACI+mplus1mn-regular
/Subtype /TrueType
-/FontDescriptor 2210 0 R
+/FontDescriptor 2247 0 R
/FirstChar 32
/LastChar 255
-/Widths 2212 0 R
-/ToUnicode 2211 0 R
+/Widths 2249 0 R
+/ToUnicode 2248 0 R
>>
endobj
-41 0 obj
+43 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_api_EmailService)
/Subtype /Link
@@ -5263,7 +5444,7 @@ endobj
/Type /Annot
>>
endobj
-42 0 obj
+44 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -5274,7 +5455,7 @@ endobj
/Type /Annot
>>
endobj
-43 0 obj
+45 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -5285,7 +5466,7 @@ endobj
/Type /Annot
>>
endobj
-44 0 obj
+46 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_api_EventBusService)
/Subtype /Link
@@ -5293,7 +5474,7 @@ endobj
/Type /Annot
>>
endobj
-45 0 obj
+47 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -5304,7 +5485,7 @@ endobj
/Type /Annot
>>
endobj
-46 0 obj
+48 0 obj
<< /Length 27848
>>
stream
@@ -7166,29 +7347,29 @@ Q
endstream
endobj
-47 0 obj
+49 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 46 0 R
+/Contents 48 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F2.0 18 0 R
+/Font << /F2.0 20 0 R
/F1.0 8 0 R
-/F3.0 40 0 R
-/F4.0 51 0 R
-/F3.1 52 0 R
-/F5.0 56 0 R
+/F3.0 42 0 R
+/F4.0 53 0 R
+/F3.1 54 0 R
+/F5.0 58 0 R
>>
-/XObject << /Stamp1 2118 0 R
+/XObject << /Stamp1 2153 0 R
>>
>>
-/Annots [49 0 R 53 0 R 54 0 R 55 0 R 57 0 R]
+/Annots [51 0 R 55 0 R 56 0 R 57 0 R 59 0 R]
>>
endobj
-48 0 obj
-[47 0 R /XYZ 0 841.89 null]
+50 0 obj
+[49 0 R /XYZ 0 841.89 null]
endobj
-49 0 obj
+51 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -7199,32 +7380,32 @@ endobj
/Type /Annot
>>
endobj
-50 0 obj
-[47 0 R /XYZ 0 604.59 null]
+52 0 obj
+[49 0 R /XYZ 0 604.59 null]
endobj
-51 0 obj
+53 0 obj
<< /Type /Font
/BaseFont /AAAACJ+mplus1mn-bold
/Subtype /TrueType
-/FontDescriptor 2214 0 R
+/FontDescriptor 2251 0 R
/FirstChar 32
/LastChar 255
-/Widths 2216 0 R
-/ToUnicode 2215 0 R
+/Widths 2253 0 R
+/ToUnicode 2252 0 R
>>
endobj
-52 0 obj
+54 0 obj
<< /Type /Font
/BaseFont /AAAACK+mplus1mn-regular
/Subtype /TrueType
-/FontDescriptor 2218 0 R
+/FontDescriptor 2255 0 R
/FirstChar 32
/LastChar 255
-/Widths 2220 0 R
-/ToUnicode 2219 0 R
+/Widths 2257 0 R
+/ToUnicode 2256 0 R
>>
endobj
-53 0 obj
+55 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_api_FactoryService)
/Subtype /Link
@@ -7232,7 +7413,7 @@ endobj
/Type /Annot
>>
endobj
-54 0 obj
+56 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_api_DomainObjectContainer)
/Subtype /Link
@@ -7240,7 +7421,7 @@ endobj
/Type /Annot
>>
endobj
-55 0 obj
+57 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_api_ServiceRegistry)
/Subtype /Link
@@ -7248,18 +7429,18 @@ endobj
/Type /Annot
>>
endobj
-56 0 obj
+58 0 obj
<< /Type /Font
/BaseFont /AAAACL+mplus-1p-regular
/Subtype /TrueType
-/FontDescriptor 2222 0 R
+/FontDescriptor 2259 0 R
/FirstChar 32
/LastChar 255
-/Widths 2224 0 R
-/ToUnicode 2223 0 R
+/Widths 2261 0 R
+/ToUnicode 2260 0 R
>>
endobj
-57 0 obj
+59 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_api_DomainObjectContainer)
/Subtype /Link
@@ -7267,7 +7448,7 @@ endobj
/Type /Annot
>>
endobj
-58 0 obj
+60 0 obj
<< /Length 16247
>>
stream
@@ -8309,29 +8490,29 @@ Q
endstream
endobj
-59 0 obj
+61 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 58 0 R
+/Contents 60 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F2.0 18 0 R
+/Font << /F2.0 20 0 R
/F1.0 8 0 R
-/F3.0 40 0 R
-/F6.1 62 0 R
-/F3.1 52 0 R
-/F4.0 51 0 R
+/F3.0 42 0 R
+/F6.1 64 0 R
+/F3.1 54 0 R
+/F4.0 53 0 R
>>
-/XObject << /Stamp1 2118 0 R
+/XObject << /Stamp1 2153 0 R
>>
>>
-/Annots [61 0 R 63 0 R 64 0 R 65 0 R 66 0 R]
+/Annots [63 0 R 65 0 R 66 0 R 67 0 R 68 0 R]
>>
endobj
-60 0 obj
-[59 0 R /XYZ 0 841.89 null]
+62 0 obj
+[61 0 R /XYZ 0 841.89 null]
endobj
-61 0 obj
+63 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -8342,18 +8523,18 @@ endobj
/Type /Annot
>>
endobj
-62 0 obj
+64 0 obj
<< /Type /Font
/BaseFont /AAAACM+FontAwesome
/Subtype /TrueType
-/FontDescriptor 2226 0 R
+/FontDescriptor 2263 0 R
/FirstChar 32
/LastChar 255
-/Widths 2228 0 R
-/ToUnicode 2227 0 R
+/Widths 2265 0 R
+/ToUnicode 2264 0 R
>>
endobj
-63 0 obj
+65 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_spi_ContentMappingService)
/Subtype /Link
@@ -8361,7 +8542,7 @@ endobj
/Type /Annot
>>
endobj
-64 0 obj
+66 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_spi_GridSystemService)
/Subtype /Link
@@ -8369,7 +8550,7 @@ endobj
/Type /Annot
>>
endobj
-65 0 obj
+67 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_spi_RoutingService)
/Subtype /Link
@@ -8377,7 +8558,7 @@ endobj
/Type /Annot
>>
endobj
-66 0 obj
+68 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_api_LocaleProvider)
/Subtype /Link
@@ -8385,7 +8566,7 @@ endobj
/Type /Annot
>>
endobj
-67 0 obj
+69 0 obj
<< /Length 24045
>>
stream
@@ -10001,40 +10182,40 @@ Q
endstream
endobj
-68 0 obj
+70 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 67 0 R
+/Contents 69 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F3.0 40 0 R
-/F3.1 52 0 R
-/F4.0 51 0 R
+/Font << /F3.0 42 0 R
+/F3.1 54 0 R
+/F4.0 53 0 R
/F1.0 8 0 R
-/F7.0 69 0 R
-/F2.0 18 0 R
+/F7.0 71 0 R
+/F2.0 20 0 R
>>
-/XObject << /Stamp1 2118 0 R
+/XObject << /Stamp1 2153 0 R
>>
>>
-/Annots [71 0 R 72 0 R]
+/Annots [73 0 R 74 0 R]
>>
endobj
-69 0 obj
+71 0 obj
<< /Type /Font
/BaseFont /AAAACN+NotoSerif-Italic
/Subtype /TrueType
-/FontDescriptor 2230 0 R
+/FontDescriptor 2267 0 R
/FirstChar 32
/LastChar 255
-/Widths 2232 0 R
-/ToUnicode 2231 0 R
+/Widths 2269 0 R
+/ToUnicode 2268 0 R
>>
endobj
-70 0 obj
-[68 0 R /XYZ 0 361.15000000000003 null]
+72 0 obj
+[70 0 R /XYZ 0 361.15000000000003 null]
endobj
-71 0 obj
+73 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_api_CommandContext)
/Subtype /Link
@@ -10042,7 +10223,7 @@ endobj
/Type /Annot
>>
endobj
-72 0 obj
+74 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_spi_CommandService)
/Subtype /Link
@@ -10050,7 +10231,7 @@ endobj
/Type /Annot
>>
endobj
-73 0 obj
+75 0 obj
<< /Length 27055
>>
stream
@@ -11746,24 +11927,24 @@ Q
endstream
endobj
-74 0 obj
+76 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 73 0 R
+/Contents 75 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/Font << /F1.0 8 0 R
-/F3.0 40 0 R
-/F5.0 56 0 R
-/F6.1 62 0 R
+/F3.0 42 0 R
+/F5.0 58 0 R
+/F6.1 64 0 R
>>
-/XObject << /Stamp1 2118 0 R
+/XObject << /Stamp1 2153 0 R
>>
>>
-/Annots [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]
+/Annots [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]
>>
endobj
-75 0 obj
+77 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -11774,7 +11955,7 @@ endobj
/Type /Annot
>>
endobj
-76 0 obj
+78 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -11785,7 +11966,7 @@ endobj
/Type /Annot
>>
endobj
-77 0 obj
+79 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -11796,7 +11977,7 @@ endobj
/Type /Annot
>>
endobj
-78 0 obj
+80 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -11807,7 +11988,7 @@ endobj
/Type /Annot
>>
endobj
-79 0 obj
+81 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -11818,7 +11999,7 @@ endobj
/Type /Annot
>>
endobj
-80 0 obj
+82 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -11829,7 +12010,7 @@ endobj
/Type /Annot
>>
endobj
-81 0 obj
+83 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_api_InteractionContext)
/Subtype /Link
@@ -11837,7 +12018,7 @@ endobj
/Type /Annot
>>
endobj
-82 0 obj
+84 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_api_WrapperFactory)
/Subtype /Link
@@ -11845,7 +12026,7 @@ endobj
/Type /Annot
>>
endobj
-83 0 obj
+85 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -11856,7 +12037,7 @@ endobj
/Type /Annot
>>
endobj
-84 0 obj
+86 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -11867,7 +12048,7 @@ endobj
/Type /Annot
>>
endobj
-85 0 obj
+87 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -11878,7 +12059,7 @@ endobj
/Type /Annot
>>
endobj
-86 0 obj
+88 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -11889,7 +12070,7 @@ endobj
/Type /Annot
>>
endobj
-87 0 obj
+89 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_api_MetricsService)
/Subtype /Link
@@ -11897,7 +12078,7 @@ endobj
/Type /Annot
>>
endobj
-88 0 obj
+90 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -11908,7 +12089,7 @@ endobj
/Type /Annot
>>
endobj
-89 0 obj
+91 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -11919,7 +12100,7 @@ endobj
/Type /Annot
>>
endobj
-90 0 obj
+92 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -11930,7 +12111,7 @@ endobj
/Type /Annot
>>
endobj
-91 0 obj
+93 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_spi_PublishingService)
/Subtype /Link
@@ -11938,7 +12119,7 @@ endobj
/Type /Annot
>>
endobj
-92 0 obj
+94 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_spi_PublisherService)
/Subtype /Link
@@ -11946,7 +12127,7 @@ endobj
/Type /Annot
>>
endobj
-93 0 obj
+95 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -11957,7 +12138,7 @@ endobj
/Type /Annot
>>
endobj
-94 0 obj
+96 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -11968,7 +12149,7 @@ endobj
/Type /Annot
>>
endobj
-95 0 obj
+97 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_api_TransactionService)
/Subtype /Link
@@ -11976,7 +12157,7 @@ endobj
/Type /Annot
>>
endobj
-96 0 obj
+98 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_spi_AuditerService)
/Subtype /Link
@@ -11984,7 +12165,7 @@ endobj
/Type /Annot
>>
endobj
-97 0 obj
+99 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_spi_AuditingService)
/Subtype /Link
@@ -11992,7 +12173,7 @@ endobj
/Type /Annot
>>
endobj
-98 0 obj
+100 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -12003,7 +12184,7 @@ endobj
/Type /Annot
>>
endobj
-99 0 obj
+101 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_spi_CommandService)
/Subtype /Link
@@ -12011,7 +12192,7 @@ endobj
/Type /Annot
>>
endobj
-100 0 obj
+102 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -12022,7 +12203,7 @@ endobj
/Type /Annot
>>
endobj
-101 0 obj
+103 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_spi_PublisherService)
/Subtype /Link
@@ -12030,7 +12211,7 @@ endobj
/Type /Annot
>>
endobj
-102 0 obj
+104 0 obj
<< /Length 3454
>>
stream
@@ -12233,22 +12414,22 @@ Q
endstream
endobj
-103 0 obj
+105 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 102 0 R
+/Contents 104 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/Font << /F1.0 8 0 R
-/F3.0 40 0 R
+/F3.0 42 0 R
>>
-/XObject << /Stamp1 2118 0 R
+/XObject << /Stamp1 2153 0 R
>>
>>
-/Annots [104 0 R 105 0 R 106 0 R]
+/Annots [106 0 R 107 0 R 108 0 R]
>>
endobj
-104 0 obj
+106 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_spi_PublisherService)
/Subtype /Link
@@ -12256,7 +12437,7 @@ endobj
/Type /Annot
>>
endobj
-105 0 obj
+107 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -12267,7 +12448,7 @@ endobj
/Type /Annot
>>
endobj
-106 0 obj
+108 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -12278,7 +12459,7 @@ endobj
/Type /Annot
>>
endobj
-107 0 obj
+109 0 obj
<< /Length 17766
>>
stream
@@ -13520,27 +13701,27 @@ Q
endstream
endobj
-108 0 obj
+110 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 107 0 R
+/Contents 109 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F2.0 18 0 R
+/Font << /F2.0 20 0 R
/F1.0 8 0 R
-/F7.0 69 0 R
-/F3.0 40 0 R
+/F7.0 71 0 R
+/F3.0 42 0 R
>>
-/XObject << /Stamp1 2118 0 R
+/XObject << /Stamp1 2153 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]
+/Annots [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]
>>
endobj
-109 0 obj
-[108 0 R /XYZ 0 841.89 null]
+111 0 obj
+[110 0 R /XYZ 0 841.89 null]
endobj
-110 0 obj
+112 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -13551,7 +13732,7 @@ endobj
/Type /Annot
>>
endobj
-111 0 obj
+113 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_spi_ContentMappingService)
/Subtype /Link
@@ -13559,7 +13740,7 @@ endobj
/Type /Annot
>>
endobj
-112 0 obj
+114 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_spi_ContentMappingService)
/Subtype /Link
@@ -13567,7 +13748,7 @@ endobj
/Type /Annot
>>
endobj
-113 0 obj
+115 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_spi_ContentMappingService)
/Subtype /Link
@@ -13575,7 +13756,7 @@ endobj
/Type /Annot
>>
endobj
-114 0 obj
+116 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_spi_ContentMappingService)
/Subtype /Link
@@ -13583,7 +13764,7 @@ endobj
/Type /Annot
>>
endobj
-115 0 obj
+117 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_spi_ContentMappingService)
/Subtype /Link
@@ -13591,7 +13772,7 @@ endobj
/Type /Annot
>>
endobj
-116 0 obj
+118 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_spi_EmailNotificationService)
/Subtype /Link
@@ -13599,7 +13780,7 @@ endobj
/Type /Annot
>>
endobj
-117 0 obj
+119 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_spi_EmailNotificationService)
/Subtype /Link
@@ -13607,7 +13788,7 @@ endobj
/Type /Annot
>>
endobj
-118 0 obj
+120 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_spi_EmailNotificationService)
/Subtype /Link
@@ -13615,7 +13796,7 @@ endobj
/Type /Annot
>>
endobj
-119 0 obj
+121 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_spi_EmailNotificationService)
/Subtype /Link
@@ -13623,7 +13804,7 @@ endobj
/Type /Annot
>>
endobj
-120 0 obj
+122 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_spi_EmailNotificationService)
/Subtype /Link
@@ -13631,7 +13812,7 @@ endobj
/Type /Annot
>>
endobj
-121 0 obj
+123 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_spi_EmailNotificationService)
/Subtype /Link
@@ -13639,7 +13820,7 @@ endobj
/Type /Annot
>>
endobj
-122 0 obj
+124 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_spi_UserRegistrationService)
/Subtype /Link
@@ -13647,7 +13828,7 @@ endobj
/Type /Annot
>>
endobj
-123 0 obj
+125 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_spi_ErrorReportingService)
/Subtype /Link
@@ -13655,7 +13836,7 @@ endobj
/Type /Annot
>>
endobj
-124 0 obj
+126 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_spi_ErrorReportingService)
/Subtype /Link
@@ -13663,7 +13844,7 @@ endobj
/Type /Annot
>>
endobj
-125 0 obj
+127 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_spi_ErrorReportingService)
/Subtype /Link
@@ -13671,7 +13852,7 @@ endobj
/Type /Annot
>>
endobj
-126 0 obj
+128 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_spi_ErrorReportingService)
/Subtype /Link
@@ -13679,7 +13860,7 @@ endobj
/Type /Annot
>>
endobj
-127 0 obj
+129 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_spi_ErrorReportingService)
/Subtype /Link
@@ -13687,7 +13868,7 @@ endobj
/Type /Annot
>>
endobj
-128 0 obj
+130 0 obj
<< /Length 28878
>>
stream
@@ -15748,23 +15929,23 @@ Q
endstream
endobj
-129 0 obj
+131 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 128 0 R
+/Contents 130 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F2.0 18 0 R
-/F3.0 40 0 R
+/Font << /F2.0 20 0 R
+/F3.0 42 0 R
/F1.0 8 0 R
>>
-/XObject << /Stamp1 2118 0 R
+/XObject << /Stamp1 2153 0 R
>>
>>
-/Annots [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 152 0 R 153 0 R 154 0 R 155 0 R 156 0 R 157 0 R 158 0 R 159 0 R 160 0 R 161 0 R 162 0 R]
+/Annots [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 152 0 R 153 0 R 154 0 R 155 0 R 156 0 R 157 0 R 158 0 R 159 0 R 160 0 R 161 0 R 162 0 R 163 0 R 164 0 R]
>>
endobj
-130 0 obj
+132 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_spi_ExceptionRecognizer)
/Subtype /Link
@@ -15772,7 +15953,7 @@ endobj
/Type /Annot
>>
endobj
-131 0 obj
+133 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_spi_ExceptionRecognizer)
/Subtype /Link
@@ -15780,7 +15961,7 @@ endobj
/Type /Annot
>>
endobj
-132 0 obj
+134 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_spi_ExceptionRecognizer)
/Subtype /Link
@@ -15788,7 +15969,7 @@ endobj
/Type /Annot
>>
endobj
-133 0 obj
+135 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_spi_ExceptionRecognizer)
/Subtype /Link
@@ -15796,7 +15977,7 @@ endobj
/Type /Annot
>>
endobj
-134 0 obj
+136 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_spi_ExceptionRecognizer)
/Subtype /Link
@@ -15804,7 +15985,7 @@ endobj
/Type /Annot
>>
endobj
-135 0 obj
+137 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_spi_GridSystemService)
/Subtype /Link
@@ -15812,7 +15993,7 @@ endobj
/Type /Annot
>>
endobj
-136 0 obj
+138 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_spi_GridSystemService)
/Subtype /Link
@@ -15820,7 +16001,7 @@ endobj
/Type /Annot
>>
endobj
-137 0 obj
+139 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_spi_GridSystemService)
/Subtype /Link
@@ -15828,7 +16009,7 @@ endobj
/Type /Annot
>>
endobj
-138 0 obj
+140 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_spi_GridSystemService)
/Subtype /Link
@@ -15836,7 +16017,7 @@ endobj
/Type /Annot
>>
endobj
-139 0 obj
+141 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_spi_GridSystemService)
/Subtype /Link
@@ -15844,7 +16025,7 @@ endobj
/Type /Annot
>>
endobj
-140 0 obj
+142 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_spi_GridLoaderService)
/Subtype /Link
@@ -15852,7 +16033,7 @@ endobj
/Type /Annot
>>
endobj
-141 0 obj
+143 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_spi_GridLoaderService)
/Subtype /Link
@@ -15860,7 +16041,7 @@ endobj
/Type /Annot
>>
endobj
-142 0 obj
+144 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_spi_GridLoaderService)
/Subtype /Link
@@ -15868,7 +16049,7 @@ endobj
/Type /Annot
>>
endobj
-143 0 obj
+145 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_spi_GridLoaderService)
/Subtype /Link
@@ -15876,7 +16057,7 @@ endobj
/Type /Annot
>>
endobj
-144 0 obj
+146 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_spi_GridLoaderService)
/Subtype /Link
@@ -15884,7 +16065,7 @@ endobj
/Type /Annot
>>
endobj
-145 0 obj
+147 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_spi_GridService)
/Subtype /Link
@@ -15892,7 +16073,7 @@ endobj
/Type /Annot
>>
endobj
-146 0 obj
+148 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_spi_GridService)
/Subtype /Link
@@ -15900,7 +16081,7 @@ endobj
/Type /Annot
>>
endobj
-147 0 obj
+149 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_spi_GridService)
/Subtype /Link
@@ -15908,7 +16089,7 @@ endobj
/Type /Annot
>>
endobj
-148 0 obj
+150 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_spi_GridService)
/Subtype /Link
@@ -15916,7 +16097,7 @@ endobj
/Type /Annot
>>
endobj
-149 0 obj
+151 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_spi_GridService)
/Subtype /Link
@@ -15924,7 +16105,7 @@ endobj
/Type /Annot
>>
endobj
-150 0 obj
+152 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_spi_GridLoaderService)
/Subtype /Link
@@ -15932,7 +16113,7 @@ endobj
/Type /Annot
>>
endobj
-151 0 obj
+153 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_spi_GridSystemService)
/Subtype /Link
@@ -15940,7 +16121,7 @@ endobj
/Type /Annot
>>
endobj
-152 0 obj
+154 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_spi_HintStore)
/Subtype /Link
@@ -15948,7 +16129,7 @@ endobj
/Type /Annot
>>
endobj
-153 0 obj
+155 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_spi_HintStore)
/Subtype /Link
@@ -15956,7 +16137,7 @@ endobj
/Type /Annot
>>
endobj
-154 0 obj
+156 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_spi_HintStore)
/Subtype /Link
@@ -15964,7 +16145,7 @@ endobj
/Type /Annot
>>
endobj
-155 0 obj
+157 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_spi_HintStore)
/Subtype /Link
@@ -15972,7 +16153,7 @@ endobj
/Type /Annot
>>
endobj
-156 0 obj
+158 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_spi_HintStore)
/Subtype /Link
@@ -15980,7 +16161,7 @@ endobj
/Type /Annot
>>
endobj
-157 0 obj
+159 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_spi_LocaleProvider)
/Subtype /Link
@@ -15988,7 +16169,7 @@ endobj
/Type /Annot
>>
endobj
-158 0 obj
+160 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_spi_LocaleProvider)
/Subtype /Link
@@ -15996,7 +16177,7 @@ endobj
/Type /Annot
>>
endobj
-159 0 obj
+161 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_spi_LocaleProvider)
/Subtype /Link
@@ -16004,7 +16185,7 @@ endobj
/Type /Annot
>>
endobj
-160 0 obj
+162 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_spi_LocaleProvider)
/Subtype /Link
@@ -16012,7 +16193,7 @@ endobj
/Type /Annot
>>
endobj
-161 0 obj
+163 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_spi_LocaleProvider)
/Subtype /Link
@@ -16020,7 +16201,7 @@ endobj
/Type /Annot
>>
endobj
-162 0 obj
+164 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_spi_TranslationService)
/Subtype /Link
@@ -16028,7 +16209,7 @@ endobj
/Type /Annot
>>
endobj
-163 0 obj
+165 0 obj
<< /Length 25849
>>
stream
@@ -17888,23 +18069,23 @@ Q
endstream
endobj
-164 0 obj
+166 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 163 0 R
+/Contents 165 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F2.0 18 0 R
-/F3.0 40 0 R
+/Font << /F2.0 20 0 R
+/F3.0 42 0 R
/F1.0 8 0 R
>>
-/XObject << /Stamp1 2118 0 R
+/XObject << /Stamp1 2153 0 R
>>
>>
-/Annots [165 0 R 166 0 R 167 0 R 168 0 R 169 0 R 170 0 R 171 0 R 172 0 R 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]
+/Annots [167 0 R 168 0 R 169 0 R 170 0 R 171 0 R 172 0 R 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 197 0 R 198 0 R]
>>
endobj
-165 0 obj
+167 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_spi_RoutingService)
/Subtype /Link
@@ -17912,7 +18093,7 @@ endobj
/Type /Annot
>>
endobj
-166 0 obj
+168 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_spi_RoutingService)
/Subtype /Link
@@ -17920,7 +18101,7 @@ endobj
/Type /Annot
>>
endobj
-167 0 obj
+169 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_spi_RoutingService)
/Subtype /Link
@@ -17928,7 +18109,7 @@ endobj
/Type /Annot
>>
endobj
-168 0 obj
+170 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_spi_RoutingService)
/Subtype /Link
@@ -17936,7 +18117,7 @@ endobj
/Type /Annot
>>
endobj
-169 0 obj
+171 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_spi_RoutingService)
/Subtype /Link
@@ -17944,7 +18125,7 @@ endobj
/Type /Annot
>>
endobj
-170 0 obj
+172 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_api_HomePageProviderService)
/Subtype /Link
@@ -17952,7 +18133,7 @@ endobj
/Type /Annot
>>
endobj
-171 0 obj
+173 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_api_HomePageProviderService)
/Subtype /Link
@@ -17960,7 +18141,7 @@ endobj
/Type /Annot
>>
endobj
-172 0 obj
+174 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_api_HomePageProviderService)
/Subtype /Link
@@ -17968,7 +18149,7 @@ endobj
/Type /Annot
>>
endobj
-173 0 obj
+175 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -17979,7 +18160,7 @@ endobj
/Type /Annot
>>
endobj
-174 0 obj
+176 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -17990,7 +18171,7 @@ endobj
/Type /Annot
>>
endobj
-175 0 obj
+177 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_spi_TranslationService)
/Subtype /Link
@@ -17998,7 +18179,7 @@ endobj
/Type /Annot
>>
endobj
-176 0 obj
+178 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_spi_TranslationService)
/Subtype /Link
@@ -18006,7 +18187,7 @@ endobj
/Type /Annot
>>
endobj
-177 0 obj
+179 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_spi_TranslationService)
/Subtype /Link
@@ -18014,7 +18195,7 @@ endobj
/Type /Annot
>>
endobj
-178 0 obj
+180 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_spi_TranslationService)
/Subtype /Link
@@ -18022,7 +18203,7 @@ endobj
/Type /Annot
>>
endobj
-179 0 obj
+181 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_spi_TranslationService)
/Subtype /Link
@@ -18030,7 +18211,7 @@ endobj
/Type /Annot
>>
endobj
-180 0 obj
+182 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_spi_LocaleProvider)
/Subtype /Link
@@ -18038,7 +18219,7 @@ endobj
/Type /Annot
>>
endobj
-181 0 obj
+183 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_spi_TranslationsResolver)
/Subtype /Link
@@ -18046,7 +18227,7 @@ endobj
/Type /Annot
>>
endobj
-182 0 obj
+184 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_spi_TranslationsResolver)
/Subtype /Link
@@ -18054,7 +18235,7 @@ endobj
/Type /Annot
>>
endobj
-183 0 obj
+185 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_spi_TranslationsResolver)
/Subtype /Link
@@ -18062,7 +18243,7 @@ endobj
/Type /Annot
>>
endobj
-184 0 obj
+186 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_spi_TranslationsResolver)
/Subtype /Link
@@ -18070,7 +18251,7 @@ endobj
/Type /Annot
>>
endobj
-185 0 obj
+187 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_spi_TranslationsResolver)
/Subtype /Link
@@ -18078,7 +18259,7 @@ endobj
/Type /Annot
>>
endobj
-186 0 obj
+188 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_spi_TranslationService)
/Subtype /Link
@@ -18086,7 +18267,7 @@ endobj
/Type /Annot
>>
endobj
-187 0 obj
+189 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_spi_UrlEncodingService)
/Subtype /Link
@@ -18094,7 +18275,7 @@ endobj
/Type /Annot
>>
endobj
-188 0 obj
+190 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_spi_UrlEncodingService)
/Subtype /Link
@@ -18102,7 +18283,7 @@ endobj
/Type /Annot
>>
endobj
-189 0 obj
+191 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_spi_UrlEncodingService)
/Subtype /Link
@@ -18110,7 +18291,7 @@ endobj
/Type /Annot
>>
endobj
-190 0 obj
+192 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_spi_UrlEncodingService)
/Subtype /Link
@@ -18118,7 +18299,7 @@ endobj
/Type /Annot
>>
endobj
-191 0 obj
+193 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_spi_UrlEncodingService)
/Subtype /Link
@@ -18126,7 +18307,7 @@ endobj
/Type /Annot
>>
endobj
-192 0 obj
+194 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_spi_UserProfileService)
/Subtype /Link
@@ -18134,7 +18315,7 @@ endobj
/Type /Annot
>>
endobj
-193 0 obj
+195 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_spi_UserProfileService)
/Subtype /Link
@@ -18142,7 +18323,7 @@ endobj
/Type /Annot
>>
endobj
-194 0 obj
+196 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_spi_UserProfileService)
/Subtype /Link
@@ -18150,7 +18331,7 @@ endobj
/Type /Annot
>>
endobj
-195 0 obj
+197 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_spi_UserProfileService)
/Subtype /Link
@@ -18158,7 +18339,7 @@ endobj
/Type /Annot
>>
endobj
-196 0 obj
+198 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_spi_UserProfileService)
/Subtype /Link
@@ -18166,7 +18347,7 @@ endobj
/Type /Annot
>>
endobj
-197 0 obj
+199 0 obj
<< /Length 25228
>>
stream
@@ -19792,30 +19973,30 @@ Q
endstream
endobj
-198 0 obj
+200 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 197 0 R
+/Contents 199 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/Font << /F1.0 8 0 R
-/F3.0 40 0 R
-/F2.0 18 0 R
-/F6.1 62 0 R
-/F7.0 69 0 R
-/F4.0 51 0 R
-/F3.1 52 0 R
+/F3.0 42 0 R
+/F2.0 20 0 R
+/F6.1 64 0 R
+/F7.0 71 0 R
+/F4.0 53 0 R
+/F3.1 54 0 R
>>
-/XObject << /Stamp1 2118 0 R
+/XObject << /Stamp1 2153 0 R
>>
>>
-/Annots [200 0 R 201 0 R 202 0 R 203 0 R 205 0 R 206 0 R]
+/Annots [202 0 R 203 0 R 204 0 R 205 0 R 207 0 R 208 0 R]
>>
endobj
-199 0 obj
-[198 0 R /XYZ 0 712.7700000000001 null]
+201 0 obj
+[200 0 R /XYZ 0 712.7700000000001 null]
endobj
-200 0 obj
+202 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -19826,7 +20007,7 @@ endobj
/Type /Annot
>>
endobj
-201 0 obj
+203 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -19837,7 +20018,7 @@ endobj
/Type /Annot
>>
endobj
-202 0 obj
+204 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -19848,7 +20029,7 @@ endobj
/Type /Annot
>>
endobj
-203 0 obj
+205 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -19859,10 +20040,10 @@ endobj
/Type /Annot
>>
endobj
-204 0 obj
-[198 0 R /XYZ 0 455.1100000000001 null]
+206 0 obj
+[200 0 R /XYZ 0 455.1100000000001 null]
endobj
-205 0 obj
+207 0 obj
<< /Border [0 0 0]
/Dest (ugvro.adoc)
/Subtype /Link
@@ -19870,7 +20051,7 @@ endobj
/Type /Annot
>>
endobj
-206 0 obj
+208 0 obj
<< /Border [0 0 0]
/Dest (ugvro.adoc)
/Subtype /Link
@@ -19878,7 +20059,7 @@ endobj
/Type /Annot
>>
endobj
-207 0 obj
+209 0 obj
<< /Length 38646
>>
stream
@@ -22537,27 +22718,27 @@ Q
endstream
endobj
-208 0 obj
+210 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 207 0 R
+/Contents 209 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F2.0 18 0 R
+/Font << /F2.0 20 0 R
/F1.0 8 0 R
-/F3.0 40 0 R
-/F4.0 51 0 R
+/F3.0 42 0 R
+/F4.0 53 0 R
>>
-/XObject << /Stamp1 2118 0 R
+/XObject << /Stamp1 2153 0 R
>>
>>
-/Annots [210 0 R 212 0 R 214 0 R 215 0 R 216 0 R 217 0 R]
+/Annots [212 0 R 214 0 R 216 0 R 217 0 R 218 0 R 219 0 R]
>>
endobj
-209 0 obj
-[208 0 R /XYZ 0 841.89 null]
+211 0 obj
+[210 0 R /XYZ 0 841.89 null]
endobj
-210 0 obj
+212 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -22568,10 +22749,10 @@ endobj
/Type /Annot
>>
endobj
-211 0 obj
-[208 0 R /XYZ 0 274.09000000000003 null]
+213 0 obj
+[210 0 R /XYZ 0 274.09000000000003 null]
endobj
-212 0 obj
+214 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -22582,10 +22763,10 @@ endobj
/Type /Annot
>>
endobj
-213 0 obj
-[208 0 R /XYZ 0 213.03 null]
+215 0 obj
+[210 0 R /XYZ 0 213.03 null]
endobj
-214 0 obj
+216 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -22596,7 +22777,7 @@ endobj
/Type /Annot
>>
endobj
-215 0 obj
+217 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -22607,7 +22788,7 @@ endobj
/Type /Annot
>>
endobj
-216 0 obj
+218 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -22618,7 +22799,7 @@ endobj
/Type /Annot
>>
endobj
-217 0 obj
+219 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_spi_UserRegistrationService)
/Subtype /Link
@@ -22626,7 +22807,7 @@ endobj
/Type /Annot
>>
endobj
-218 0 obj
+220 0 obj
<< /Length 19613
>>
stream
@@ -23833,27 +24014,27 @@ Q
endstream
endobj
-219 0 obj
+221 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 218 0 R
+/Contents 220 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/Font << /F1.0 8 0 R
-/F3.0 40 0 R
-/F2.0 18 0 R
-/F4.0 51 0 R
-/F3.1 52 0 R
-/F7.0 69 0 R
-/F5.0 56 0 R
+/F3.0 42 0 R
+/F2.0 20 0 R
+/F4.0 53 0 R
+/F3.1 54 0 R
+/F7.0 71 0 R
+/F5.0 58 0 R
>>
-/XObject << /Stamp1 2118 0 R
+/XObject << /Stamp1 2153 0 R
>>
>>
-/Annots [220 0 R 224 0 R]
+/Annots [222 0 R 226 0 R]
>>
endobj
-220 0 obj
+222 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_api_EmailService)
/Subtype /Link
@@ -23861,16 +24042,16 @@ endobj
/Type /Annot
>>
endobj
-221 0 obj
-[219 0 R /XYZ 0 691.7400000000001 null]
-endobj
-222 0 obj
-[219 0 R /XYZ 0 369.8600000000003 null]
-endobj
223 0 obj
-[219 0 R /XYZ 0 277.24000000000024 null]
+[221 0 R /XYZ 0 691.7400000000001 null]
endobj
224 0 obj
+[221 0 R /XYZ 0 369.8600000000003 null]
+endobj
+225 0 obj
+[221 0 R /XYZ 0 277.24000000000024 null]
+endobj
+226 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -23881,7 +24062,7 @@ endobj
/Type /Annot
>>
endobj
-225 0 obj
+227 0 obj
<< /Length 16248
>>
stream
@@ -24853,28 +25034,28 @@ Q
endstream
endobj
-226 0 obj
+228 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 225 0 R
+/Contents 227 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/Font << /F1.0 8 0 R
-/F3.0 40 0 R
-/F5.0 56 0 R
-/F2.0 18 0 R
-/F4.0 51 0 R
+/F3.0 42 0 R
+/F5.0 58 0 R
+/F2.0 20 0 R
+/F4.0 53 0 R
>>
-/XObject << /Stamp1 2118 0 R
+/XObject << /Stamp1 2153 0 R
>>
>>
-/Annots [228 0 R 229 0 R 230 0 R 232 0 R 233 0 R]
+/Annots [230 0 R 231 0 R 232 0 R 234 0 R 235 0 R]
>>
endobj
-227 0 obj
-[226 0 R /XYZ 0 696.9900000000001 null]
+229 0 obj
+[228 0 R /XYZ 0 696.9900000000001 null]
endobj
-228 0 obj
+230 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -24885,7 +25066,7 @@ endobj
/Type /Annot
>>
endobj
-229 0 obj
+231 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -24896,7 +25077,7 @@ endobj
/Type /Annot
>>
endobj
-230 0 obj
+232 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_intro_overriding-the-services)
/Subtype /Link
@@ -24904,10 +25085,10 @@ endobj
/Type /Annot
>>
endobj
-231 0 obj
-[226 0 R /XYZ 0 545.0300000000003 null]
+233 0 obj
+[228 0 R /XYZ 0 545.0300000000003 null]
endobj
-232 0 obj
+234 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_api_EmailService)
/Subtype /Link
@@ -24915,7 +25096,7 @@ endobj
/Type /Annot
>>
endobj
-233 0 obj
+235 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_spi_UserRegistrationService)
/Subtype /Link
@@ -24923,23 +25104,23 @@ endobj
/Type /Annot
>>
endobj
-234 0 obj
-[226 0 R /XYZ 0 440.4100000000004 null]
+236 0 obj
+[228 0 R /XYZ 0 440.4100000000004 null]
endobj
-235 0 obj
-[226 0 R /XYZ 0 325.2100000000004 null]
+237 0 obj
+[228 0 R /XYZ 0 325.2100000000004 null]
endobj
-236 0 obj
+238 0 obj
<< /Limits [(_rgsvc) (_rgsvc_api_ConfigurationService)]
-/Names [(_rgsvc) 15 0 R (_rgsvc_api_AcceptHeaderService) 513 0 R (_rgsvc_api_ActionInvocationContext) 535 0 R (_rgsvc_api_ApplicationFeatureRepository) 1385 0 R (_rgsvc_api_BackgroundService) 553 0 R (_rgsvc_api_BackgroundService_BackgroundCommandExecution) 592 0 R (_rgsvc_api_BackgroundService_Quartz) 593 0 R (_rgsvc_api_BookmarkService) 1207 0 R (_rgsvc_api_ClockService) 931 0 R (_rgsvc_api_CommandContext) 603 0 R (_rgsvc_api_CommandContext_screencast) 619 0 R (_rgsvc_api_ConfigurationService) 943 0 R]
+/Names [(_rgsvc) 17 0 R (_rgsvc_api_AcceptHeaderService) 515 0 R (_rgsvc_api_ActionInvocationContext) 537 0 R (_rgsvc_api_ApplicationFeatureRepository) 1388 0 R (_rgsvc_api_BackgroundService) 555 0 R (_rgsvc_api_BackgroundService_BackgroundCommandExecution) 594 0 R (_rgsvc_api_BackgroundService_Quartz) 595 0 R (_rgsvc_api_BookmarkService) 1209 0 R (_rgsvc_api_ClockService) 933 0 R (_rgsvc_api_CommandContext) 605 0 R (_rgsvc_api_CommandContext_screencast) 621 0 R (_rgsvc_api_ConfigurationService) 945 0 R]
>>
endobj
-237 0 obj
+239 0 obj
<< /Limits [(_rgsvc_spi_ErrorReportingService) (alternative-implementations)]
-/Names [(_rgsvc_spi_ErrorReportingService) 234 0 R (_rgsvc_spi_EventSerializer) 1742 0 R (_rgsvc_spi_ExceptionRecognizer) 252 0 R (_rgsvc_spi_FixtureScriptsSpecificationProvider) 1525 0 R (_rgsvc_spi_GridLoaderService) 289 0 R (_rgsvc_spi_GridService) 304 0 R (_rgsvc_spi_GridSystemService) 265 0 R (_rgsvc_spi_HintStore) 332 0 R (_rgsvc_spi_LocaleProvider) 349 0 R (_rgsvc_spi_PublisherService) 1771 0 R (_rgsvc_spi_PublishingService) 1809 0 R (_rgsvc_spi_RoutingService) 367 0 R (_rgsvc_spi_TranslationService) 383 0 R (_rgsvc_spi_TranslationsResolver) 400 0 R (_rgsvc_spi_UrlEncodingService) 415 0 R (_rgsvc_spi_UserProfileService) 424 0 R (_rgsvc_spi_UserRegistrationService) 1855 0 R (_rgsvc_testing) 1467 0 R (alternative-implementations) 223 0 R]
+/Names [(_rgsvc_spi_ErrorReportingService) 236 0 R (_rgsvc_spi_EventSerializer) 1768 0 R (_rgsvc_spi_ExceptionRecognizer) 254 0 R (_rgsvc_spi_FixtureScriptsSpecificationProvider) 1531 0 R (_rgsvc_spi_GridLoaderService) 291 0 R (_rgsvc_spi_GridService) 306 0 R (_rgsvc_spi_GridSystemService) 267 0 R (_rgsvc_spi_HintStore) 334 0 R (_rgsvc_spi_LocaleProvider) 351 0 R (_rgsvc_spi_PublisherService) 1795 0 R (_rgsvc_spi_PublishingService) 1833 0 R (_rgsvc_spi_RoutingService) 369 0 R (_rgsvc_spi_TranslationService) 385 0 R (_rgsvc_spi_TranslationsResolver) 402 0 R (_rgsvc_spi_UrlEncodingService) 417 0 R (_rgsvc_spi_UserProfileService) 426 0 R (_rgsvc_spi_UserRegistrationService) 1880 0 R (_rgsvc_testing) 1471 0 R (alternative-implementations) 225 0 R]
>>
endobj
-238 0 obj
+240 0 obj
<< /Length 27608
>>
stream
@@ -26746,25 +26927,25 @@ Q
endstream
endobj
-239 0 obj
+241 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 238 0 R
+/Contents 240 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F4.0 51 0 R
-/F3.0 40 0 R
-/F3.1 52 0 R
+/Font << /F4.0 53 0 R
+/F3.0 42 0 R
+/F3.1 54 0 R
/F1.0 8 0 R
-/F2.0 18 0 R
+/F2.0 20 0 R
>>
-/XObject << /Stamp1 2118 0 R
+/XObject << /Stamp1 2153 0 R
>>
>>
-/Annots [240 0 R 241 0 R 243 0 R]
+/Annots [242 0 R 243 0 R 245 0 R]
>>
endobj
-240 0 obj
+242 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_spi_LocaleProvider)
/Subtype /Link
@@ -26772,7 +26953,7 @@ endobj
/Type /Annot
>>
endobj
-241 0 obj
+243 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_spi_ExceptionRecognizer)
/Subtype /Link
@@ -26780,10 +26961,10 @@ endobj
/Type /Annot
>>
endobj
-242 0 obj
-[239 0 R /XYZ 0 222.97000000000017 null]
+244 0 obj
+[241 0 R /XYZ 0 222.97000000000017 null]
endobj
-243 0 obj
+245 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -26794,7 +26975,7 @@ endobj
/Type /Annot
>>
endobj
-244 0 obj
+246 0 obj
<< /Length 20818
>>
stream
@@ -28262,25 +28443,25 @@ Q
endstream
endobj
-245 0 obj
+247 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 244 0 R
+/Contents 246 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F3.0 40 0 R
-/F4.0 51 0 R
+/Font << /F3.0 42 0 R
+/F4.0 53 0 R
/F1.0 8 0 R
-/F2.0 18 0 R
+/F2.0 20 0 R
>>
-/XObject << /I2 246 0 R
-/Stamp1 2118 0 R
+/XObject << /I2 248 0 R
+/Stamp1 2153 0 R
>>
>>
-/Annots [247 0 R 249 0 R]
+/Annots [249 0 R 251 0 R]
>>
endobj
-246 0 obj
+248 0 obj
<< /Type /XObject
/Subtype /Image
/Height 503
@@ -28355,7 +28536,7 @@ OW
o_\ufffd\ufffd\ufffd\ufffdJ\ufffd\ufffd\ufffd\ufffd\ufffdf\ufffd\ufffd\Q)\ufffdw\ufffd\ufffd\ufffdG\ufffduO'3z"W\ufffdT\ufffd\ufffd\ufffd\ufffdB\ufffd\ufffd\ufffd\ufffd\ufffd6\ufffde\ufffd\ufffdB\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\u06ae{\ufffd?\ufffd\ufffd\u05fe\ufffd\ufffdBf\ufffd\ufffd \ufffd$I \ufffd[\ufffd\ufffd\ufffd\ufffd\ufffd_\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdK\ufffd$\u9832\ufffd\ufffdiI\ufffd$\ufffd{\ufffd\ufffd\ufffd[\ufffd?uI\ufffd$ T\ufffd\ufffd=-I\ufffd\ufffdx\ufffd\ufffd=-I\ufffd\ufffdx\ufffd\ufffd=-I\ufffd\ufffdx\ufffd\ufffd=-I\ufffd\ufffdx\ufffd\ufffd=-I\ufffd\ufffdx-\ufffd\ufffdS=\u06feG\ufffdt\ufffd\ufffd^j\ufffd\ufffd.I\ufffd\ufffd\ufffd\ufffd\ufffd=\ufffd\ufffd\ufffd;m\ufffd\ufffdG\ufffd\ufffd\ufffd|\ufffd\ufffd\ufffd;m\ufffd\ufffd%I\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdo\ufffd\u0631-\ufffd\ufffdd\ufffd>{\ufffd\ufffd\ufffd\ufffd\ufffdu\ufffd\ufffd1-I\ufffd\ufffd\ufffd\ufffd\u9b9f\ufffd"6\ufffd#{Z\ufffd$Iz\ufffdJ\ufffdt2\ufffdc\ufffd\u069e\ufffd$IR\ufffdW\ufffd\u04f1ImOK\ufffd$\ufffd\ufffd\ufffd\ufffd\u04c1ImOK\ufffd$\ufffd\ufffdk\ufffd\u04edNj{Z\ufffd$I\ufffd\u07b6=\ufffd\u04a4\ufffd\ufffd%I\ufffd\ufffd\ufffd\ufffd\ufffd\u04ef?\ufffd\ufffdiI\ufffd$uz\ufffd\ufffd\ufffdR\ufffd\ufffd3\ufffd\ufffd\ufffd\ufffdZ\ufffd\ufffd\ufffd\ufffdD\ufffd$I:\ufffdv\ufffd\u04c9'O\ufffd\ufffdrRo\ufffd\ufffdB\ufffd\ufffd\ufffd\ufffdD\ufffd$I:\ufffd\ufffd\ufffd\u04c9\ufffd\ufffd\ufffd\ufffd\ufffdzcO\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\u04e2\ufffd\u0512$I\ufffd\ufffd\ufffd\u04c9\ufffd[L&\ufffd^\ufffd \ufffd|]2\ufffd\ufffd?^ \ufffd\ufffd�=],>\ufffd?8s\ufffd\ufffd\ufffd\ufffd\ufffd=\ufffdm}\ufffd @\ufffd9\ufffd\ufffd\ufffdl\ufffd\ufffd\ufffd\ufffd;\ufffd\ufffd/c\ufffd\ufffd\ufffd>\ufffd\ufffd\ufffd\ufffd_y\ufffd\ufffd=
\ufffd\ufffd\ufffd\ufffd\ufffdcz\ufffd\ufffd
?\ufffdi\ufffdv\ufffdG\ufffd\ufffd\ufffd\ufffdi :]\ufffd\ufffd7\ufffdt\ufffd\u01de\ufffd/2\ufffd\ufffd\ufffd <\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd t\ufffdO?=\ufffd9\ufffd\u0243\ufffd?\ufffd8y\ufffdO\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd \ufffd]O\ufffd\u0258N |\ufffd\ufffd'\ufffd\ufffd\u049e \ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd ||\ufffd\ufffdof\ufffd\ufffd\ufffd\ufffd_iO @\ufffd=
q\ufffd4 \ufffd\ufffd\ufffd gO @\ufffd=
q\ufffd4 \ufffd\ufffd\ufffd gO @\ufffd=
q\ufffd4 \ufffd\ufffd\ufffd gO @\ufffd=
q\ufffd4 \ufffd\ufffd\ufffd gO @\ufffd=
q\ufffd4 \ufffd\ufffd\ufffd gO @\ufffd=
q\ufffd4 \ufffd\ufffd\ufffd gO @\ufffd=
q\ufffd4 \ufffd\ufffd\ufffd gO @\ufffd=
q\ufffd4 \ufffd\ufffd\ufffd gO @\ufffd=
q\ufffd4 \ufffd\ufffd\ufffd gO @\ufffd=
q\ufffd4 \ufffd\ufffd\ufffd gO @\ufffd=
q\ufffd4 \ufffd\ufffd\ufffd gO @\ufffd=
q\ufffd4 \ufffd\ufffd\ufffd gO @\ufffd=
q\ufffd4 \ufffd\ufffd\ufffd gO @\ufffd\ufffd|?5=
endstream
endobj
-247 0 obj
+249 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -28366,10 +28547,10 @@ endobj
/Type /Annot
>>
endobj
-248 0 obj
-[245 0 R /XYZ 0 177.31373056994812 null]
+250 0 obj
+[247 0 R /XYZ 0 177.31373056994812 null]
endobj
-249 0 obj
+251 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -28380,7 +28561,7 @@ endobj
/Type /Annot
>>
endobj
-250 0 obj
+252 0 obj
<< /Length 22041
>>
stream
@@ -29800,30 +29981,30 @@ Q
endstream
endobj
-251 0 obj
+253 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 250 0 R
+/Contents 252 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F2.0 18 0 R
-/F3.0 40 0 R
+/Font << /F2.0 20 0 R
+/F3.0 42 0 R
/F1.0 8 0 R
-/F4.0 51 0 R
-/F3.1 52 0 R
+/F4.0 53 0 R
+/F3.1 54 0 R
>>
-/XObject << /Stamp1 2118 0 R
+/XObject << /Stamp1 2153 0 R
>>
>>
>>
endobj
-252 0 obj
-[251 0 R /XYZ 0 841.89 null]
+254 0 obj
+[253 0 R /XYZ 0 841.89 null]
endobj
-253 0 obj
-[251 0 R /XYZ 0 561.03 null]
+255 0 obj
+[253 0 R /XYZ 0 561.03 null]
endobj
-254 0 obj
+256 0 obj
<< /Length 22562
>>
stream
@@ -31221,25 +31402,25 @@ Q
endstream
endobj
-255 0 obj
+257 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 254 0 R
+/Contents 256 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F4.0 51 0 R
-/F3.0 40 0 R
-/F3.1 52 0 R
+/Font << /F4.0 53 0 R
+/F3.0 42 0 R
+/F3.1 54 0 R
/F1.0 8 0 R
-/F2.0 18 0 R
+/F2.0 20 0 R
>>
-/XObject << /Stamp1 2118 0 R
+/XObject << /Stamp1 2153 0 R
>>
>>
-/Annots [256 0 R 257 0 R 258 0 R]
+/Annots [258 0 R 259 0 R 260 0 R]
>>
endobj
-256 0 obj
+258 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -31250,7 +31431,7 @@ endobj
/Type /Annot
>>
endobj
-257 0 obj
+259 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -31261,7 +31442,7 @@ endobj
/Type /Annot
>>
endobj
-258 0 obj
+260 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -31272,10 +31453,10 @@ endobj
/Type /Annot
>>
endobj
-259 0 obj
-[255 0 R /XYZ 0 265.71000000000015 null]
+261 0 obj
+[257 0 R /XYZ 0 265.71000000000015 null]
endobj
-260 0 obj
+262 0 obj
<< /Length 17082
>>
stream
@@ -32268,29 +32449,29 @@ Q
endstream
endobj
-261 0 obj
+263 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 260 0 R
+/Contents 262 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/Font << /F1.0 8 0 R
-/F3.0 40 0 R
-/F2.0 18 0 R
-/F4.0 51 0 R
-/F6.1 62 0 R
-/F7.0 69 0 R
+/F3.0 42 0 R
+/F2.0 20 0 R
+/F4.0 53 0 R
+/F6.1 64 0 R
+/F7.0 71 0 R
>>
-/XObject << /Stamp1 2118 0 R
+/XObject << /Stamp1 2153 0 R
>>
>>
-/Annots [263 0 R 264 0 R 266 0 R]
+/Annots [265 0 R 266 0 R 268 0 R]
>>
endobj
-262 0 obj
-[261 0 R /XYZ 0 714.99 null]
+264 0 obj
+[263 0 R /XYZ 0 714.99 null]
endobj
-263 0 obj
+265 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -32301,7 +32482,7 @@ endobj
/Type /Annot
>>
endobj
-264 0 obj
+266 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -32312,10 +32493,10 @@ endobj
/Type /Annot
>>
endobj
-265 0 obj
-[261 0 R /XYZ 0 389.69000000000017 null]
+267 0 obj
+[263 0 R /XYZ 0 389.69000000000017 null]
endobj
-266 0 obj
+268 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -32326,10 +32507,10 @@ endobj
/Type /Annot
>>
endobj
-267 0 obj
-[261 0 R /XYZ 0 104.25000000000014 null]
+269 0 obj
+[263 0 R /XYZ 0 104.25000000000014 null]
endobj
-268 0 obj
+270 0 obj
<< /Length 31540
>>
stream
@@ -34408,25 +34589,25 @@ Q
endstream
endobj
-269 0 obj
+271 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 268 0 R
+/Contents 270 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F4.0 51 0 R
-/F3.0 40 0 R
-/F3.1 52 0 R
+/Font << /F4.0 53 0 R
+/F3.0 42 0 R
+/F3.1 54 0 R
/F1.0 8 0 R
-/F2.0 18 0 R
+/F2.0 20 0 R
>>
-/XObject << /Stamp1 2118 0 R
+/XObject << /Stamp1 2153 0 R
>>
>>
-/Annots [270 0 R 271 0 R 272 0 R 273 0 R 274 0 R 275 0 R 276 0 R 277 0 R 279 0 R 282 0 R]
+/Annots [272 0 R 273 0 R 274 0 R 275 0 R 276 0 R 277 0 R 278 0 R 279 0 R 281 0 R 284 0 R]
>>
endobj
-270 0 obj
+272 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -34437,7 +34618,7 @@ endobj
/Type /Annot
>>
endobj
-271 0 obj
+273 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -34448,7 +34629,7 @@ endobj
/Type /Annot
>>
endobj
-272 0 obj
+274 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -34459,7 +34640,7 @@ endobj
/Type /Annot
>>
endobj
-273 0 obj
+275 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -34470,7 +34651,7 @@ endobj
/Type /Annot
>>
endobj
-274 0 obj
+276 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -34481,7 +34662,7 @@ endobj
/Type /Annot
>>
endobj
-275 0 obj
+277 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -34492,7 +34673,7 @@ endobj
/Type /Annot
>>
endobj
-276 0 obj
+278 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -34503,7 +34684,7 @@ endobj
/Type /Annot
>>
endobj
-277 0 obj
+279 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -34514,10 +34695,10 @@ endobj
/Type /Annot
>>
endobj
-278 0 obj
-[269 0 R /XYZ 0 218.51 null]
+280 0 obj
+[271 0 R /XYZ 0 218.51 null]
endobj
-279 0 obj
+281 0 obj
<< /Border [0 0 0]
/Dest (ugvw.adoc)
/Subtype /Link
@@ -34525,15 +34706,15 @@ endobj
/Type /Annot
>>
endobj
-280 0 obj
-[269 0 R /XYZ 0 125.88999999999996 null]
+282 0 obj
+[271 0 R /XYZ 0 125.88999999999996 null]
endobj
-281 0 obj
+283 0 obj
<< /Limits [(persist) (registering-the-service-16)]
-/Names [(persist) 1639 0 R (programmatic-posting) 1081 0 R (query-and-code-xxxmatches-code) 1648 0 R (registering-subscribers) 1057 0 R (registering-the-service) 227 0 R (registering-the-service-10) 742 0 R (registering-the-service-11) 776 0 R (registering-the-service-12) 874 0 R (registering-the-service-13) 939 0 R (registering-the-service-14) 953 0 R (registering-the-service-15) 1039 0 R (registering-the-service-16) 1123 0 R]
+/Names [(persist) 1664 0 R (programmatic-posting) 1083 0 R (query-and-code-xxxmatches-code) 1673 0 R (registering-subscribers) 1059 0 R (registering-the-service) 229 0 R (registering-the-service-10) 744 0 R (registering-the-service-11) 778 0 R (registering-the-service-12) 876 0 R (registering-the-service-13) 941 0 R (registering-the-service-14) 955 0 R (registering-the-service-15) 1041 0 R (registering-the-service-16) 1125 0 R]
>>
endobj
-282 0 obj
+284 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -34544,7 +34725,7 @@ endobj
/Type /Annot
>>
endobj
-283 0 obj
+285 0 obj
<< /Length 23121
>>
stream
@@ -36037,25 +36218,25 @@ Q
endstream
endobj
-284 0 obj
+286 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 283 0 R
+/Contents 285 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F3.0 40 0 R
+/Font << /F3.0 42 0 R
/F1.0 8 0 R
-/F2.0 18 0 R
-/F4.0 51 0 R
-/F3.1 52 0 R
+/F2.0 20 0 R
+/F4.0 53 0 R
+/F3.1 54 0 R
>>
-/XObject << /Stamp1 2118 0 R
+/XObject << /Stamp1 2153 0 R
>>
>>
-/Annots [285 0 R 286 0 R 288 0 R 291 0 R 292 0 R 293 0 R 294 0 R 297 0 R]
+/Annots [287 0 R 288 0 R 290 0 R 293 0 R 294 0 R 295 0 R 296 0 R 299 0 R]
>>
endobj
-285 0 obj
+287 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -36066,7 +36247,7 @@ endobj
/Type /Annot
>>
endobj
-286 0 obj
+288 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_intro_overriding-the-services)
/Subtype /Link
@@ -36074,10 +36255,10 @@ endobj
/Type /Annot
>>
endobj
-287 0 obj
-[284 0 R /XYZ 0 719.5200000000001 null]
+289 0 obj
+[286 0 R /XYZ 0 719.5200000000001 null]
endobj
-288 0 obj
+290 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_spi_GridService)
/Subtype /Link
@@ -36085,13 +36266,13 @@ endobj
/Type /Annot
>>
endobj
-289 0 obj
-[284 0 R /XYZ 0 658.4600000000003 null]
+291 0 obj
+[286 0 R /XYZ 0 658.4600000000003 null]
endobj
-290 0 obj
-[284 0 R /XYZ 0 590.6000000000004 null]
+292 0 obj
+[286 0 R /XYZ 0 590.6000000000004 null]
endobj
-291 0 obj
+293 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -36102,7 +36283,7 @@ endobj
/Type /Annot
>>
endobj
-292 0 obj
+294 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -36113,7 +36294,7 @@ endobj
/Type /Annot
>>
endobj
-293 0 obj
+295 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_spi_GridService)
/Subtype /Link
@@ -36121,7 +36302,7 @@ endobj
/Type /Annot
>>
endobj
-294 0 obj
+296 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_spi_GridSystemService)
/Subtype /Link
@@ -36129,13 +36310,13 @@ endobj
/Type /Annot
>>
endobj
-295 0 obj
-[284 0 R /XYZ 0 272.64000000000055 null]
+297 0 obj
+[286 0 R /XYZ 0 272.64000000000055 null]
endobj
-296 0 obj
-[284 0 R /XYZ 0 136.46000000000052 null]
+298 0 obj
+[286 0 R /XYZ 0 136.46000000000052 null]
endobj
-297 0 obj
+299 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -36146,7 +36327,7 @@ endobj
/Type /Annot
>>
endobj
-298 0 obj
+300 0 obj
<< /Length 29755
>>
stream
@@ -38090,25 +38271,25 @@ Q
endstream
endobj
-299 0 obj
+301 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 298 0 R
+/Contents 300 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/Font << /F1.0 8 0 R
-/F3.0 40 0 R
-/F2.0 18 0 R
-/F4.0 51 0 R
-/F3.1 52 0 R
+/F3.0 42 0 R
+/F2.0 20 0 R
+/F4.0 53 0 R
+/F3.1 54 0 R
>>
-/XObject << /Stamp1 2118 0 R
+/XObject << /Stamp1 2153 0 R
>>
>>
-/Annots [300 0 R 301 0 R 303 0 R 305 0 R 306 0 R 308 0 R 309 0 R 310 0 R 311 0 R 312 0 R]
+/Annots [302 0 R 303 0 R 305 0 R 307 0 R 308 0 R 310 0 R 311 0 R 312 0 R 313 0 R 314 0 R]
>>
endobj
-300 0 obj
+302 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -38119,7 +38300,7 @@ endobj
/Type /Annot
>>
endobj
-301 0 obj
+303 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_intro_overriding-the-services)
/Subtype /Link
@@ -38127,10 +38308,10 @@ endobj
/Type /Annot
>>
endobj
-302 0 obj
-[299 0 R /XYZ 0 762.33 null]
+304 0 obj
+[301 0 R /XYZ 0 762.33 null]
endobj
-303 0 obj
+305 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_spi_GridService)
/Subtype /Link
@@ -38138,10 +38319,10 @@ endobj
/Type /Annot
>>
endobj
-304 0 obj
-[299 0 R /XYZ 0 701.2700000000002 null]
+306 0 obj
+[301 0 R /XYZ 0 701.2700000000002 null]
endobj
-305 0 obj
+307 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_spi_GridLoaderService)
/Subtype /Link
@@ -38149,7 +38330,7 @@ endobj
/Type /Annot
>>
endobj
-306 0 obj
+308 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_spi_GridSystemService)
/Subtype /Link
@@ -38157,10 +38338,10 @@ endobj
/Type /Annot
>>
endobj
-307 0 obj
-[299 0 R /XYZ 0 445.61000000000035 null]
+309 0 obj
+[301 0 R /XYZ 0 445.61000000000035 null]
endobj
-308 0 obj
+310 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -38171,7 +38352,7 @@ endobj
/Type /Annot
>>
endobj
-309 0 obj
+311 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_spi_GridLoaderService)
/Subtype /Link
@@ -38179,7 +38360,7 @@ endobj
/Type /Annot
>>
endobj
-310 0 obj
+312 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -38190,7 +38371,7 @@ endobj
/Type /Annot
>>
endobj
-311 0 obj
+313 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_spi_GridService)
/Subtype /Link
@@ -38198,7 +38379,7 @@ endobj
/Type /Annot
>>
endobj
-312 0 obj
+314 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_spi_GridSystemService)
/Subtype /Link
@@ -38206,7 +38387,7 @@ endobj
/Type /Annot
>>
endobj
-313 0 obj
+315 0 obj
<< /Length 20545
>>
stream
@@ -39432,24 +39613,24 @@ Q
endstream
endobj
-314 0 obj
+316 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 313 0 R
+/Contents 315 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F3.1 52 0 R
+/Font << /F3.1 54 0 R
/F1.0 8 0 R
-/F3.0 40 0 R
-/F2.0 18 0 R
+/F3.0 42 0 R
+/F2.0 20 0 R
>>
-/XObject << /Stamp1 2118 0 R
+/XObject << /Stamp1 2153 0 R
>>
>>
-/Annots [315 0 R 316 0 R 317 0 R 318 0 R 319 0 R 320 0 R 321 0 R 324 0 R 325 0 R 326 0 R 328 0 R 329 0 R 330 0 R 331 0 R 333 0 R]
+/Annots [317 0 R 318 0 R 319 0 R 320 0 R 321 0 R 322 0 R 323 0 R 326 0 R 327 0 R 328 0 R 330 0 R 331 0 R 332 0 R 333 0 R 335 0 R]
>>
endobj
-315 0 obj
+317 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -39460,7 +39641,7 @@ endobj
/Type /Annot
>>
endobj
-316 0 obj
+318 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -39471,7 +39652,7 @@ endobj
/Type /Annot
>>
endobj
-317 0 obj
+319 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -39482,7 +39663,7 @@ endobj
/Type /Annot
>>
endobj
-318 0 obj
+320 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -39493,7 +39674,7 @@ endobj
/Type /Annot
>>
endobj
-319 0 obj
+321 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -39504,7 +39685,7 @@ endobj
/Type /Annot
>>
endobj
-320 0 obj
+322 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_spi_GridSystemService)
/Subtype /Link
@@ -39512,7 +39693,7 @@ endobj
/Type /Annot
>>
endobj
-321 0 obj
+323 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_spi_GridSystemService)
/Subtype /Link
@@ -39520,13 +39701,13 @@ endobj
/Type /Annot
>>
endobj
-322 0 obj
-[314 0 R /XYZ 0 479.85 null]
+324 0 obj
+[316 0 R /XYZ 0 479.85 null]
endobj
-323 0 obj
-[314 0 R /XYZ 0 418.78999999999996 null]
+325 0 obj
+[316 0 R /XYZ 0 418.78999999999996 null]
endobj
-324 0 obj
+326 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -39537,7 +39718,7 @@ endobj
/Type /Annot
>>
endobj
-325 0 obj
+327 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -39548,7 +39729,7 @@ endobj
/Type /Annot
>>
endobj
-326 0 obj
+328 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_intro_overriding-the-services)
/Subtype /Link
@@ -39556,10 +39737,10 @@ endobj
/Type /Annot
>>
endobj
-327 0 obj
-[314 0 R /XYZ 0 251.04999999999995 null]
+329 0 obj
+[316 0 R /XYZ 0 251.04999999999995 null]
endobj
-328 0 obj
+330 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_spi_GridLoaderService)
/Subtype /Link
@@ -39567,7 +39748,7 @@ endobj
/Type /Annot
>>
endobj
-329 0 obj
+331 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_spi_GridSystemService)
/Subtype /Link
@@ -39575,7 +39756,7 @@ endobj
/Type /Annot
>>
endobj
-330 0 obj
+332 0 obj
<< /Border [0 0 0]
/Dest (_rgsvc_api_LayoutService)
/Subtype /Link
@@ -39583,7 +39764,7 @@ endobj
/Type /Annot
>>
endobj
-331 0 obj
+333 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -39594,10 +39775,10 @@ endobj
/Type /Annot
>>
endobj
-332 0 obj
-[314 0 R /XYZ 0 130.64999999999992 null]
+334 0 obj
+[316 0 R /XYZ 0 130.64999999999992 null]
endobj
-333 0 obj
+335 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -39608,7 +39789,7 @@ endobj
/Type /Annot
>>
endobj
-334 0 obj
+336 0 obj
<< /Length 27709
>>
stream
@@ -41433,28 +41614,28 @@ Q
endstream
endobj
-335 0 obj
+337 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 334 0 R
+/Contents 336 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/Font << /F1.0 8 0 R
-/F2.0 18 0 R
-/F3.0 40 0 R
-/F4.0 51 0 R
-/F3.1 52 0 R
+/F2.0 20 0 R
+/F3.0 42 0 R
+/F4.0 53 0 R
+/F3.1 54 0 R
>>
-/XObject << /Stamp1 2118 0 R
+/XObject << /Stamp1 2153 0 R
>>
>>
-/Annots [337 0 R 340 0 R 341 0 R 342 0 R 345 0 R 346 0 R]
+/Annots [339 0 R 342 0 R 343 0 R 344 0 R 347 0 R 348 0 R]
>>
endobj
-336 0 obj
-[335 0 R /XYZ 0 672.180
<TRUNCATED>
[6/7] isis-site git commit: internal services introduced in 1.13.0
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/c5f2b2e1/content/guides/rgfis.pdf
----------------------------------------------------------------------
diff --git a/content/guides/rgfis.pdf b/content/guides/rgfis.pdf
index 1be93ff..aae080f 100644
--- a/content/guides/rgfis.pdf
+++ b/content/guides/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:20160712064018+01'00')
-/ModDate (D:20160712064018+01'00')
+/CreationDate (D:20160712234646+01'00')
+/ModDate (D:20160712234646+01'00')
>>
endobj
2 0 obj
<< /Type /Catalog
/Pages 3 0 R
/Names 14 0 R
-/Outlines 270 0 R
-/PageLabels 285 0 R
+/Outlines 331 0 R
+/PageLabels 350 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 20
-/Kids [7 0 R 10 0 R 12 0 R 35 0 R 56 0 R 64 0 R 70 0 R 76 0 R 81 0 R 94 0 R 104 0 R 106 0 R 118 0 R 137 0 R 146 0 R 158 0 R 186 0 R 203 0 R 213 0 R 228 0 R]
+/Count 24
+/Kids [7 0 R 10 0 R 12 0 R 35 0 R 56 0 R 64 0 R 70 0 R 76 0 R 83 0 R 96 0 R 106 0 R 110 0 R 120 0 R 146 0 R 155 0 R 167 0 R 176 0 R 182 0 R 216 0 R 238 0 R 246 0 R 254 0 R 261 0 R 275 0 R]
>>
endobj
4 0 obj
@@ -80,15 +80,15 @@ endobj
<< /Type /Font
/BaseFont /AAAABR+NotoSerif
/Subtype /TrueType
-/FontDescriptor 287 0 R
+/FontDescriptor 352 0 R
/FirstChar 32
/LastChar 255
-/Widths 289 0 R
-/ToUnicode 288 0 R
+/Widths 354 0 R
+/ToUnicode 353 0 R
>>
endobj
9 0 obj
-<< /Length 11082
+<< /Length 14893
>>
stream
q
@@ -384,7 +384,7 @@ ET
BT
79.9485 640.9759999999999 Td
/F5.0 10.5 Tf
-<436f6d6d616e6444746f53657276696365496e7465726e616c> Tj
+<41757468656e7469636174696f6e53657373696f6e50726f7669646572> Tj
ET
0.000 0.000 0.000 SCN
@@ -393,9 +393,9 @@ ET
0.200 0.200 0.200 SCN
BT
-213.27124999999995 640.9759999999999 Td
+234.64924999999994 640.9759999999999 Td
/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -413,7 +413,7 @@ ET
BT
535.3009999999999 640.9759999999999 Td
/F1.0 10.5 Tf
-<3131> Tj
+<3132> Tj
ET
0.000 0.000 0.000 SCN
@@ -435,7 +435,7 @@ ET
BT
79.9485 622.4959999999999 Td
/F5.0 10.5 Tf
-<496e746572616374696f6e44746f53657276696365496e7465726e616c> Tj
+<436f6d6d616e6444746f53657276696365496e7465726e616c> Tj
ET
0.000 0.000 0.000 SCN
@@ -444,9 +444,9 @@ ET
0.200 0.200 0.200 SCN
BT
-234.64924999999994 622.4959999999999 Td
+213.27124999999995 622.4959999999999 Td
/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -464,7 +464,7 @@ ET
BT
535.3009999999999 622.4959999999999 Td
/F1.0 10.5 Tf
-<3133> Tj
+<3132> Tj
ET
0.000 0.000 0.000 SCN
@@ -473,9 +473,20 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24 604.0159999999998 Td
+60.24 604.0159999999998 Td
/F1.0 10.5 Tf
-[<342e2050657273697374656e6365204c61> 20.01953125 <79657220696e7465726e616c20535049>] TJ
+<332e332e20> 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 604.0159999999998 Td
+/F5.0 10.5 Tf
+<4d65737361676542726f6b657253657276696365496e7465726e616c> Tj
ET
0.000 0.000 0.000 SCN
@@ -484,9 +495,9 @@ ET
0.200 0.200 0.200 SCN
BT
-213.27124999999995 604.0159999999998 Td
+229.30474999999996 604.0159999999998 Td
/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -504,7 +515,7 @@ ET
BT
535.3009999999999 604.0159999999998 Td
/F1.0 10.5 Tf
-<3134> Tj
+<3133> Tj
ET
0.000 0.000 0.000 SCN
@@ -515,7 +526,7 @@ ET
BT
60.24 585.5359999999998 Td
/F1.0 10.5 Tf
-<342e312e20> Tj
+<332e342e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -526,7 +537,7 @@ ET
BT
79.9485 585.5359999999998 Td
/F5.0 10.5 Tf
-<4175646974696e6753657276696365496e7465726e616c> Tj
+<496e746572616374696f6e44746f53657276696365496e7465726e616c> Tj
ET
0.000 0.000 0.000 SCN
@@ -535,9 +546,9 @@ ET
0.200 0.200 0.200 SCN
BT
-202.58224999999993 585.5359999999998 Td
+234.64924999999994 585.5359999999998 Td
/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -564,7 +575,98 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 567.0559999999998 Td
+48.24 567.0559999999998 Td
+/F1.0 10.5 Tf
+[<342e2050657273697374656e6365204c61> 20.01953125 <79657220696e7465726e616c20535049>] 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.27124999999995 567.0559999999998 Td
+/F1.0 10.5 Tf
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+
+BT
+533.94125 567.0559999999998 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 567.0559999999998 Td
+/F1.0 10.5 Tf
+<3136> 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 548.5759999999998 Td
+/F1.0 10.5 Tf
+<342e312e20> 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 548.5759999999998 Td
+/F5.0 10.5 Tf
+<4175646974696e6753657276696365496e7465726e616c> 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
+202.58224999999993 548.5759999999998 Td
+/F1.0 10.5 Tf
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+
+BT
+533.94125 548.5759999999998 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 548.5759999999998 Td
+/F1.0 10.5 Tf
+<3137> 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 530.0959999999998 Td
/F1.0 10.5 Tf
<342e322e20> Tj
ET
@@ -575,7 +677,7 @@ ET
0.694 0.129 0.275 SCN
BT
-79.9485 567.0559999999998 Td
+79.9485 530.0959999999998 Td
/F5.0 10.5 Tf
<4368616e6765644f626a6563747353657276696365496e7465726e616c> Tj
ET
@@ -586,7 +688,7 @@ ET
0.200 0.200 0.200 SCN
BT
-234.64924999999994 567.0559999999998 Td
+234.64924999999994 530.0959999999998 Td
/F1.0 10.5 Tf
<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
@@ -595,7 +697,7 @@ ET
0.000 0.000 0.000 scn
BT
-533.94125 567.0559999999998 Td
+533.94125 530.0959999999998 Td
/F1.0 5.25 Tf
<ca> Tj
ET
@@ -604,9 +706,9 @@ ET
0.200 0.200 0.200 SCN
BT
-535.3009999999999 567.0559999999998 Td
+535.3009999999999 530.0959999999998 Td
/F1.0 10.5 Tf
-<3135> Tj
+<3137> Tj
ET
0.000 0.000 0.000 SCN
@@ -615,7 +717,7 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 548.5759999999998 Td
+60.24 511.6159999999998 Td
/F1.0 10.5 Tf
<342e332e20> Tj
ET
@@ -626,7 +728,58 @@ ET
0.694 0.129 0.275 SCN
BT
-79.9485 548.5759999999998 Td
+79.9485 511.6159999999998 Td
+/F5.0 10.5 Tf
+<50657273697374656e636553657373696f6e53657276696365496e7465726e616c> 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
+256.0272499999999 511.6159999999998 Td
+/F1.0 10.5 Tf
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+
+BT
+533.94125 511.6159999999998 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 511.6159999999998 Td
+/F1.0 10.5 Tf
+<3139> 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 493.1359999999998 Td
+/F1.0 10.5 Tf
+<342e342e20> 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 493.1359999999998 Td
/F5.0 10.5 Tf
<5075626c697368696e6753657276696365496e7465726e616c> Tj
ET
@@ -637,7 +790,7 @@ ET
0.200 0.200 0.200 SCN
BT
-213.27124999999995 548.5759999999998 Td
+213.27124999999995 493.1359999999998 Td
/F1.0 10.5 Tf
<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
@@ -646,7 +799,7 @@ ET
0.000 0.000 0.000 scn
BT
-533.94125 548.5759999999998 Td
+533.94125 493.1359999999998 Td
/F1.0 5.25 Tf
<ca> Tj
ET
@@ -655,9 +808,60 @@ ET
0.200 0.200 0.200 SCN
BT
-535.3009999999999 548.5759999999998 Td
+535.3009999999999 493.1359999999998 Td
/F1.0 10.5 Tf
-<3137> Tj
+<3230> 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 474.6559999999998 Td
+/F1.0 10.5 Tf
+<342e352e20> 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 474.6559999999998 Td
+/F5.0 10.5 Tf
+<5472616e73616374696f6e537461746550726f7669646572496e7465726e616c> 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
+250.68274999999994 474.6559999999998 Td
+/F1.0 10.5 Tf
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+
+BT
+533.94125 474.6559999999998 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 474.6559999999998 Td
+/F1.0 10.5 Tf
+<3232> Tj
ET
0.000 0.000 0.000 SCN
@@ -677,7 +881,7 @@ endobj
/F5.0 39 0 R
>>
>>
-/Annots [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 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]
+/Annots [287 0 R 288 0 R 289 0 R 290 0 R 291 0 R 292 0 R 293 0 R 294 0 R 295 0 R 296 0 R 297 0 R 298 0 R 299 0 R 300 0 R 301 0 R 302 0 R 303 0 R 304 0 R 305 0 R 306 0 R 307 0 R 308 0 R 309 0 R 310 0 R 311 0 R 312 0 R 313 0 R 314 0 R 315 0 R 316 0 R 317 0 R 318 0 R 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 328 0 R 329 0 R]
>>
endobj
11 0 obj
@@ -1337,7 +1541,7 @@ endobj
/F1.0 8 0 R
/F3.1 17 0 R
>>
-/XObject << /Stamp1 269 0 R
+/XObject << /Stamp1 330 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]
@@ -1352,29 +1556,29 @@ endobj
>>
endobj
15 0 obj
-<< /Kids [151 0 R 152 0 R 232 0 R]
+<< /Kids [160 0 R 161 0 R 248 0 R]
>>
endobj
16 0 obj
<< /Type /Font
/BaseFont /AAAABS+NotoSerif-Bold
/Subtype /TrueType
-/FontDescriptor 291 0 R
+/FontDescriptor 356 0 R
/FirstChar 32
/LastChar 255
-/Widths 293 0 R
-/ToUnicode 292 0 R
+/Widths 358 0 R
+/ToUnicode 357 0 R
>>
endobj
17 0 obj
<< /Type /Font
/BaseFont /AAAABT+FontAwesome
/Subtype /TrueType
-/FontDescriptor 295 0 R
+/FontDescriptor 360 0 R
/FirstChar 32
/LastChar 255
-/Widths 297 0 R
-/ToUnicode 296 0 R
+/Widths 362 0 R
+/ToUnicode 361 0 R
>>
endobj
18 0 obj
@@ -2998,7 +3202,7 @@ endobj
/F4.0 38 0 R
/F5.0 39 0 R
>>
-/XObject << /Stamp1 269 0 R
+/XObject << /Stamp1 330 0 R
>>
>>
/Annots [37 0 R 40 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 53 0 R 54 0 R]
@@ -3022,22 +3226,22 @@ endobj
<< /Type /Font
/BaseFont /AAAABU+NotoSerif-Italic
/Subtype /TrueType
-/FontDescriptor 299 0 R
+/FontDescriptor 364 0 R
/FirstChar 32
/LastChar 255
-/Widths 301 0 R
-/ToUnicode 300 0 R
+/Widths 366 0 R
+/ToUnicode 365 0 R
>>
endobj
39 0 obj
<< /Type /Font
/BaseFont /AAAABV+mplus1mn-regular
/Subtype /TrueType
-/FontDescriptor 303 0 R
+/FontDescriptor 368 0 R
/FirstChar 32
/LastChar 255
-/Widths 305 0 R
-/ToUnicode 304 0 R
+/Widths 370 0 R
+/ToUnicode 369 0 R
>>
endobj
40 0 obj
@@ -3165,7 +3369,7 @@ endobj
>>
endobj
55 0 obj
-<< /Length 12943
+<< /Length 13612
>>
stream
q
@@ -3550,12 +3754,12 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-2.336 Tw
+0.025 Tw
BT
66.24000000000001 446.19600000000037 Td
/F1.0 10.5 Tf
-[<546865204170616368652049736973206672> 20.01953125 <616d65776f726b2070726f766964657320612064656661756c7420696d706c656d656e746174696f6e206f6620>] TJ
+[<546865204170616368652049736973206672> 20.01953125 <616d65776f726b2070726f766964657320746872656520696d706c656d656e746174696f6e73206f6620>] TJ
ET
@@ -3565,10 +3769,10 @@ ET
0.694 0.129 0.275 scn
0.694 0.129 0.275 SCN
-2.336 Tw
+0.025 Tw
BT
-415.78999999999996 446.19600000000037 Td
+382.1754216579861 446.19600000000037 Td
/F5.0 10.5 Tf
<436f6e74656e744e65676f74696174696f6e53657276696365> Tj
ET
@@ -3580,10 +3784,12 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-2.336 Tw
+0.025 Tw
BT
-547.04 446.19600000000037 Td
+513.4254216579861 446.19600000000037 Td
+/F1.0 10.5 Tf
+<207768696368> Tj
ET
@@ -3593,12 +3799,12 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-1.541 Tw
+4.283 Tw
BT
66.24000000000001 430.4160000000004 Td
/F1.0 10.5 Tf
-<776869636820696e737065637473207468652022782d726f2d646f6d61696e747970652220636f6d706f6e656e74206f6620746865204854545020> Tj
+<696e73706563747320646966666572656e7420656c656d656e7473206f6620746865204854545020> Tj
ET
@@ -3608,10 +3814,10 @@ ET
0.694 0.129 0.275 scn
0.694 0.129 0.275 SCN
-1.541 Tw
+4.283 Tw
BT
-389.82723076923077 430.4160000000004 Td
+291.58299999999997 430.4160000000004 Td
/F5.0 10.5 Tf
<416363657074> Tj
ET
@@ -3623,12 +3829,27 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-1.541 Tw
+4.283 Tw
BT
-421.32723076923077 430.4160000000004 Td
+323.083 430.4160000000004 Td
/F1.0 10.5 Tf
-<206865616465722e202049662070726573656e742c2074686973> Tj
+<206865616465722e20204f6e65206f6620746865736520696d706c656d656e746174696f6e732c> 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
+
+7.817 Tw
+
+BT
+66.24000000000001 414.63600000000037 Td
+/F5.0 10.5 Tf
+<436f6e74656e744e65676f74696174696f6e5365727669636558526f446f6d61696e54797065> Tj
ET
@@ -3638,32 +3859,55 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
+7.817 Tw
+
BT
-66.24000000000001 414.63600000000037 Td
+265.74 414.63600000000037 Td
/F1.0 10.5 Tf
-<696d706c656d656e746174696f6e2077696c6c2064656c656761746520746f2074686520636f6d70616e696f6e20> Tj
+<2077696c6c20667572746865722064656c656761746520646f776e20746f2074686520636f6d70616e696f6e> 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.659 Tw
+
BT
-305.745 414.63600000000037 Td
+66.24000000000001 398.85600000000034 Td
/F5.0 10.5 Tf
<436f6e74656e744d617070696e6753657276696365> 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.659 Tw
+
+BT
+176.49 398.85600000000034 Td
+/F1.0 10.5 Tf
+<20736572766963652028696620636f6e666967757265642f617661696c61626c65292c206261736564206f6e207468652076616c7565206f66207468652022782d726f2d646f6d61696e2d> 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
-415.995 414.63600000000037 Td
+66.24000000000001 383.07600000000036 Td
/F1.0 10.5 Tf
-<20736572766963652c20696620636f6e666967757265642e20> Tj
+[<747970652220706172> 20.01953125 <616d65746572206f6620746865206865616465722e>] TJ
ET
0.000 0.000 0.000 SCN
@@ -3674,7 +3918,7 @@ ET
1.934 Tw
BT
-66.24000000000001 386.8560000000004 Td
+66.24000000000001 355.29600000000033 Td
/F1.0 10.5 Tf
<41207479706963616c20696d706c656d656e746174696f6e206f6620> Tj
ET
@@ -3689,7 +3933,7 @@ ET
1.934 Tw
BT
-216.26295454545453 386.8560000000004 Td
+216.26295454545453 355.29600000000033 Td
/F5.0 10.5 Tf
<436f6e74656e744d617070696e6753657276696365> Tj
ET
@@ -3704,7 +3948,7 @@ ET
1.934 Tw
BT
-326.51295454545453 386.8560000000004 Td
+326.51295454545453 355.29600000000033 Td
/F1.0 10.5 Tf
<2077696c6c20636f6e766572742074686520646f6d61696e206f626a65637420696e746f20736f6d65> Tj
ET
@@ -3719,7 +3963,7 @@ ET
0.134 Tw
BT
-66.24000000000001 371.07600000000036 Td
+66.24000000000001 339.5160000000003 Td
/F1.0 10.5 Tf
[<736f7274206f662044> 20.01953125 <54> 20.01953125 <4f202864617461207472> 20.01953125 <616e73666572206f626a65637429206173207370656369666965642062> 20.01953125 <79207468652022782d726f2d646f6d61696e74797065222e2020496620746869732044> 20.01953125 <54> 20.01953125 <4f20697320616e6e6f7461746564>] TJ
ET
@@ -3734,7 +3978,7 @@ ET
2.838 Tw
BT
-66.24000000000001 355.2960000000004 Td
+66.24000000000001 323.73600000000033 Td
/F1.0 10.5 Tf
[<77697468204a415842206f72204a61636b736f6e206d617070696e67732c207468656e207468652052> 20.01953125 <4f207669657765722028636f757274657379206f662074686520756e6465726c79696e6720>] TJ
ET
@@ -3749,7 +3993,7 @@ ET
2.838 Tw
BT
-503.01349999999996 355.2960000000004 Td
+503.01349999999996 323.73600000000033 Td
/F1.0 10.5 Tf
<5265737445617379> Tj
ET
@@ -3764,7 +4008,7 @@ ET
2.838 Tw
BT
-547.04 355.2960000000004 Td
+547.04 323.73600000000033 Td
ET
@@ -3775,9 +4019,9 @@ ET
0.200 0.200 0.200 SCN
BT
-66.24000000000001 339.5160000000004 Td
+66.24000000000001 307.95600000000036 Td
/F1.0 10.5 Tf
-[<6672> 20.01953125 <616d65776f726b292063616e2073657269616c697a65207468657365206469726563746c7920>] TJ
+[<6672> 20.01953125 <616d65776f726b292063616e2073657269616c697a65207468657365206469726563746c79> 89.84375 <2e>] TJ
ET
0.000 0.000 0.000 SCN
@@ -3788,7 +4032,7 @@ ET
1.544 Tw
BT
-66.24000000000001 311.7360000000004 Td
+66.24000000000001 280.17600000000033 Td
/F1.0 10.5 Tf
<5768617420616c6c2074686174206d65616e7320697320746861742c2069662074686520756e6465726c79696e6720656e746974696573206368616e67652c2077652061726520726571756972656420746f2075706461746520746865> Tj
ET
@@ -3801,7 +4045,7 @@ ET
0.200 0.200 0.200 SCN
BT
-66.24000000000001 295.95600000000036 Td
+66.24000000000001 264.3960000000003 Td
/F1.0 10.5 Tf
<6d617070696e677320696e2074686520> Tj
ET
@@ -3812,7 +4056,7 @@ ET
0.694 0.129 0.275 SCN
BT
-149.6835 295.95600000000036 Td
+149.6835 264.3960000000003 Td
/F5.0 10.5 Tf
<436f6e74656e744d617070696e6753657276696365> Tj
ET
@@ -3823,7 +4067,7 @@ ET
0.200 0.200 0.200 SCN
BT
-259.9335 295.95600000000036 Td
+259.9335 264.3960000000003 Td
/F1.0 10.5 Tf
[<20746f206d617020746f207468652073616d652044> 20.01953125 <54> 20.01953125 <4f732e>] TJ
ET
@@ -3834,7 +4078,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24000000000001 262.1760000000004 Td
+48.24000000000001 230.61600000000033 Td
/F1.0 10.5 Tf
[<54686973206469616772> 20.01953125 <616d20696c6c75737472> 20.01953125 <6174657320746865207468726565206f7074696f6e7320617661696c61626c653a>] TJ
ET
@@ -3843,7 +4087,7 @@ ET
0.000 0.000 0.000 scn
q
-498.800 0 0 166.267 48.240 80.093 cm
+498.800 0 0 166.267 48.240 48.533 cm
/I1 Do
Q
q
@@ -3880,7 +4124,7 @@ endobj
/F5.0 39 0 R
>>
/XObject << /I1 61 0 R
-/Stamp1 269 0 R
+/Stamp1 330 0 R
>>
>>
/Annots [57 0 R 58 0 R 59 0 R 60 0 R 62 0 R]
@@ -3915,7 +4159,7 @@ endobj
/URI (rgsvc.pdf#_rgsvc_spi_ContentMappingService)
>>
/Subtype /Link
-/Rect [305.745 413.16600000000034 415.995 423.66600000000034]
+/Rect [66.24000000000001 397.3860000000003 176.49 407.8860000000003]
/Type /Annot
>>
endobj
@@ -3926,7 +4170,7 @@ endobj
/URI (http://resteasy.jboss.org/)
>>
/Subtype /Link
-/Rect [503.01349999999996 352.2300000000004 547.04 366.5100000000004]
+/Rect [503.01349999999996 320.67000000000036 547.04 334.95000000000033]
/Type /Annot
>>
endobj
@@ -3965,12 +4209,12 @@ endobj
/URI (images/reference-services-spi/ContentNegotiationService/facade-choices.png)
>>
/Subtype /Link
-/Rect [48.24000000000001 80.0933333333337 547.04 246.36000000000035]
+/Rect [48.24000000000001 48.53333333333367 547.04 214.80000000000032]
/Type /Annot
>>
endobj
63 0 obj
-<< /Length 28207
+<< /Length 26793
>>
stream
q
@@ -4003,10 +4247,10 @@ q
52.240 749.630 m
543.040 749.630 l
545.249 749.630 547.040 747.839 547.040 745.630 c
-547.040 407.350 l
-547.040 405.141 545.249 403.350 543.040 403.350 c
-52.240 403.350 l
-50.031 403.350 48.240 405.141 48.240 407.350 c
+547.040 481.050 l
+547.040 478.841 545.249 477.050 543.040 477.050 c
+52.240 477.050 l
+50.031 477.050 48.240 478.841 48.240 481.050 c
48.240 745.630 l
48.240 747.839 50.031 749.630 52.240 749.630 c
h
@@ -4016,10 +4260,10 @@ f
52.240 749.630 m
543.040 749.630 l
545.249 749.630 547.040 747.839 547.040 745.630 c
-547.040 407.350 l
-547.040 405.141 545.249 403.350 543.040 403.350 c
-52.240 403.350 l
-50.031 403.350 48.240 405.141 48.240 407.350 c
+547.040 481.050 l
+547.040 478.841 545.249 477.050 543.040 477.050 c
+52.240 477.050 l
+50.031 477.050 48.240 478.841 48.240 481.050 c
48.240 745.630 l
48.240 747.839 50.031 749.630 52.240 749.630 c
h
@@ -4113,13 +4357,13 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
81.24000000000001 712.065 Td
/F5.0 11 Tf
-<4050726f6772616d6d61746963> Tj
+<526573706f6e7365> Tj
ET
0.000 0.000 0.000 SCN
@@ -4128,40 +4372,18 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 697.325 Td
+125.24000000000001 712.065 Td
/F5.0 11 Tf
-<ca202020> Tj
+<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
+0.200 0.400 0.600 scn
+0.200 0.400 0.600 SCN
BT
-81.24000000000001 697.325 Td
-/F5.0 11 Tf
-<526573706f6e7365> 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.24000000000001 697.325 Td
-/F5.0 11 Tf
-<2e> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-130.74 697.325 Td
+130.74 712.065 Td
/F5.0 11 Tf
<526573706f6e73654275696c646572> Tj
ET
@@ -4172,7 +4394,7 @@ ET
0.200 0.200 0.200 SCN
BT
-213.24 697.325 Td
+213.24 712.065 Td
/F5.0 11 Tf
<20> Tj
ET
@@ -4183,7 +4405,7 @@ ET
0.200 0.200 0.200 SCN
BT
-218.74 697.325 Td
+218.74 712.065 Td
/F5.0 11 Tf
<6275696c64526573706f6e7365> Tj
ET
@@ -4194,7 +4416,7 @@ ET
0.200 0.200 0.200 SCN
BT
-290.24 697.325 Td
+290.24 712.065 Td
/F5.0 11 Tf
<28> Tj
ET
@@ -4205,7 +4427,7 @@ ET
0.200 0.200 0.200 SCN
BT
-295.74 697.325 Td
+295.74 712.065 Td
/F5.0 11 Tf
<202020202020202020202020202020202020202020> Tj
ET
@@ -4216,7 +4438,7 @@ ET
0.694 0.129 0.275 SCN
BT
-411.24 697.325 Td
+411.24 712.065 Td
/F5.1 11 Tf
<21> Tj
ET
@@ -4227,7 +4449,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 682.5850000000002 Td
+59.24 697.325 Td
/F5.0 11 Tf
<ca2020202020202020202020> Tj
ET
@@ -4238,7 +4460,7 @@ ET
0.200 0.200 0.200 SCN
BT
-125.24000000000001 682.5850000000002 Td
+125.24000000000001 697.325 Td
/F5.0 11 Tf
<526570726573656e746174696f6e53657276696365> Tj
ET
@@ -4249,7 +4471,7 @@ ET
0.200 0.200 0.200 SCN
BT
-240.74 682.5850000000002 Td
+240.74 697.325 Td
/F5.0 11 Tf
<2e> Tj
ET
@@ -4260,7 +4482,7 @@ ET
0.200 0.400 0.600 SCN
BT
-246.24 682.5850000000002 Td
+246.24 697.325 Td
/F5.0 11 Tf
<436f6e7465787432> Tj
ET
@@ -4271,7 +4493,7 @@ ET
0.200 0.200 0.200 SCN
BT
-290.24 682.5850000000002 Td
+290.24 697.325 Td
/F5.0 11 Tf
<20> Tj
ET
@@ -4282,7 +4504,7 @@ ET
0.200 0.200 0.200 SCN
BT
-295.74 682.5850000000002 Td
+295.74 697.325 Td
/F5.0 11 Tf
<72656e646572436f6e7465787432> Tj
ET
@@ -4293,7 +4515,7 @@ ET
0.200 0.200 0.200 SCN
BT
-372.74 682.5850000000002 Td
+372.74 697.325 Td
/F5.0 11 Tf
<2c> Tj
ET
@@ -4304,7 +4526,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 667.8450000000001 Td
+59.24 682.5850000000002 Td
/F5.0 11 Tf
<ca2020202020202020202020> Tj
ET
@@ -4315,7 +4537,7 @@ ET
0.200 0.200 0.200 SCN
BT
-125.24000000000001 667.8450000000001 Td
+125.24000000000001 682.5850000000002 Td
/F5.0 11 Tf
<4f626a65637441646170746572> Tj
ET
@@ -4326,7 +4548,7 @@ ET
0.200 0.200 0.200 SCN
BT
-196.74 667.8450000000001 Td
+196.74 682.5850000000002 Td
/F5.0 11 Tf
<20> Tj
ET
@@ -4337,7 +4559,7 @@ ET
0.200 0.200 0.200 SCN
BT
-202.24 667.8450000000001 Td
+202.24 682.5850000000002 Td
/F5.0 11 Tf
<6f626a65637441646170746572> Tj
ET
@@ -4348,7 +4570,7 @@ ET
0.200 0.200 0.200 SCN
BT
-273.74 667.8450000000001 Td
+273.74 682.5850000000002 Td
/F5.0 11 Tf
<293b> Tj
ET
@@ -4359,29 +4581,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 653.1050000000001 Td
-/F5.0 11 Tf
-<ca202020> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
-
-BT
-81.24000000000001 653.1050000000001 Td
-/F5.0 11 Tf
-<4050726f6772616d6d61746963> 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 638.3650000000001 Td
+59.24 667.8450000000001 Td
/F5.0 11 Tf
<ca202020> Tj
ET
@@ -4392,7 +4592,7 @@ ET
0.200 0.200 0.200 SCN
BT
-81.24000000000001 638.3650000000001 Td
+81.24000000000001 667.8450000000001 Td
/F5.0 11 Tf
<526573706f6e7365> Tj
ET
@@ -4403,7 +4603,7 @@ ET
0.200 0.200 0.200 SCN
BT
-125.24000000000001 638.3650000000001 Td
+125.24000000000001 667.8450000000001 Td
/F5.0 11 Tf
<2e> Tj
ET
@@ -4414,7 +4614,7 @@ ET
0.200 0.400 0.600 SCN
BT
-130.74 638.3650000000001 Td
+130.74 667.8450000000001 Td
/F5.0 11 Tf
<526573706f6e73654275696c646572> Tj
ET
@@ -4425,7 +4625,7 @@ ET
0.200 0.200 0.200 SCN
BT
-213.24 638.3650000000001 Td
+213.24 667.8450000000001 Td
/F5.0 11 Tf
<20> Tj
ET
@@ -4436,7 +4636,7 @@ ET
0.200 0.200 0.200 SCN
BT
-218.74 638.3650000000001 Td
+218.74 667.8450000000001 Td
/F5.0 11 Tf
<6275696c64526573706f6e7365> Tj
ET
@@ -4447,7 +4647,7 @@ ET
0.200 0.200 0.200 SCN
BT
-290.24 638.3650000000001 Td
+290.24 667.8450000000001 Td
/F5.0 11 Tf
<28> Tj
ET
@@ -4458,7 +4658,7 @@ ET
0.200 0.200 0.200 SCN
BT
-295.74 638.3650000000001 Td
+295.74 667.8450000000001 Td
/F5.0 11 Tf
<202020202020202020202020202020202020202020> Tj
ET
@@ -4469,7 +4669,7 @@ ET
0.694 0.129 0.275 SCN
BT
-411.24 638.3650000000001 Td
+411.24 667.8450000000001 Td
/F5.1 11 Tf
<22> Tj
ET
@@ -4480,7 +4680,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 623.6250000000001 Td
+59.24 653.1050000000001 Td
/F5.0 11 Tf
<ca2020202020202020202020> Tj
ET
@@ -4491,7 +4691,7 @@ ET
0.200 0.200 0.200 SCN
BT
-125.24000000000001 623.6250000000001 Td
+125.24000000000001 653.1050000000001 Td
/F5.0 11 Tf
<526570726573656e746174696f6e53657276696365> Tj
ET
@@ -4502,7 +4702,7 @@ ET
0.200 0.200 0.200 SCN
BT
-240.74 623.6250000000001 Td
+240.74 653.1050000000001 Td
/F5.0 11 Tf
<2e> Tj
ET
@@ -4513,7 +4713,7 @@ ET
0.200 0.400 0.600 SCN
BT
-246.24 623.6250000000001 Td
+246.24 653.1050000000001 Td
/F5.0 11 Tf
<436f6e7465787432> Tj
ET
@@ -4524,7 +4724,7 @@ ET
0.200 0.200 0.200 SCN
BT
-290.24 623.6250000000001 Td
+290.24 653.1050000000001 Td
/F5.0 11 Tf
<20> Tj
ET
@@ -4535,7 +4735,7 @@ ET
0.200 0.200 0.200 SCN
BT
-295.74 623.6250000000001 Td
+295.74 653.1050000000001 Td
/F5.0 11 Tf
<72656e646572436f6e7465787432> Tj
ET
@@ -4546,7 +4746,7 @@ ET
0.200 0.200 0.200 SCN
BT
-372.74 623.6250000000001 Td
+372.74 653.1050000000001 Td
/F5.0 11 Tf
<2c> Tj
ET
@@ -4557,7 +4757,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 608.8850000000001 Td
+59.24 638.3650000000001 Td
/F5.0 11 Tf
<ca2020202020202020202020> Tj
ET
@@ -4568,7 +4768,7 @@ ET
0.200 0.200 0.200 SCN
BT
-125.24000000000001 608.8850000000001 Td
+125.24000000000001 638.3650000000001 Td
/F5.0 11 Tf
<4f626a656374416e6450726f7065727479> Tj
ET
@@ -4579,7 +4779,7 @@ ET
0.200 0.200 0.200 SCN
BT
-218.74 608.8850000000001 Td
+218.74 638.3650000000001 Td
/F5.0 11 Tf
<20> Tj
ET
@@ -4590,7 +4790,7 @@ ET
0.200 0.200 0.200 SCN
BT
-224.24 608.8850000000001 Td
+224.24 638.3650000000001 Td
/F5.0 11 Tf
<6f626a656374416e6450726f7065727479> Tj
ET
@@ -4601,7 +4801,7 @@ ET
0.200 0.200 0.200 SCN
BT
-317.74 608.8850000000001 Td
+317.74 638.3650000000001 Td
/F5.0 11 Tf
<293b> Tj
ET
@@ -4612,29 +4812,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 594.1450000000001 Td
-/F5.0 11 Tf
-<ca202020> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
-
-BT
-81.24000000000001 594.1450000000001 Td
-/F5.0 11 Tf
-<4050726f6772616d6d61746963> 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 579.4050000000001 Td
+59.24 623.6250000000001 Td
/F5.0 11 Tf
<ca202020> Tj
ET
@@ -4645,7 +4823,7 @@ ET
0.200 0.200 0.200 SCN
BT
-81.24000000000001 579.4050000000001 Td
+81.24000000000001 623.6250000000001 Td
/F5.0 11 Tf
<526573706f6e7365> Tj
ET
@@ -4656,7 +4834,7 @@ ET
0.200 0.200 0.200 SCN
BT
-125.24000000000001 579.4050000000001 Td
+125.24000000000001 623.6250000000001 Td
/F5.0 11 Tf
<2e> Tj
ET
@@ -4667,7 +4845,7 @@ ET
0.200 0.400 0.600 SCN
BT
-130.74 579.4050000000001 Td
+130.74 623.6250000000001 Td
/F5.0 11 Tf
<526573706f6e73654275696c646572> Tj
ET
@@ -4678,7 +4856,7 @@ ET
0.200 0.200 0.200 SCN
BT
-213.24 579.4050000000001 Td
+213.24 623.6250000000001 Td
/F5.0 11 Tf
<20> Tj
ET
@@ -4689,7 +4867,7 @@ ET
0.200 0.200 0.200 SCN
BT
-218.74 579.4050000000001 Td
+218.74 623.6250000000001 Td
/F5.0 11 Tf
<6275696c64526573706f6e7365> Tj
ET
@@ -4700,7 +4878,7 @@ ET
0.200 0.200 0.200 SCN
BT
-290.24 579.4050000000001 Td
+290.24 623.6250000000001 Td
/F5.0 11 Tf
<28> Tj
ET
@@ -4711,7 +4889,7 @@ ET
0.200 0.200 0.200 SCN
BT
-295.74 579.4050000000001 Td
+295.74 623.6250000000001 Td
/F5.0 11 Tf
<202020202020202020202020202020202020202020> Tj
ET
@@ -4722,7 +4900,7 @@ ET
0.694 0.129 0.275 SCN
BT
-411.24 579.4050000000001 Td
+411.24 623.6250000000001 Td
/F5.1 11 Tf
<23> Tj
ET
@@ -4733,7 +4911,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 564.6650000000001 Td
+59.24 608.8850000000001 Td
/F5.0 11 Tf
<ca2020202020202020202020> Tj
ET
@@ -4744,7 +4922,7 @@ ET
0.200 0.200 0.200 SCN
BT
-125.24000000000001 564.6650000000001 Td
+125.24000000000001 608.8850000000001 Td
/F5.0 11 Tf
<526570726573656e746174696f6e53657276696365> Tj
ET
@@ -4755,7 +4933,7 @@ ET
0.200 0.200 0.200 SCN
BT
-240.74 564.6650000000001 Td
+240.74 608.8850000000001 Td
/F5.0 11 Tf
<2e> Tj
ET
@@ -4766,7 +4944,7 @@ ET
0.200 0.400 0.600 SCN
BT
-246.24 564.6650000000001 Td
+246.24 608.8850000000001 Td
/F5.0 11 Tf
<436f6e7465787432> Tj
ET
@@ -4777,7 +4955,7 @@ ET
0.200 0.200 0.200 SCN
BT
-290.24 564.6650000000001 Td
+290.24 608.8850000000001 Td
/F5.0 11 Tf
<20> Tj
ET
@@ -4788,7 +4966,7 @@ ET
0.200 0.200 0.200 SCN
BT
-295.74 564.6650000000001 Td
+295.74 608.8850000000001 Td
/F5.0 11 Tf
<72656e646572436f6e7465787432> Tj
ET
@@ -4799,7 +4977,7 @@ ET
0.200 0.200 0.200 SCN
BT
-372.74 564.6650000000001 Td
+372.74 608.8850000000001 Td
/F5.0 11 Tf
<2c> Tj
ET
@@ -4810,7 +4988,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 549.9250000000001 Td
+59.24 594.1450000000001 Td
/F5.0 11 Tf
<ca2020202020202020202020> Tj
ET
@@ -4821,7 +4999,7 @@ ET
0.200 0.200 0.200 SCN
BT
-125.24000000000001 549.9250000000001 Td
+125.24000000000001 594.1450000000001 Td
/F5.0 11 Tf
<4f626a656374416e64436f6c6c656374696f6e> Tj
ET
@@ -4832,7 +5010,7 @@ ET
0.200 0.200 0.200 SCN
BT
-229.74 549.9250000000001 Td
+229.74 594.1450000000001 Td
/F5.0 11 Tf
<20> Tj
ET
@@ -4843,7 +5021,7 @@ ET
0.200 0.200 0.200 SCN
BT
-235.24 549.9250000000001 Td
+235.24 594.1450000000001 Td
/F5.0 11 Tf
<6f626a656374416e64436f6c6c656374696f6e> Tj
ET
@@ -4854,7 +5032,7 @@ ET
0.200 0.200 0.200 SCN
BT
-339.74 549.9250000000001 Td
+339.74 594.1450000000001 Td
/F5.0 11 Tf
<293b> Tj
ET
@@ -4865,29 +5043,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 535.1850000000001 Td
-/F5.0 11 Tf
-<ca202020> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
-
-BT
-81.24000000000001 535.1850000000001 Td
-/F5.0 11 Tf
-<4050726f6772616d6d61746963> 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 520.445 Td
+59.24 579.4050000000001 Td
/F5.0 11 Tf
<ca202020> Tj
ET
@@ -4898,7 +5054,7 @@ ET
0.200 0.200 0.200 SCN
BT
-81.24000000000001 520.445 Td
+81.24000000000001 579.4050000000001 Td
/F5.0 11 Tf
<526573706f6e7365> Tj
ET
@@ -4909,7 +5065,7 @@ ET
0.200 0.200 0.200 SCN
BT
-125.24000000000001 520.445 Td
+125.24000000000001 579.4050000000001 Td
/F5.0 11 Tf
<2e> Tj
ET
@@ -4920,7 +5076,7 @@ ET
0.200 0.400 0.600 SCN
BT
-130.74 520.445 Td
+130.74 579.4050000000001 Td
/F5.0 11 Tf
<526573706f6e73654275696c646572> Tj
ET
@@ -4931,7 +5087,7 @@ ET
0.200 0.200 0.200 SCN
BT
-213.24 520.445 Td
+213.24 579.4050000000001 Td
/F5.0 11 Tf
<20> Tj
ET
@@ -4942,7 +5098,7 @@ ET
0.200 0.200 0.200 SCN
BT
-218.74 520.445 Td
+218.74 579.4050000000001 Td
/F5.0 11 Tf
<6275696c64526573706f6e7365> Tj
ET
@@ -4953,7 +5109,7 @@ ET
0.200 0.200 0.200 SCN
BT
-290.24 520.445 Td
+290.24 579.4050000000001 Td
/F5.0 11 Tf
<28> Tj
ET
@@ -4964,7 +5120,7 @@ ET
0.200 0.200 0.200 SCN
BT
-295.74 520.445 Td
+295.74 579.4050000000001 Td
/F5.0 11 Tf
<202020202020202020202020202020202020202020> Tj
ET
@@ -4975,7 +5131,7 @@ ET
0.694 0.129 0.275 SCN
BT
-411.24 520.445 Td
+411.24 579.4050000000001 Td
/F5.1 11 Tf
<24> Tj
ET
@@ -4986,7 +5142,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 505.70500000000004 Td
+59.24 564.6650000000001 Td
/F5.0 11 Tf
<ca2020202020202020202020> Tj
ET
@@ -4997,7 +5153,7 @@ ET
0.200 0.200 0.200 SCN
BT
-125.24000000000001 505.70500000000004 Td
+125.24000000000001 564.6650000000001 Td
/F5.0 11 Tf
<526570726573656e746174696f6e53657276696365> Tj
ET
@@ -5008,7 +5164,7 @@ ET
0.200 0.200 0.200 SCN
BT
-240.74 505.70500000000004 Td
+240.74 564.6650000000001 Td
/F5.0 11 Tf
<2e> Tj
ET
@@ -5019,7 +5175,7 @@ ET
0.200 0.400 0.600 SCN
BT
-246.24 505.70500000000004 Td
+246.24 564.6650000000001 Td
/F5.0 11 Tf
<436f6e7465787432> Tj
ET
@@ -5030,7 +5186,7 @@ ET
0.200 0.200 0.200 SCN
BT
-290.24 505.70500000000004 Td
+290.24 564.6650000000001 Td
/F5.0 11 Tf
<20> Tj
ET
@@ -5041,7 +5197,7 @@ ET
0.200 0.200 0.200 SCN
BT
-295.74 505.70500000000004 Td
+295.74 564.6650000000001 Td
/F5.0 11 Tf
<72656e646572436f6e7465787432> Tj
ET
@@ -5052,7 +5208,7 @@ ET
0.200 0.200 0.200 SCN
BT
-372.74 505.70500000000004 Td
+372.74 564.6650000000001 Td
/F5.0 11 Tf
<2c> Tj
ET
@@ -5063,7 +5219,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 490.96500000000003 Td
+59.24 549.9250000000001 Td
/F5.0 11 Tf
<ca2020202020202020202020> Tj
ET
@@ -5074,7 +5230,7 @@ ET
0.200 0.200 0.200 SCN
BT
-125.24000000000001 490.96500000000003 Td
+125.24000000000001 549.9250000000001 Td
/F5.0 11 Tf
<4f626a656374416e64416374696f6e> Tj
ET
@@ -5085,7 +5241,7 @@ ET
0.200 0.200 0.200 SCN
BT
-207.74 490.96500000000003 Td
+207.74 549.9250000000001 Td
/F5.0 11 Tf
<20> Tj
ET
@@ -5096,7 +5252,7 @@ ET
0.200 0.200 0.200 SCN
BT
-213.24 490.96500000000003 Td
+213.24 549.9250000000001 Td
/F5.0 11 Tf
<6f626a656374416e64416374696f6e> Tj
ET
@@ -5107,7 +5263,7 @@ ET
0.200 0.200 0.200 SCN
BT
-295.74 490.96500000000003 Td
+295.74 549.9250000000001 Td
/F5.0 11 Tf
<293b> Tj
ET
@@ -5118,29 +5274,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 476.2250000000001 Td
-/F5.0 11 Tf
-<ca202020> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
-
-BT
-81.24000000000001 476.2250000000001 Td
-/F5.0 11 Tf
-<4050726f6772616d6d61746963> 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 461.48500000000007 Td
+59.24 535.1850000000001 Td
/F5.0 11 Tf
<ca202020> Tj
ET
@@ -5151,7 +5285,7 @@ ET
0.200 0.200 0.200 SCN
BT
-81.24000000000001 461.48500000000007 Td
+81.24000000000001 535.1850000000001 Td
/F5.0 11 Tf
<526573706f6e7365> Tj
ET
@@ -5162,7 +5296,7 @@ ET
0.200 0.200 0.200 SCN
BT
-125.24000000000001 461.48500000000007 Td
+125.24000000000001 535.1850000000001 Td
/F5.0 11 Tf
<2e> Tj
ET
@@ -5173,7 +5307,7 @@ ET
0.200 0.400 0.600 SCN
BT
-130.74 461.48500000000007 Td
+130.74 535.1850000000001 Td
/F5.0 11 Tf
<526573706f6e73654275696c646572> Tj
ET
@@ -5184,7 +5318,7 @@ ET
0.200 0.200 0.200 SCN
BT
-213.24 461.48500000000007 Td
+213.24 535.1850000000001 Td
/F5.0 11 Tf
<20> Tj
ET
@@ -5195,7 +5329,7 @@ ET
0.200 0.200 0.200 SCN
BT
-218.74 461.48500000000007 Td
+218.74 535.1850000000001 Td
/F5.0 11 Tf
<6275696c64526573706f6e7365> Tj
ET
@@ -5206,7 +5340,7 @@ ET
0.200 0.200 0.200 SCN
BT
-290.24 461.48500000000007 Td
+290.24 535.1850000000001 Td
/F5.0 11 Tf
<28> Tj
ET
@@ -5217,7 +5351,7 @@ ET
0.200 0.200 0.200 SCN
BT
-295.74 461.48500000000007 Td
+295.74 535.1850000000001 Td
/F5.0 11 Tf
<202020202020202020202020202020202020202020> Tj
ET
@@ -5228,7 +5362,7 @@ ET
0.694 0.129 0.275 SCN
BT
-411.24 461.48500000000007 Td
+411.24 535.1850000000001 Td
/F5.1 11 Tf
<25> Tj
ET
@@ -5239,7 +5373,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 446.74500000000006 Td
+59.24 520.445 Td
/F5.0 11 Tf
<ca2020202020202020202020> Tj
ET
@@ -5250,7 +5384,7 @@ ET
0.200 0.200 0.200 SCN
BT
-125.24000000000001 446.74500000000006 Td
+125.24000000000001 520.445 Td
/F5.0 11 Tf
<526570726573656e746174696f6e53657276696365> Tj
ET
@@ -5261,7 +5395,7 @@ ET
0.200 0.200 0.200 SCN
BT
-240.74 446.74500000000006 Td
+240.74 520.445 Td
/F5.0 11 Tf
<2e> Tj
ET
@@ -5272,7 +5406,7 @@ ET
0.200 0.400 0.600 SCN
BT
-246.24 446.74500000000006 Td
+246.24 520.445 Td
/F5.0 11 Tf
<436f6e7465787432> Tj
ET
@@ -5283,7 +5417,7 @@ ET
0.200 0.200 0.200 SCN
BT
-290.24 446.74500000000006 Td
+290.24 520.445 Td
/F5.0 11 Tf
<20> Tj
ET
@@ -5294,7 +5428,7 @@ ET
0.200 0.200 0.200 SCN
BT
-295.74 446.74500000000006 Td
+295.74 520.445 Td
/F5.0 11 Tf
<72656e646572436f6e7465787432> Tj
ET
@@ -5305,7 +5439,7 @@ ET
0.200 0.200 0.200 SCN
BT
-372.74 446.74500000000006 Td
+372.74 520.445 Td
/F5.0 11 Tf
<2c> Tj
ET
@@ -5316,7 +5450,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 432.00500000000005 Td
+59.24 505.70500000000004 Td
/F5.0 11 Tf
<ca2020202020202020202020> Tj
ET
@@ -5327,7 +5461,7 @@ ET
0.200 0.200 0.200 SCN
BT
-125.24000000000001 432.00500000000005 Td
+125.24000000000001 505.70500000000004 Td
/F5.0 11 Tf
<4f626a656374416e64416374696f6e496e766f636174696f6e> Tj
ET
@@ -5338,7 +5472,7 @@ ET
0.200 0.200 0.200 SCN
BT
-262.74 432.00500000000005 Td
+262.74 505.70500000000004 Td
/F5.0 11 Tf
<20> Tj
ET
@@ -5349,7 +5483,7 @@ ET
0.200 0.200 0.200 SCN
BT
-268.24 432.00500000000005 Td
+268.24 505.70500000000004 Td
/F5.0 11 Tf
<6f626a656374416e64416374696f6e496e766f636174696f6e> Tj
ET
@@ -5360,7 +5494,7 @@ ET
0.200 0.200 0.200 SCN
BT
-405.74 432.00500000000005 Td
+405.74 505.70500000000004 Td
/F5.0 11 Tf
<293b> Tj
ET
@@ -5371,7 +5505,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 417.26500000000004 Td
+59.24 490.96500000000003 Td
/F5.0 11 Tf
<7d> Tj
ET
@@ -5382,7 +5516,7 @@ ET
0.694 0.129 0.275 SCN
BT
-51.2745 385.62500000000006 Td
+51.2745 459.3250000000001 Td
/F5.1 10.5 Tf
<21> Tj
ET
@@ -5393,7 +5527,7 @@ ET
0.200 0.200 0.200 SCN
BT
-64.809 385.386 Td
+64.809 459.08600000000007 Td
/F1.0 10.5 Tf
[<726570726573656e746174696f6e206f6620612073696e676c65206f626a6563742c206173207065722073656374696f6e2031342e34206f66207468652052> 20.01953125 <4f20737065632c2076312e30>] TJ
ET
@@ -5404,7 +5538,7 @@ ET
0.694 0.129 0.275 SCN
BT
-51.274499999999996 363.8450000000001 Td
+51.274499999999996 437.54500000000013 Td
/F5.1 10.5 Tf
<22> Tj
ET
@@ -5415,7 +5549,7 @@ ET
0.200 0.200 0.200 SCN
BT
-64.809 363.60600000000005 Td
+64.809 437.3060000000001 Td
/F1.0 10.5 Tf
[<726570726573656e746174696f6e206f6620612073696e676c652070726f7065727479206f6620616e206f626a6563742c206173207065722073656374696f6e2031362e34206f66207468652052> 20.01953125 <4f20737065632076312e30>] TJ
ET
@@ -5426,7 +5560,7 @@ ET
0.694 0.129 0.275 SCN
BT
-51.274499999999996 342.0650000000001 Td
+51.274499999999996 415.76500000000016 Td
/F5.1 10.5 Tf
<23> Tj
ET
@@ -5437,7 +5571,7 @@ ET
0.200 0.200 0.200 SCN
BT
-64.809 341.8260000000001 Td
+64.809 415.5260000000001 Td
/F1.0 10.5 Tf
[<726570726573656e746174696f6e206f6620612073696e676c6520636f6c6c656374696f6e206f6620616e206f626a6563742c206173207065722073656374696f6e2031372e35206f66207468652052> 20.01953125 <4f20737065632076312e30>] TJ
ET
@@ -5448,7 +5582,7 @@ ET
0.694 0.129 0.275 SCN
BT
-51.274499999999996 320.28500000000014 Td
+51.274499999999996 393.9850000000002 Td
/F5.1 10.5 Tf
<24> Tj
ET
@@ -5459,7 +5593,7 @@ ET
0.200 0.200 0.200 SCN
BT
-64.809 320.0460000000001 Td
+64.809 393.74600000000015 Td
/F1.0 10.5 Tf
[<726570726573656e746174696f6e206f6620612073696e676c6520616374696f6e202870726f6d707429206f6620616e206f626a6563742c206173207065722073656374696f6e2031382e32206f66207468652052> 20.01953125 <4f20737065632076312e30>] TJ
ET
@@ -5470,7 +5604,7 @@ ET
0.694 0.129 0.275 SCN
BT
-51.274499999999996 298.50500000000017 Td
+51.274499999999996 372.2050000000002 Td
/F5.1 10.5 Tf
<25> Tj
ET
@@ -5481,7 +5615,7 @@ ET
0.200 0.200 0.200 SCN
BT
-64.809 298.26600000000013 Td
+64.809 371.9660000000002 Td
/F1.0 10.5 Tf
[<726570726573656e746174696f6e206f662074686520726573756c7473206f6620612073696e676c6520616374696f6e20696e766f636174696f6e2c206173207065722073656374696f6e2031392e35206f66207468652052> 20.01953125 <4f20737065632076312e30>] TJ
ET
@@ -5492,7 +5626,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.239999999999995 270.48600000000016 Td
+48.239999999999995 344.1860000000002 Td
/F1.0 10.5 Tf
<5468657365206d6574686f64732070726f766964653a> Tj
ET
@@ -5505,7 +5639,7 @@ ET
0.200 0.200 0.200 SCN
BT
-56.8805 242.7060000000002 Td
+56.8805 316.40600000000023 Td
/F1.0 10.5 Tf
<a5> Tj
ET
@@ -5520,7 +5654,7 @@ ET
2.131 Tw
BT
-66.24 242.7060000000002 Td
+66.24 316.40600000000023 Td
/F1.0 10.5 Tf
<6120> Tj
ET
@@ -5535,7 +5669,7 @@ ET
2.131 Tw
BT
-76.99138888888888 242.7060000000002 Td
+76.99138888888888 316.40600000000023 Td
/F5.0 10.5 Tf
<526570726573656e746174696f6e536572766963652e436f6e7465787432> Tj
ET
@@ -5550,7 +5684,7 @@ ET
2.131 Tw
BT
-234.49138888888888 242.7060000000002 Td
+234.49138888888888 316.40600000000023 Td
/F1.0 10.5 Tf
<2077686963682070726f76696465732061636365737320746f20726571756573742d737065636966696320636f6e74657874202865672048545450> Tj
ET
@@ -5565,7 +5699,7 @@ ET
3.847 Tw
BT
-66.24 226.9260000000002 Td
+66.24 300.6260000000002 Td
/F1.0 10.5 Tf
[<68656164657273292c2073657373696f6e2d737065636966696320636f6e74657874202865672061757468656e7469636174696f6e2920616e6420676c6f62616c20636f6e746578742028656720636f6e6669677572> 20.01953125 <6174696f6e>] TJ
ET
@@ -5578,7 +5712,7 @@ ET
0.200 0.200 0.200 SCN
BT
-66.24 211.14600000000019 Td
+66.24 284.84600000000023 Td
/F1.0 10.5 Tf
<73657474696e677329> Tj
ET
@@ -5591,7 +5725,7 @@ ET
0.200 0.200 0.200 SCN
BT
-56.8805 189.36600000000018 Td
+56.8805 263.0660000000002 Td
/F1.0 10.5 Tf
<a5> Tj
ET
@@ -5604,7 +5738,7 @@ ET
0.200 0.200 0.200 SCN
BT
-66.24 189.36600000000018 Td
+66.24 263.0660000000002 Td
/F1.0 10.5 Tf
<616e206f626a65637420726570726573656e74696e672074686520696e666f726d6174696f6e20746f2062652072656e6465726564> Tj
ET
@@ -5615,7 +5749,7 @@ ET
0.200 0.200 0.200 SCN
BT
-66.24 161.58600000000018 Td
+66.24 235.28600000000023 Td
/F1.0 10.5 Tf
<656720> Tj
ET
@@ -5626,7 +5760,7 @@ ET
0.694 0.129 0.275 SCN
BT
-80.226 161.58600000000018 Td
+80.226 235.28600000000023 Td
/F5.0 10.5 Tf
<4f626a65637441646170746572> Tj
ET
@@ -5637,7 +5771,7 @@ ET
0.200 0.200 0.200 SCN
BT
-148.476 161.58600000000018 Td
+148.476 235.28600000000023 Td
/F1.0 10.5 Tf
<2c20> Tj
ET
@@ -5648,7 +5782,7 @@ ET
0.694 0.129 0.275 SCN
BT
-153.82049999999998 161.58600000000018 Td
+153.82049999999998 235.28600000000023 Td
/F5.0 10.5 Tf
<4f626a656374416e6450726f7065727479> Tj
ET
@@ -5659,7 +5793,7 @@ ET
0.200 0.200 0.200 SCN
BT
-243.07049999999998 161.58600000000018 Td
+243.07049999999998 235.28600000000023 Td
/F1.0 10.5 Tf
<2c20> Tj
ET
@@ -5670,7 +5804,7 @@ ET
0.694 0.129 0.275 SCN
BT
-248.41500000000002 161.58600000000018 Td
+248.41500000000002 235.28600000000023 Td
/F5.0 10.5 Tf
<4f626a656374416e64436f6c6c656374696f6e> Tj
ET
@@ -5681,7 +5815,7 @@ ET
0.200 0.200 0.200 SCN
BT
-348.165 161.58600000000018 Td
+348.165 235.28600000000023 Td
/F1.0 10.5 Tf
<20657463> Tj
ET
@@ -5692,7 +5826,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.239999999999995 127.80600000000018 Td
+48.239999999999995 201.50600000000023 Td
/F1.0 10.5 Tf
<496e20616c6c2063617365732c2072657475726e696e6720> Tj
ET
@@ -5703,7 +5837,7 @@ ET
0.694 0.129 0.275 SCN
BT
-159.34050000000002 127.80600000000018 Td
+159.34050000000002 201.50600000000023 Td
/F5.0 10.5 Tf
<6e756c6c> Tj
ET
@@ -5714,7 +5848,7 @@ ET
0.200 0.200 0.200 SCN
BT
-180.34050000000002 127.80600000000018 Td
+180.34050000000002 201.50600000000023 Td
/F1.0 10.5 Tf
[<2077696c6c20726573756c7420696e2074686520726567756c61722052> 20.01953125 <4f207370656320726570726573656e746174696f6e206265696e672072657475726e65642e>] TJ
ET
@@ -5725,7 +5859,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.239999999999995 93.30600000000018 Td
+48.239999999999995 167.0060000000002 Td
/F2.0 13 Tf
<322e312e322e20496d706c656d656e746174696f6e> Tj
ET
@@ -5738,7 +5872,7 @@ ET
6.535 Tw
BT
-48.239999999999995 66.7460000000002 Td
+48.239999999999995 140.4460000000002 Td
/F5.0 10.5 Tf
<436f6e74656e744e65676f74696174696f6e536572766963654162737472616374> Tj
ET
@@ -5753,7 +5887,7 @@ ET
6.535 Tw
BT
-221.49 66.7460000000002 Td
+221.49 140.4460000000002 Td
/F1.0 10.5 Tf
<2028696e20> Tj
ET
@@ -5768,7 +5902,7 @@ ET
6.535 Tw
BT
-253.7534 66.7460000000002 Td
+253.7534 140.4460000000002 Td
/F5.0 10.5 Tf
<6f2e612e692e762e726f2e72656e646572696e672e736572766963652e636f6e6e6567> Tj
ET
@@ -5783,7 +5917,7 @@ ET
6.535 Tw
BT
-437.5034 66.7460000000002 Td
+437.5034 140.4460000000002 Td
/F1.0 10.5 Tf
<292070726f76696465732061206e6f2d6f70> Tj
ET
@@ -5792,6 +5926,17 @@ 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 124.6660000000002 Td
+/F1.0 10.5 Tf
+<696d706c656d656e746174696f6e206f6620746865205350492c20616c6f6e67207769746820737570706f7274696e67206d6574686f64733a> 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
@@ -5828,7 +5973,7 @@ endobj
/F5.0 39 0 R
/F5.1 67 0 R
>>
-/XObject << /Stamp1 269 0 R
+/XObject << /Stamp1 330 0 R
>>
>>
>>
@@ -5840,77 +5985,68 @@ endobj
<< /Type /Font
/BaseFont /AAAABW+mplus1mn-bold
/Subtype /TrueType
-/FontDescriptor 307 0 R
+/FontDescriptor 372 0 R
/FirstChar 32
/LastChar 255
-/Widths 309 0 R
-/ToUnicode 308 0 R
+/Widths 374 0 R
+/ToUnicode 373 0 R
>>
endobj
67 0 obj
<< /Type /Font
/BaseFont /AAAABX+mplus1mn-regular
/Subtype /TrueType
-/FontDescriptor 311 0 R
+/FontDescriptor 376 0 R
/FirstChar 32
/LastChar 255
-/Widths 313 0 R
-/ToUnicode 312 0 R
+/Widths 378 0 R
+/ToUnicode 377 0 R
>>
endobj
68 0 obj
-[64 0 R /XYZ 0 111.99000000000018 null]
+[64 0 R /XYZ 0 185.69000000000023 null]
endobj
69 0 obj
-<< /Length 29532
+<< /Length 28665
>>
stream
q
-/DeviceRGB cs
-0.200 0.200 0.200 scn
-/DeviceRGB CS
-0.200 0.200 0.200 SCN
-
-BT
-48.24 794.6759999999999 Td
-/F1.0 10.5 Tf
-<696d706c656d656e746174696f6e206f6620746865205350492c20616c6f6e67207769746820737570706f7274696e67206d6574686f64733a> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
q
+/DeviceRGB cs
0.961 0.961 0.961 scn
-52.240 778.860 m
-543.040 778.860 l
-545.249 778.860 547.040 777.069 547.040 774.860 c
-547.040 569.240 l
-547.040 567.031 545.249 565.240 543.040 565.240 c
-52.240 565.240 l
-50.031 565.240 48.240 567.031 48.240 569.240 c
-48.240 774.860 l
-48.240 777.069 50.031 778.860 52.240 778.860 c
+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 596.270 l
+547.040 594.061 545.249 592.270 543.040 592.270 c
+52.240 592.270 l
+50.031 592.270 48.240 594.061 48.240 596.270 c
+48.240 801.890 l
+48.240 804.099 50.031 805.890 52.240 805.890 c
h
f
+/DeviceRGB CS
0.800 0.800 0.800 SCN
0.75 w
-52.240 778.860 m
-543.040 778.860 l
-545.249 778.860 547.040 777.069 547.040 774.860 c
-547.040 569.240 l
-547.040 567.031 545.249 565.240 543.040 565.240 c
-52.240 565.240 l
-50.031 565.240 48.240 567.031 48.240 569.240 c
-48.240 774.860 l
-48.240 777.069 50.031 778.860 52.240 778.860 c
+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 596.270 l
+547.040 594.061 545.249 592.270 543.040 592.270 c
+52.240 592.270 l
+50.031 592.270 48.240 594.061 48.240 596.270 c
+48.240 801.890 l
+48.240 804.099 50.031 805.890 52.240 805.890 c
h
S
Q
+/DeviceRGB cs
0.000 0.533 0.000 scn
+/DeviceRGB CS
0.000 0.533 0.000 SCN
BT
-59.24 756.035 Td
+59.24 783.0649999999999 Td
/F6.0 11 Tf
<7075626c6963> Tj
ET
@@ -5921,7 +6057,7 @@ ET
0.200 0.200 0.200 SCN
BT
-92.24000000000001 756.035 Td
+92.24000000000001 783.0649999999999 Td
/F5.0 11 Tf
<20> Tj
ET
@@ -5932,7 +6068,7 @@ ET
0.000 0.533 0.000 SCN
BT
-97.74000000000001 756.035 Td
+97.74000000000001 783.0649999999999 Td
/F6.0 11 Tf
<6162737472616374> Tj
ET
@@ -5943,7 +6079,7 @@ ET
0.200 0.200 0.200 SCN
BT
-141.74 756.035 Td
+141.74 783.0649999999999 Td
/F5.0 11 Tf
<20> Tj
ET
@@ -5954,7 +6090,7 @@ ET
0.000 0.533 0.000 SCN
BT
-147.24 756.035 Td
+147.24 783.0649999999999 Td
/F6.0 11 Tf
<636c617373> Tj
ET
@@ -5965,7 +6101,7 @@ ET
0.200 0.200 0.200 SCN
BT
-174.74 756.035 Td
+174.74 783.0649999999999 Td
/F5.0 11 Tf
<20> Tj
ET
@@ -5976,7 +6112,7 @@ ET
0.733 0.000 0.400 SCN
BT
-180.24 756.035 Td
+180.24 783.0649999999999 Td
/F6.0 11 Tf
<436f6e74656e744e65676f74696174696f6e536572766963654162737472616374> Tj
ET
@@ -5987,7 +6123,7 @@ ET
0.200 0.200 0.200 SCN
BT
-361.74 756.035 Td
+361.74 783.0649999999999 Td
/F5.0 11 Tf
<20> Tj
ET
@@ -5998,7 +6134,7 @@ ET
0.000 0.533 0.000 SCN
BT
-367.24 756.035 Td
+367.24 783.0649999999999 Td
/F6.0 11 Tf
<696d706c656d656e7473> Tj
ET
@@ -6009,7 +6145,7 @@ ET
0.200 0.200 0.200 SCN
BT
-422.24 756.035 Td
+422.24 783.0649999999999 Td
ET
0.000 0.000 0.000 SCN
@@ -6018,7 +6154,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 741.295 Td
+59.24 768.3249999999999 Td
/F5.0 11 Tf
<436f6e74656e744e65676f74696174696f6e53657276696365> Tj
ET
@@ -6029,7 +6165,7 @@ ET
0.200 0.200 0.200 SCN
BT
-196.74 741.295 Td
+196.74 768.3249999999999 Td
/F5.0 11 Tf
<20> Tj
ET
@@ -6040,7 +6176,7 @@ ET
0.200 0.200 0.200 SCN
BT
-202.24 741.295 Td
+202.24 768.3249999999999 Td
/F5.0 11 Tf
<7b> Tj
ET
@@ -6051,7 +6187,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 726.5550000000001 Td
+59.24 753.585 Td
/F5.0 11 Tf
<ca202020> Tj
ET
@@ -6062,7 +6198,7 @@ ET
0.200 0.200 0.200 SCN
BT
-81.24000000000001 726.5550000000001 Td
+81.24000000000001 753.585 Td
/F5.0 11 Tf
<2e2e2e> Tj
ET
@@ -6073,7 +6209,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 711.815 Td
+59.24 738.845 Td
/F5.0 11 Tf
<ca202020> Tj
ET
@@ -6084,7 +6220,7 @@ ET
0.000 0.533 0.000 SCN
BT
-81.24000000000001 711.815 Td
+81.24000000000001 738.845 Td
/F6.0 11 Tf
<70726f746563746564> Tj
ET
@@ -6095,7 +6231,7 @@ ET
0.200 0.200 0.200 SCN
BT
-130.74 711.815 Td
+130.74 738.845 Td
/F5.0 11 Tf
<20> Tj
ET
@@ -6106,7 +6242,7 @@ ET
0.200 0.200 0.200 SCN
BT
-136.24 711.815 Td
+136.24 738.845 Td
/F5.0 11 Tf
<4f626a656374> Tj
ET
@@ -6117,7 +6253,7 @@ ET
0.200 0.200 0.200 SCN
BT
-169.24 711.815 Td
+169.24 738.845 Td
/F5.0 11 Tf
<20> Tj
ET
@@ -6128,7 +6264,7 @@ ET
0.200 0.200 0.200 SCN
BT
-174.74 711.815 Td
+174.74 738.845 Td
/F5.0 11 Tf
<6f626a6563744f66> Tj
ET
@@ -6139,7 +6275,7 @@ ET
0.200 0.200 0.200 SCN
BT
-218.74 711.815 Td
+218.74 738.845 Td
/F5.0 11 Tf
<28> Tj
ET
@@ -6150,7 +6286,7 @@ ET
0.000 0.533 0.000 SCN
BT
-224.24 711.815 Td
+224.24 738.845 Td
/F6.0 11 Tf
<66696e616c> Tj
ET
@@ -6161,7 +6297,7 @@ ET
0.200 0.200 0.200 SCN
BT
-251.74 711.815 Td
+251.74 738.845 Td
/F5.0 11 Tf
<20> Tj
ET
@@ -6172,7 +6308,7 @@ ET
0.200 0.200 0.200 SCN
BT
-257.24 711.815 Td
+257.24 738.845 Td
/F5.0 11 Tf
<4f626a65637441646170746572> Tj
ET
@@ -6183,7 +6319,7 @@ ET
0.200 0.200 0.200 SCN
BT
-328.74 711.815 Td
+328.74 738.845 Td
/F5.0 11 Tf
<20> Tj
ET
@@ -6194,7 +6330,7 @@ ET
0.200 0.200 0.200 SCN
BT
-334.24 711.815 Td
+334.24 738.845 Td
/F5.0 11 Tf
<6f626a65637441646170746572> Tj
ET
@@ -6205,7 +6341,7 @@ ET
0.200 0.200 0.200 SCN
BT
-405.74 711.815 Td
+405.74 738.845 Td
/F5.0 11 Tf
<29> Tj
ET
@@ -6216,7 +6352,7 @@ ET
0.200 0.200 0.200 SCN
BT
-411.24 711.815 Td
+411.24 738.845 Td
/F5.0 11 Tf
<20> Tj
ET
@@ -6227,7 +6363,7 @@ ET
0.200 0.200 0.200 SCN
BT
-416.74 711.815 Td
+416.74 738.845 Td
/F5.0 11 Tf
<7b> Tj
ET
@@ -6238,7 +6374,7 @@ ET
0.200 0.200 0.200 SCN
BT
-422.24 711.815 Td
+422.24 738.845 Td
/F5.0 11 Tf
<20> Tj
ET
@@ -6249,7 +6385,7 @@ ET
0.200 0.200 0.200 SCN
BT
-427.74 711.815 Td
+427.74 738.845 Td
/F5.0 11 Tf
<2e2e2e> Tj
ET
@@ -6260,7 +6396,7 @@ ET
0.200 0.200 0.200 SCN
BT
-444.24 711.815 Td
+444.24 738.845 Td
/F5.0 11 Tf
<20> Tj
ET
@@ -6271,7 +6407,7 @@ ET
0.200 0.200 0.200 SCN
BT
-449.74 711.815 Td
+449.74 738.845 Td
/F5.0 11 Tf
<7d> Tj
ET
@@ -6282,7 +6418,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 697.075 Td
+59.24 724.105 Td
/F5.0 11 Tf
<ca202020> Tj
ET
@@ -6293,7 +6429,7 @@ ET
0.000 0.533 0.000 SCN
BT
-81.24000000000001 697.075 Td
+81.24000000000001 724.105 Td
/F6.0 11 Tf
<70726f746563746564> Tj
ET
@@ -6304,7 +6440,7 @@ ET
0.200 0.200 0.200 SCN
BT
-130.74 697.075 Td
+130.74 724.105 Td
/F5.0 11 Tf
<20> Tj
ET
@@ -6315,7 +6451,7 @@ ET
0.200 0.200 0.200 SCN
BT
-136.24 697.075 Td
+136.24 724.105 Td
/F5.0 11 Tf
<4f626a656374> Tj
ET
@@ -6326,7 +6462,7 @@ ET
0.200 0.200 0.200 SCN
BT
-169.24 697.075 Td
+169.24 724.105 Td
/F5.0 11 Tf
<20> Tj
ET
@@ -6337,7 +6473,7 @@ ET
0.200 0.200 0.200 SCN
BT
-174.74 697.075 Td
+174.74 724.105 Td
/F5.0 11 Tf
<72657475726e65644f626a6563744f66> Tj
ET
@@ -6348,7 +6484,7 @@ ET
0.200 0.200 0.200 SCN
BT
-262.74 697.075 Td
+262.74 724.105 Td
/F5.0 11 Tf
<28> Tj
ET
@@ -6359,7 +6495,7 @@ ET
0.200 0.200 0.200 SCN
BT
-268.24 697.075 Td
+268.24 724.105 Td
/F5.0 11 Tf
<4f626a656374416e64416374696f6e496e766f636174696f6e> Tj
ET
@@ -6370,7 +6506,7 @@ ET
0.200 0.200 0.200 SCN
BT
-405.74 697.075 Td
+405.74 724.105 Td
ET
0.000 0.000 0.000 SCN
@@ -6379,7 +6515,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 682.335 Td
+59.24 709.365 Td
/F5.0 11 Tf
<6f626a656374416e64416374696f6e496e766f636174696f6e> Tj
ET
@@ -6390,7 +6526,7 @@ ET
0.200 0.200 0.200 SCN
BT
-196.74 682.335 Td
+196.74 709.365 Td
/F5.0 11 Tf
<29> Tj
ET
@@ -6401,7 +6537,7 @@ ET
0.200 0.200 0.200 SCN
BT
-202.24 682.335 Td
+202.24 709.365 Td
/F5.0 11 Tf
<20> Tj
ET
@@ -6412,7 +6548,7 @@ ET
0.200 0.200 0.200 SCN
BT
-207.74 682.335 Td
+207.74 709.365 Td
/F5.0 11 Tf
<7b> Tj
ET
@@ -6423,7 +6559,7 @@ ET
0.200 0.200 0.200 SCN
BT
-213.24 682.335 Td
+213.24 709.365 Td
/F5.0 11 Tf
<20> Tj
ET
@@ -6434,7 +6570,7 @@ ET
0.200 0.200 0.200 SCN
BT
-218.74 682.335 Td
+218.74 709.365 Td
/F5.0 11 Tf
<2e2e2e> Tj
ET
@@ -6445,7 +6581,7 @@ ET
0.200 0.200 0.200 SCN
BT
-235.24 682.335 Td
+235.24 709.365 Td
/F5.0 11 Tf
<20> Tj
ET
@@ -6456,7 +6592,7 @@ ET
0.200 0.200 0.200 SCN
BT
-240.74 682.335 Td
+240.74 709.365 Td
/F5.0 11 Tf
<7d> Tj
ET
@@ -6467,7 +6603,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 652.855 Td
+59.24 679.885 Td
/F5.0 11 Tf
<ca202020> Tj
ET
@@ -6478,7 +6614,7 @@ ET
0.000 0.533 0.000 SCN
BT
-81.24000000000001 652.855 Td
+81.24000000000001 679.885 Td
/F6.0 11 Tf
<70726f746563746564> Tj
ET
@@ -6489,7 +6625,7 @@ ET
0.200 0.200 0.200 SCN
BT
-130.74 652.855 Td
+130.74 679.885 Td
/F5.0 11 Tf
<20> Tj
ET
@@ -6500,7 +6636,7 @@ ET
0.200 0.200 0.200 SCN
BT
-136.24 652.855 Td
+136.24 679.885 Td
/F5.0 11 Tf
<436c617373> Tj
ET
@@ -6511,7 +6647,7 @@ ET
0.200 0.200 0.200 SCN
BT
-163.74 652.855 Td
+163.74 679.885 Td
/F5.0 11 Tf
<3c3f3e> Tj
ET
@@ -6522,7 +6658,7 @@ ET
0.200 0.200 0.200 SCN
BT
-180.24 652.855 Td
+180.24 679.885 Td
/F5.0 11 Tf
<20> Tj
ET
@@ -6533,7 +6669,7 @@ ET
0.200 0.200 0.200 SCN
BT
-185.74 652.855 Td
+185.74 679.885 Td
/F5.0 11 Tf
<6c6f6164436c617373> Tj
ET
@@ -6544,7 +6680,7 @@ ET
0.200 0.200 0.200 SCN
BT
-235.24 652.855 Td
+235.24 679.885 Td
/F5.0 11 Tf
<28> Tj
ET
@@ -6555,7 +6691,7 @@ ET
0.200 0.200 0.200 SCN
BT
-240.74 652.855 Td
+240.74 679.885 Td
/F5.0 11 Tf
<537472696e67> Tj
ET
@@ -6566,7 +6702,7 @@ ET
0.200 0.200 0.200 SCN
BT
-273.74 652.855 Td
+273.74 679.885 Td
/F5.0 11 Tf
<20> Tj
ET
@@ -6577,7 +6713,7 @@ ET
0.200 0.200 0.200 SCN
BT
-279.24 652.855 Td
+279.24 679.885 Td
/F5.0 11 Tf
<636c73> Tj
ET
@@ -6588,7 +6724,7 @@ ET
0.200 0.200 0.200 SCN
BT
-295.74 652.855 Td
+295.74 679.885 Td
/F5.0 11 Tf
<29> Tj
ET
@@ -6599,7 +6735,7 @@ ET
0.200 0.200 0.200 SCN
BT
-301.24 652.855 Td
+301.24 679.885 Td
/F5.0 11 Tf
<20> Tj
ET
@@ -6610,7 +6746,7 @@ ET
0.200 0.200 0.200 SCN
BT
-306.74 652.855 Td
+306.74 679.885 Td
/F5.0 11 Tf
<7b> Tj
ET
@@ -6621,7 +6757,7 @@ ET
0.200 0.200 0.200 SCN
BT
-312.24 652.855 Td
+312.24 679.885 Td
/F5.0 11 Tf
<20> Tj
ET
@@ -6632,7 +6768,7 @@ ET
0.200 0.200 0.200 SCN
BT
-317.74 652.855 Td
+317.74 679.885 Td
/F5.0 11 Tf
<2e2e2e> Tj
ET
@@ -6643,7 +6779,7 @@ ET
0.200 0.200 0.200 SCN
BT
-334.24 652.855 Td
+334.24 679.885 Td
/F5.0 11 Tf
<20> Tj
ET
@@ -6654,7 +6790,7 @@ ET
0.200 0.200 0.200 SCN
BT
-339.74 652.855 Td
+339.74 679.885 Td
/F5.0 11 Tf
<7d> Tj
ET
@@ -6665,7 +6801,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 623.375 Td
+59.24 650.405 Td
/F5.0 11 Tf
<ca202020> Tj
ET
@@ -6676,7 +6812,7 @@ ET
0.000 0.533 0.000 SCN
BT
-81.24000000000001 623.375 Td
+81.24000000000001 650.405 Td
/F6.0 11 Tf
<70726f746563746564> Tj
ET
@@ -6687,7 +6823,7 @@ ET
0.200 0.200 0.200 SCN
BT
-130.74 623.375 Td
+130.74 650.405 Td
/F5.0 11 Tf
<20> Tj
ET
@@ -6698,7 +6834,7 @@ ET
0.533 0.533 0.533 SCN
BT
-136.24 623.375 Td
+136.24 650.405 Td
/F6.0 11 Tf
<766f6964> Tj
ET
@@ -6709,7 +6845,7 @@ ET
0.200 0.200 0.200 SCN
BT
-158.24 623.375 Td
+158.24 650.405 Td
/F5.0 11 Tf
<20> Tj
ET
@@ -6720,7 +6856,7 @@ ET
0.200 0.200 0.200 SCN
BT
-163.74 623.375 Td
+163.74 650.405 Td
/F5.0 11 Tf
<656e737572654a617862416e6e6f7461746564> Tj
ET
@@ -6731,7 +6867,7 @@ ET
0.200 0.200 0.200 SCN
BT
-268.24 623.375 Td
+268.24 650.405 Td
/F5.0 11 Tf
<28> Tj
ET
@@ -6742,7 +6878,7 @@ ET
0.200 0.200 0.200 SCN
BT
-273.74 623.375 Td
+273.74 650.405 Td
/F5.0 11 Tf
<436c617373> Tj
ET
@@ -6753,7 +6889,7 @@ ET
0.200 0.200 0.200 SCN
BT
-301.24 623.375 Td
+301.24 650.405 Td
/F5.0 11 Tf
<3c3f3e> Tj
ET
@@ -6764,7 +6900,7 @@ ET
0.200 0.200 0.200 SCN
BT
-317.74 623.375 Td
+317.74 650.405 Td
/F5.0 11 Tf
<20> Tj
ET
@@ -6775,7 +6911,7 @@ ET
0.200 0.200 0.200 SCN
BT
-323.24 623.375 Td
+323.24 650.405 Td
/F5.0 11 Tf
<646f6d61696e54797065> Tj
ET
@@ -6786,7 +6922,7 @@ ET
0.200 0.200 0.200 SCN
BT
-378.24 623.375 Td
+378.24 650.405 Td
/F5.0 11 Tf
<29> Tj
ET
@@ -6797,7 +6933,7 @@ ET
0.200 0.200 0.200 SCN
BT
-383.74 623.375 Td
+383.74 650.405 Td
/F5.0 11 Tf
<20> Tj
ET
@@ -6808,7 +6944,7 @@ ET
0.200 0.200 0.200 SCN
BT
-389.24 623.375 Td
+389.24 650.405 Td
/F5.0 11 Tf
<7b> Tj
ET
@@ -6819,7 +6955,7 @@ ET
0.200 0.200 0.200 SCN
BT
-394.74 623.375 Td
+394.74 650.405 Td
/F5.0 11 Tf
<20> Tj
ET
@@ -6830,7 +6966,7 @@ ET
0.200 0.200 0.200 SCN
BT
-400.24 623.375 Td
+400.24 650.405 Td
/F5.0 11 Tf
<2e2e2e> Tj
ET
@@ -6841,7 +6977,7 @@ ET
0.200 0.200 0.200 SCN
BT
-416.74 623.375 Td
+416.74 650.405 Td
/F5.0 11 Tf
<20> Tj
ET
@@ -6852,7 +6988,7 @@ ET
0.200 0.200 0.200 SCN
BT
-422.24 623.375 Td
+422.24 650.405 Td
/F5.0 11 Tf
<7d> Tj
ET
@@ -6863,7 +6999,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 608.635 Td
+59.24 635.665 Td
/F5.0 11 Tf
<ca202020> Tj
ET
@@ -6874,7 +7010,7 @@ ET
0.000 0.533 0.000 SCN
BT
-81.24000000000001 608.635 Td
+81.24000000000001 635.665 Td
/F6.0 11 Tf
<70726f746563746564> Tj
ET
@@ -6885,7 +7021,7 @@ ET
0.200 0.200 0.200 SCN
BT
-130.74 608.635 Td
+130.74 635.665 Td
/F5.0 11 Tf
<20> Tj
ET
@@ -6896,7 +7032,7 @@ ET
0.533 0.533 0.533 SCN
BT
-136.24 608.635 Td
+136.24 635.665 Td
/F6.0 11 Tf
<766f6964> Tj
ET
@@ -6907,7 +7043,7 @@ ET
0.200 0.200 0.200 SCN
BT
-158.24 608.635 Td
+158.24 635.665 Td
/F5.0 11 Tf
<20> Tj
ET
@@ -6918,7 +7054,7 @@ ET
0.200 0.200 0.200 SCN
BT
-163.74 608.635 Td
+163.74 635.665 Td
/F5.0 11 Tf
<656e73757265446f6d61696e4f626a65637441737369676e61626c65> Tj
ET
@@ -6929,7 +7065,7 @@ ET
0.200 0.200 0.200 SCN
BT
-317.74 608.635 Td
+317.74 635.665 Td
/F5.0 11 Tf
<28> Tj
ET
@@ -6940,7 +7076,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 593.895 Td
+59.24 620.925 Td
/F5.0 11 Tf
<ca20202020202020> Tj
ET
@@ -6951,7 +7087,7 @@ ET
0.200 0.200 0.200 SCN
BT
-103.24000000000001 593.895 Td
+103.24000000000001 620.925 Td
/F5.0 11 Tf
<537472696e67> Tj
ET
@@ -6962,7 +7098,7 @@ ET
0.200 0.200 0.200 SCN
BT
-136.24 593.895 Td
+136.24 620.925 Td
/F5.0 11 Tf
<20> Tj
ET
@@ -6973,7 +7109,7 @@ ET
0.200 0.200 0.200 SCN
BT
-141.74 593.895 Td
+141.74 620.925 Td
/F5.0 11 Tf
<78526f446f6d61696e54797065> Tj
ET
@@ -6984,7 +7120,7 @@ ET
0.200 0.200 0.200 SCN
BT
-213.24 593.895 Td
+213.24 620.925 Td
/F5.0 11 Tf
<2c> Tj
ET
@@ -6995,7 +7131,7 @@ ET
0.200 0.200 0.200 SCN
BT
-218.74 593.895 Td
+218.74 620.925 Td
/F5.0 11 Tf
<20> Tj
ET
@@ -7006,7 +7142,7 @@ ET
0.200 0.200 0.200 SCN
BT
-224.24 593.895 Td
+224.24 620.925 Td
/F5.0 11 Tf
<436c617373> Tj
ET
@@ -7017,7 +7153,7 @@ ET
0.200 0.200 0.200 SCN
BT
-251.74 593.895 Td
+251.74 620.925 Td
/F5.0 11 Tf
<3c3f3e> Tj
ET
@@ -7028,7 +7164,7 @@ ET
0.200 0.200 0.200 SCN
BT
-268.24 593.895 Td
+268.24 620.925 Td
/F5.0 11 Tf
<20> Tj
ET
@@ -7039,7 +7175,7 @@ ET
0.200 0.200 0.200 SCN
BT
-273.74 593.895 Td
+273.74 620.925 Td
/F5.0 11 Tf
<646f6d61696e54797065> Tj
ET
@@ -7050,7 +7186,7 @@ ET
0.200 0.200 0.200 SCN
BT
-328.74 593.895 Td
+328.74 620.925 Td
/F5.0 11 Tf
<2c> Tj
ET
@@ -7061,7 +7197,7 @@ ET
0.200 0.200 0.200 SCN
BT
-334.24 593.895 Td
+334.24 620.925 Td
/F5.0 11 Tf
<20> Tj
ET
@@ -7072,7 +7208,7 @@ ET
0.200 0.200 0.200 SCN
BT
-339.74 593.895 Td
+339.74 620.925 Td
/F5.0 11 Tf
<4f626a656374> Tj
ET
@@ -7083,7 +7219,7 @@ ET
0.200 0.200 0.200 SCN
BT
-372.74 593.895 Td
+372.74 620.925 Td
/F5.0 11 Tf
<20> Tj
ET
@@ -7094,7 +7230,7 @@ ET
0.200 0.200 0.200 SCN
BT
-378.24 593.895 Td
+378.24 620.925 Td
/F5.0 11 Tf
<646f6d61696e4f626a656374> Tj
ET
@@ -7105,7 +7241,7 @@ ET
0.200 0.200 0.200 SCN
BT
-444.24 593.895 Td
+444.24 620.925 Td
/F5.0 11 Tf
<29> Tj
ET
@@ -7116,7 +7252,7 @@ ET
0.200 0.200 0.200 SCN
BT
-449.74 593.895 Td
+449.74 620.925 Td
/F5.0 11 Tf
<20> Tj
ET
@@ -7127,7 +7263,7 @@ ET
0.200 0.200 0.200 SCN
BT
-455.24 593.895 Td
+455.24 620.925 Td
/F5.0 11 Tf
<7b> Tj
ET
@@ -7138,7 +7274,7 @@ ET
0.200 0.200 0.200 SCN
BT
-460.74 593.895 Td
+460.74 620.925 Td
/F5.0 11 Tf
<20> Tj
ET
@@ -7149,7 +7285,7 @@ ET
0.200 0.200 0.200 SCN
BT
-466.24 593.895 Td
+466.24 620.925 Td
/F5.0 11 Tf
<2e2e2e> Tj
ET
@@ -7160,7 +7296,7 @@ ET
0.200 0.200 0.200 SCN
BT
-482.74 593.895 Td
+482.74 620.925 Td
/F5.0 11 Tf
<20> Tj
ET
@@ -7171,7 +7307,7 @@ ET
0.200 0.200 0.200 SCN
BT
-488.24 593.895 Td
+488.24 620.925 Td
/F5.0 11 Tf
<7d> Tj
ET
@@ -7182,7 +7318,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 579.155 Td
+59.24 606.185 Td
/F5.0 11 Tf
<7d> Tj
ET
@@ -7192,12 +7328,27 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-5.191 Tw
+0.199 Tw
+
+BT
+48.24 568.3059999999999 Td
+/F1.0 10.5 Tf
+[<41732064697363757373656420696e2074686520696e74726f64756374696f6e2c20746865206672> 20.01953125 <616d65776f726b20616c736f2070726f766964657320746872656520696d706c656d656e746174696f6e206f66207468697320736572766963652c>] 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.019 Tw
BT
-48.24 541.2760000000001 Td
+48.24 552.526 Td
/F1.0 10.5 Tf
-[<41732064697363757373656420696e2074686520696e74726f64756374696f6e2c20746865206672> 20.01953125 <616d65776f726b20616c736f2070726f766964657320612064656661756c7420696d706c656d656e746174696f6e2c>] TJ
+<6f6e65206f6620776869636820697320> Tj
ET
@@ -7207,10 +7358,10 @@ ET
0.694 0.129 0.275 scn
0.694 0.129 0.275 SCN
-9.063 Tw
+0.019 Tw
BT
-48.24 525.496 Td
+126.53107142857141 552.526 Td
/F5.0 10.5 Tf
<6f2e612e692e762e726f2e72656e646572696e672e736572766963652e636f6e6e65672e436f6e74656e744e65676f74696174696f6e5365727669636558526f446f6d61696e54797065> Tj
ET
@@ -7222,12 +7373,12 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-9.063 Tw
+0.019 Tw
BT
-436.74 525.496 Td
+515.0310714285714 552.526 Td
/F1.0 10.5 Tf
-<2e202020546869732068616e646c6573> Tj
+<2e20202054686973> Tj
ET
@@ -7237,12 +7388,12 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-1.317 Tw
+4.535 Tw
BT
-48.24 509.716 Td
+48.24 536.746 Td
/F1.0 10.5 Tf
-<636f6e74656e74206e65676f74696174696f6e20666f722074776f206f662074686520706f737369626c6520726570726573656e746174696f6e732c206f626a65637420726570726573656e746174696f6e7320616e6420666f7220616374696f6e> Tj
+<696d706c656d656e746174696f6e2068616e646c657320636f6e74656e74206e65676f74696174696f6e20666f722074776f206f662074686520706f737369626c6520726570726573656e746174696f6e732c206f626a656374> Tj
ET
@@ -7253,9 +7404,9 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24 493.93600000000004 Td
+48.24 520.966 Td
/F1.0 10.5 Tf
-<726573756c7420726570726573656e746174696f6e733a> Tj
+<726570726573656e746174696f6e7320616e6420666f7220616374696f6e20726573756c7420726570726573656e746174696f6e733a> Tj
ET
0.000 0.000 0.000 SCN
@@ -7266,7 +7417,7 @@ ET
0.200 0.200 0.200 SCN
BT
-56.88050000000001 466.156 Td
+56.88050000000001 493.186 Td
/F1.0 10.5 Tf
<a5> Tj
ET
@@ -7279,7 +7430,7 @@ ET
0.200 0.200 0.200 SCN
BT
-66.24000000000001 466.156 Td
+66.24000000000001 493.186 Td
/F1.0 10.5 Tf
[<46> 40.0390625 <6f72206f626a65637420726570726573656e746174696f6e732069742077696c6c2068616e646c652072657175657374732077697468204854545020>] TJ
ET
@@ -7290,7 +7441,7 @@ ET
0.694 0.129 0.275 SCN
BT
-369.77358984375 466.156 Td
+369.77358984375 493.186 Td
/F5.0 10.5 Tf
<416363657074> Tj
ET
@@ -7301,7 +7452,7 @@ ET
0.200 0.200 0.200 SCN
BT
-401.27358984375 466.156 Td
+401.27358984375 493.186 Td
/F1.0 10.5 Tf
<2068656164657273206f662074686520666f726d3a> Tj
ET
@@ -7314,7 +7465,7 @@ ET
0.200 0.200 0.200 SCN
BT
-74.88050000000001 444.37600000000003 Td
+74.88050000000001 471.406 Td
/F1.0 10.5 Tf
<a5> Tj
ET
@@ -7327,7 +7478,7 @@ ET
0.694 0.129 0.275 SCN
BT
-84.24000000000001 446.56000000000006 Td
+84.24000000000001 473.59000000000003 Td
/F5.0 10.5 Tf
<6170706c69636174696f6e2f6a736f6e3b70726f66696c653d75726e3a6f72672e7265737466756c6f626a656374733a726570722d74797065732f6f626a6563743b782d726f2d646f6d61696e2d747970653d> Tj
ET
@@ -7338,7 +7489,7 @@ ET
0.694 0.129 0.275 SCN
BT
-519.99 446.56000000000006 Td
+519.99 473.59000000000003 Td
/F7.0 10.5 Tf
<c9> Tj
ET
@@ -7351,7 +7502,7 @@ ET
0.200 0.200 0.200 SCN
BT
-74.88050000000001 426.37600000000003 Td
+74.88050000000001 453.406 Td
/F1.0 10.5 Tf
<a5> Tj
ET
@@ -7364,7 +7515,7 @@ ET
0.694 0.129 0.275 SCN
BT
-84.24000000000001 428.56000000000006 Td
+84.24000000000001 455.59000000000003 Td
/F5.0 10.5 Tf
<6170706c69636174696f6e2f786d6c3b70726f66696c653d75726e3a6f72672e7265737466756c6f626a656374733a726570722d74797065732f6f626a6563743b782d726f2d646f6d61696e2d747970653d> Tj
ET
@@ -7375,7 +7526,7 @@ ET
0.694 0.129 0.275 SCN
BT
-514.74 428.56000000000006 Td
+514.74 455.59000000000003 Td
/F7.0 10.5 Tf
<c9> Tj
ET
@@ -7388,7 +7539,7 @@ ET
0.200 0.200 0.200 SCN
BT
-56.88050000000001 402.37600000000003 Td
+56.88050000000001 429.406 Td
/F1.0 10.5 Tf
<a5> Tj
ET
@@ -7403,7 +7554,7 @@ ET
0.967 Tw
BT
-66.24000000000001 402.37600000000003 Td
+66.24000000000001 429.406 Td
/F1.0 10.5 Tf
<666f7220616374696f6e20726573756c7420726570726573656e746174696f6e732069742077696c6c2073696d696c61726c792068616e646c652072657175657374732077697468204854545020> Tj
ET
@@ -7418,7 +7569,7 @@ ET
0.967 Tw
BT
-458.32311538461533 402.37600000000003 Td
+458.32311538461533 429.406 Td
/F5.0 10.5 Tf
<416363657074> Tj
ET
@@ -7433,7 +7584,7 @@ ET
0.967 Tw
BT
-489.82311538461533 402.37600000000003 Td
+489.82311538461533 429.406 Td
/F1.0 10.5 Tf
<2068656164657273206f66> Tj
ET
@@ -7446,7 +7597,7 @@ ET
0.200 0.200 0.200 SCN
BT
-66.24000000000001 386.596 Td
+66.24000000000001 413.626 Td
/F1.0 10.5 Tf
<74686520666f726d3a> Tj
ET
@@ -7459,7 +7610,7 @@ ET
0.200 0.200 0.200 SCN
BT
-74.88050000000001 364.81600000000003 Td
+74.88050000000001 391.846 Td
/F1.0 10.5 Tf
<a5> Tj
ET
@@ -7472,7 +7623,7 @@ ET
0.694 0.129 0.275 SCN
BT
-84.24000000000001 367.00000000000006 Td
+84.24000000000001 394.03000000000003 Td
/F5.0 10.5 Tf
<6170706c69636174696f6e2f6a736f6e3b70726f66696c653d75726e3a6f72672e7265737466756c6f626a656374733a726570722d74797065732f616374696f6e2d726573756c743b782d726f2d646f6d61696e2d> Tj
ET
@@ -7483,7 +7634,7 @@ ET
0.694 0.129 0.275 SCN
BT
-84.24000000000001 351.22 Td
+84.24000000000001 378.25 Td
/F5.0 10.5 Tf
<747970653d> Tj
ET
@@ -7494,7 +7645,7 @@ ET
0.694 0.129 0.275 SCN
BT
-110.49000000000001 351.22 Td
+110.49000000000001 378.25 Td
/F7.0 10.5 Tf
<c9> Tj
ET
@@ -7507,7 +7658,7 @@ ET
0.200 0.200 0.200 SCN
BT
-74.88050000000001 329.44000000000005 Td
+74.88050000000001 356.47 Td
/F1.0 10.5 Tf
<a5> Tj
ET
@@ -7520,7 +7671,7 @@ ET
0.694 0.129 0.275 SCN
BT
-84.24000000000001 331.6240000000001 Td
+84.24000000000001 358.65400000000005 Td
/F5.0 10.5 Tf
<6170706c69636174696f6e2f786d6c3b70726f66696c653d75726e3a6f72672e7265737466756c6f626a656374733a726570722d74797065732f616374696f6e2d726573756c743b782d726f2d646f6d61696e2d> Tj
ET
@@ -7531,7 +7682,7 @@ ET
0.694 0.129 0.275 SCN
BT
-84.24000000000001 318.67900000000003 Td
+84.24000000000001 345.709 Td
/F5.0 10.5 Tf
<747970653d> Tj
ET
@@ -7542,7 +7693,7 @@ ET
0.694 0.129 0.275 SCN
BT
-110.49000000000001 318.67900000000003 Td
+110.49000000000001 345.709 Td
/F7.0 10.5 Tf
<c9> Tj
ET
@@ -7555,7 +7706,7 @@ ET
1.968 Tw
BT
-48.24000000000001 286.49500000000006 Td
+48.24000000000001 313.52500000000003 Td
/F1.0 10.5 Tf
<5468652076616c7565206f662074686520> Tj
ET
@@ -7570,7 +7721,7 @@ ET
1.968 Tw
BT
-139.10515208333334 286.49500000000006 Td
+139.10515208333334 313.52500000000003 Td
/F5.0 10.5 Tf
<782d726f2d646f6d61696e2d74797065> Tj
ET
@@ -7585,7 +7736,7 @@ ET
1.968 Tw
BT
-223.10515208333334 286.49500000000006 Td
+223.10515208333334 313.52500000000003 Td
/F1.0 10.5 Tf
[<20706172> 20.01953125 <616d6574657220636f72726573706f6e647320746f207468652044> 20.01953125 <54> 20.01953125 <4f20746f206265206d617070656420696e746f2062> 20.01953125 <7920746865>] TJ
ET
@@ -7598,7 +7749,7 @@ ET
0.694 0.129 0.275 SCN
BT
-48.24000000000001 270.71500000000003 Td
+48.24000000000001 297.745 Td
/F5.0 10.5 Tf
<436f6e74656e744d617070696e6753657276696365> Tj
ET
@@ -7609,7 +7760,7 @@ ET
0.200 0.200 0.200 SCN
BT
-158.49 270.71500000000003 Td
+158.49 297.745 Td
/F1.0 10.5 Tf
<2e> Tj
ET
@@ -7622,7 +7773,7 @@ ET
0.305 Tw
BT
-48.24000000000001 242.93500000000006 Td
+48.24000000000001 269.96500000000003 Td
/F1.0 10.5 Tf
[<4966207468652044> 20.01953125 <54> 20.01953125 <4f20697320616e6e6f74617465642077697468204a4158422c207468656e20616c736f206e6f74652074686174207468652072756e74696d652074797065206d75737420626520616e6e6f7461746564207769746820746865>] TJ
ET
@@ -7637,7 +7788,7 @@ ET
0.609 Tw
BT
-48.24000000000001 227.15500000000006 Td
+48.24000000000001 254.18500000000003 Td
/F1.0 10.5 Tf
<4a41584220> Tj
ET
@@ -7652,7 +7803,7 @@ ET
0.609 Tw
BT
-76.49522222222222 227.15500000000006 Td
+76.49522222222222 254.18500000000003 Td
/F5.0 10.5 Tf
<6a617661782e786d6c2e62696e642e616e6e6f746174696f6e2e586d6c526f6f74456c656d656e74> Tj
ET
@@ -7667,7 +7818,7 @@ ET
0.609 Tw
BT
-286.4952222222222 227.15500000000006 Td
+286.4952222222222 254.18500000000003 Td
/F1.0 10.5 Tf
<20736f20746861742052657374456173792069732061626c6520746f20756e616d626967756f75736c792073657269616c697a65> Tj
ET
@@ -7680,7 +7831,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24000000000001 211.37500000000006 Td
+48.24000000000001 238.40500000000003 Td
/F1.0 10.5 Tf
<69742e> Tj
ET
@@ -7691,65 +7842,57 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24000000000001 176.87500000000006 Td
-/F2.0 13 Tf
-<322e312e332e205573616765> Tj
+48.24000000000001 210.62500000000003 Td
+/F1.0 10.5 Tf
+<546865206f746865722074776f20696d706c656d656e746174696f6e73206f6620> 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.594 Tw
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
BT
-48.24000000000001 150.31500000000003 Td
-/F1.0 10.5 Tf
-[<59> 69.82421875 <6f752063616e2066696e6420616e206578616d706c65206f6620616c6c20746865736520736572766963657320696e2074686520286e6f6e2d4153462920>] TJ
+221.32200000000003 210.62500000000003 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.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-
-0.594 Tw
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
-364.71594856770827 150.31500000000003 Td
+352.572 210.62500000000003 Td
/F1.0 10.5 Tf
-<49736973206164646f6e732720746f646f617070> Tj
+<206172653a> 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
-0.594 Tw
-
BT
-467.6901323784722 150.31500000000003 Td
+56.88050000000001 182.84500000000003 Td
/F1.0 10.5 Tf
-<2e20205468697320646566696e65732061> 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.694 0.129 0.275 scn
0.694 0.129 0.275 SCN
BT
-48.24000000000001 134.53500000000003 Td
+66.24000000000001 182.84500000000003 Td
/F5.0 10.5 Tf
-<546f446f4974656d44746f> Tj
+<436f6e74656e744e65676f74696174696f6e53657276696365466f725265737466756c4f626a6563747356315f30> Tj
ET
0.000 0.000 0.000 SCN
@@ -7758,87 +7901,57 @@ ET
0.200 0.200 0.200 SCN
BT
-105.99000000000001 134.53500000000003 Td
+66.24000000000001 155.06500000000003 Td
/F1.0 10.5 Tf
-[<20636c6173732074686174206973204a41584220616e6e6f74617465642028697420697320696e20666163742067656e6572> 20.01953125 <617465642066726f6d20616e2058> 9.765625 <5344292e>] TJ
+<77686963682072657475726e7320726570726573656e746174696f6e73206163636f7264696e6720746f2074686520> 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
-
-6.924 Tw
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
BT
-48.24000000000001 106.75500000000002 Td
+304.86300000000006 155.06500000000003 Td
/F1.0 10.5 Tf
-<546865206578616d706c652061707020616c736f20696e636c7564657320616e20696d706c656d656e746174696f6e206f6620> 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.924 Tw
-
-BT
-370.56699999999995 106.75500000000002 Td
-/F5.0 10.5 Tf
-<436f6e74656e744d617070696e6753657276696365> 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
-6.924 Tw
-
BT
-480.81699999999995 106.75500000000002 Td
+378.87750000000005 155.06500000000003 Td
/F1.0 10.5 Tf
-<2074686174206d617073> Tj
+<2073706563> 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.24000000000001 90.97500000000002 Td
-/F5.0 10.5 Tf
-<746f646f6170702e646f6d2e6d6f64756c652e746f646f6974656d2e546f446f4974656d> 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
-237.24 90.97500000000002 Td
+56.88050000000001 127.28500000000003 Td
/F1.0 10.5 Tf
-<20656e74697469657320746f20> Tj
+<a5> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
+
+0.000 Tc
0.694 0.129 0.275 scn
0.694 0.129 0.275 SCN
BT
-291.987 90.97500000000002 Td
+66.24000000000001 127.28500000000003 Td
/F5.0 10.5 Tf
-<746f646f6170702e64746f2e6d6f64756c652e746f646f6974656d2e546f446f4974656d44746f> Tj
+<436f6e74656e744e65676f74696174696f6e536572766963654f7267417061636865497369735631> Tj
ET
0.000 0.000 0.000 SCN
@@ -7847,20 +7960,20 @@ ET
0.200 0.200 0.200 SCN
BT
-496.737 90.97500000000002 Td
+66.24000000000001 99.50500000000002 Td
/F1.0 10.5 Tf
-<20636c61737365732e> Tj
+<77686963682072657475726e7320> 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.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
BT
-48.24000000000001 63.19500000000002 Td
+139.9185 99.50500000000002 Td
/F1.0 10.5 Tf
-[<4120524553> 20.01953125 <5420636c69656e742063616e207468657265666f7265207265717565737420612044> 20.01953125 <54> 20.01953125 <4f20726570726573656e746174696f6e206f6620616e20656e746974792062> 20.01953125 <7920696e766f6b696e67>] TJ
+<73696d706c696669656420726570726573656e746174696f6e73> Tj
ET
0.000 0.000 0.000 SCN
@@ -7895,27 +8008,26 @@ endobj
/MediaBox [0 0 595.28 841.89]
/Contents 69 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F1.0 8 0 R
-/F6.0 66 0 R
+/Font << /F6.0 66 0 R
/F5.0 39 0 R
+/F1.0 8 0 R
/F7.0 71 0 R
-/F2.0 16 0 R
>>
-/XObject << /Stamp1 269 0 R
+/XObject << /Stamp1 330 0 R
>>
>>
-/Annots [72 0 R 74 0 R]
+/Annots [72 0 R 73 0 R 74 0 R]
>>
endobj
71 0 obj
<< /Type /Font
/BaseFont /AAAABY+mplus-1p-regular
/Subtype /TrueType
-/FontDescriptor 315 0 R
+/FontDescriptor 380 0 R
/FirstChar 32
/LastChar 255
-/Widths 317 0 R
-/ToUnicode 316 0 R
+/Widths 382 0 R
+/ToUnicode 381 0 R
>>
endobj
72 0 obj
@@ -7925,67 +8037,46 @@ endobj
/URI (rgsvc.pdf#_rgsvc_spi_ContentMappingService)
>>
/Subtype /Link
-/Rect [48.24000000000001 269.24500000000006 158.49 279.74500000000006]
+/Rect [48.24000000000001 296.27500000000003 158.49 306.77500000000003]
/Type /Annot
>>
endobj
73 0 obj
-[70 0 R /XYZ 0 195.55900000000005 null]
+<< /Border [0 0 0]
+/A << /Type /Action
+/S /URI
+/URI (http://restfulobjects.org)
+>>
+/Subtype /Link
+/Rect [304.86300000000006 151.99900000000002 378.87750000000005 166.27900000000002]
+/Type /Annot
+>>
endobj
74 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
-/URI (http://github.com/isisaddons/isis-app-todoapp)
+/URI (ugvro.pdf#_ugvro_simplified-representations)
>>
/Subtype /Link
-/Rect [364.71594856770827 147.24900000000002 467.6901323784722 161.52900000000002]
+/Rect [139.9185 96.43900000000002 271.851 110.71900000000002]
/Type /Annot
>>
endobj
75 0 obj
-<< /Length 5006
+<< /Length 8124
>>
stream
q
-q
-/DeviceRGB cs
-0.961 0.961 0.961 scn
-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 773.150 l
-547.040 770.941 545.249 769.150 543.040 769.150 c
-52.240 769.150 l
-50.031 769.150 48.240 770.941 48.240 773.150 c
-48.240 801.890 l
-48.240 804.099 50.031 805.890 52.240 805.890 c
-h
-f
-/DeviceRGB CS
-0.800 0.800 0.800 SCN
-0.75 w
-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 773.150 l
-547.040 770.941 545.249 769.150 543.040 769.150 c
-52.240 769.150 l
-50.031 769.150 48.240 770.941 48.240 773.150 c
-48.240 801.890 l
-48.240 804.099 50.031 805.890 52.240 805.890 c
-h
-S
-Q
/DeviceRGB cs
0.200 0.200 0.200 scn
/DeviceRGB CS
0.200 0.200 0.200 SCN
BT
-59.24 783.0649999999999 Td
-/F5.0 11 Tf
-<687474703a2f2f6c6f63616c686f73743a383038302f7265737466756c2f6f626a656374732f544f444f2f30> Tj
+48.24 792.006 Td
+/F2.0 13 Tf
+<322e312e332e205573616765> Tj
ET
0.000 0.000 0.000 SCN
@@ -7993,21 +8084,55 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
+0.594 Tw
+
BT
-48.24 745.1859999999999 Td
+48.24 765.446 Td
/F1.0 10.5 Tf
-<7769746820616e20> Tj
+[<59> 69.82421875 <6f752063616e2066696e6420616e206578616d706c65206f6620616c6c20746865736520736572766963657320696e2074686520286e6f6e2d4153462920>] 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.594 Tw
+
+BT
+364.71594856770827 765.446 Td
+/F1.0 10.5 Tf
+<49736973206164646f6e732720746f646f617070> 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.594 Tw
+
+BT
+467.6901323784722 765.446 Td
+/F1.0 10.5 Tf
+<2e20205468697320646566696e65732061> 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
-89.0955 745.1859999999999 Td
+48.24 749.666 Td
/F5.0 10.5 Tf
-<416363657074> Tj
+<546f446f4974656d44746f> Tj
ET
0.000 0.000 0.000 SCN
@@ -8016,85 +8141,76 @@ ET
0.200 0.200 0.200 SCN
BT
-120.59550000000002 745.1859999999999 Td
+105.99000000000001 749.666 Td
/F1.0 10.5 Tf
-<20686561646572206f663a> Tj
+[<20636c6173732074686174206973204a41584220616e6e6f74617465642028697420697320696e20666163742067656e6572> 20.01953125 <617465642066726f6d20616e2058> 9.765625 <5344292e>] 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 729.370 m
-543.040 729.370 l
-545.249 729.370 547.040 727.579 547.040 725.370 c
-547.040 681.890 l
-547.040 679.681 545.249 677.890 543.040 677.890 c
-52.240 677.890 l
-50.031 677.890 48.240 679.681 48.240 681.890 c
-48.240 725.370 l
-48.240 727.579 50.031 729.370 52.240 729.370 c
-h
-f
-0.800 0.800 0.800 SCN
-0.75 w
-52.240 729.370 m
-543.040 729.370 l
-545.249 729.370 547.040 727.579 547.040 725.370 c
-547.040 681.890 l
-547.040 679.681 545.249 677.890 543.040 677.890 c
-52.240 677.890 l
-50.031 677.890 48.240 679.681 48.240 681.890 c
-48.240 725.370 l
-48.240 727.579 50.031 729.370 52.240 729.370 c
-h
-S
-Q
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
+6.924 Tw
+
BT
-59.24 706.545 Td
-/F5.0 11 Tf
-<6170706c69636174696f6e2f786d6c3b70726f66696c653d75726e3a6f72672e7265737466756c6f626a656374733a726570722d74797065732f6f626a6563743b782d726f2d646f6d61696e2d> Tj
+48.24 721.8860000000001 Td
+/F1.0 10.5 Tf
+<546865206578616d706c652061707020616c736f20696e636c7564657320616e20696d706c656d656e746174696f6e206f6620> 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
+
+6.924 Tw
BT
-59.24 691.805 Td
-/F5.0 11 Tf
-<747970653d746f646f6170702e64746f2e6d6f64756c652e746f646f6974656d2e546f446f4974656d44746f> Tj
+370.56699999999995 721.8860000000001 Td
+/F5.0 10.5 Tf
+<436f6e74656e744d617070696e6753657276696365> 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.924 Tw
+
BT
-48.24 653.9259999999999 Td
+480.81699999999995 721.8860000000001 Td
/F1.0 10.5 Tf
-<77696c6c20726573756c7420696e20616e20584d4c2073657269616c697a6174696f6e206f66207468617420636c6173733a> Tj
+<2074686174206d617073> 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
-q
-498.800 0 0 307.866 48.240 330.244 cm
-/I2 Do
-Q
+BT
+48.24 706.1060000000001 Td
+/F5.0 10.5 Tf
+<746f646f6170702e646f6d2e6d6f64756c652e746f646f6974656d2e546f446f4974656d> 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 306.2800983606558 Td
+237.24 706.1060000000001 Td
/F1.0 10.5 Tf
-<7768696c652073696d696c61726c792068697474696e67207468652073616d652055524c207769746820616e20> Tj
+<20656e74697469657320746f20> Tj
ET
0.000 0.000 0.000 SCN
@@ -8103,9 +8219,9 @@ ET
0.694 0.129 0.275 SCN
BT
-274.2 306.2800983606558 Td
+291.987 706.1060000000001 Td
/F5.0 10.5 Tf
-<416363657074> Tj
+<746f646f6170702e64746f2e6d6f64756c652e746f646f6974656d2e546f446f4974656d44746f> Tj
ET
0.000 0.000 0.000 SCN
@@ -8114,37 +8230,48 @@ ET
0.200 0.200 0.200 SCN
BT
-305.70000000000005 306.2800983606558 Td
+496.737 706.1060000000001 Td
/F1.0 10.5 Tf
-<20686561646572206f663a> Tj
+<20636c61737365732e> 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 678.3260000000001 Td
+/F1.0 10.5 Tf
+[<4120524553> 20.01953125 <5420636c69656e742063616e207468657265666f7265207265717565737420612044> 20.01953125 <54> 20.01953125 <4f20726570726573656e746174696f6e206f6620616e20656e746974792062> 20.01953125 <7920696e766f6b696e67>] 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 290.464 m
-543.040 290.464 l
-545.249 290.464 547.040 288.673 547.040 286.464 c
-547.040 242.984 l
-547.040 240.775 545.249 238.984 543.040 238.984 c
-52.240 238.984 l
-50.031 238.984 48.240 240.775 48.240 242.984 c
-48.240 286.464 l
-48.240 288.673 50.031 290.464 52.240 290.464 c
+52.240 662.510 m
+543.040 662.510 l
+545.249 662.510 547.040 660.719 547.040 658.510 c
+547.040 629.770 l
+547.040 627.561 545.249 625.770 543.040 625.770 c
+52.240 625.770 l
+50.031 625.770 48.240 627.561 48.240 629.770 c
+48.240 658.510 l
+48.240 660.719 50.031 662.510 52.240 662.510 c
h
f
0.800 0.800 0.800 SCN
0.75 w
-52.240 290.464 m
-543.040 290.464 l
-545.249 290.464 547.040 288.673 547.040 286.464 c
-547.040 242.984 l
-547.040 240.775 545.249 238.984 543.040 238.984 c
-52.240 238.984 l
-50.031 238.984 48.240 240.775 48.240 242.984 c
-48.240 286.464 l
-48.240 288.673 50.031 290.464 52.240 290.464 c
+52.240 662.510 m
+543.040 662.510 l
+545.249 662.510 547.040 660.719 547.040 658.510 c
+547.040 629.770 l
+547.040 627.561 545.249 625.770 543.040 625.770 c
+52.240 625.770 l
+50.031 625.770 48.240 627.561 48.240 629.770 c
+48.240 658.510 l
+48.240 660.719 50.031 662.510 52.240 662.510 c
h
S
Q
@@ -8152,9 +8279,9 @@ Q
0.200 0.200 0.200 SCN
BT
-59.24 267.6390983606558 Td
+59.24 639.6850000000002 Td
/F5.0 11 Tf
-<6170706c69636174696f6e2f6a736f6e3b70726f66696c653d75726e3a6f72672e7265737466756c6f626a656374733a726570722d74797065732f6f626a6563743b782d726f2d646f6d61696e2d> Tj
+<687474703a2f2f6c6f63616c686f73743a383038302f7265737466756c2f6f626a656374732f544f444f2f30> Tj
ET
0.000 0.000 0.000 SCN
@@ -8163,19 +8290,188 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 252.89909836065584 Td
-/F5.0 11 Tf
-<747970653d746f646f6170702e64746f2e6d6f64756c652e746f646f6974656d2e546f446f4974656d44746f> Tj
+48.24 601.8060000000002 Td
+/F1.0 10.5 Tf
+<7769746820616e20> 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.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
BT
-48.24 215.02009836065582 Td
-/F1.0 10.5 Tf
+89.0955 601.8060000000002 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
+120.59550000000002 601.80600
<TRUNCATED>
[5/7] isis-site git commit: internal services introduced in 1.13.0
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/c5f2b2e1/content/guides/rgsvc.html
----------------------------------------------------------------------
diff --git a/content/guides/rgsvc.html b/content/guides/rgsvc.html
index d4d33bc..9663c95 100644
--- a/content/guides/rgsvc.html
+++ b/content/guides/rgsvc.html
@@ -2216,7 +2216,7 @@ result of the first implementation checked that declares that it can provide a r
<div class="sect3">
<h4 id="_implementation_9">3.10.2. Implementation</h4>
<div class="paragraph">
-<p>The framework provides a default implementation which will always return the original object provided, or the home page
+<p>The framework provides a default implementation - <code>RoutingServiceDefault</code> - which will always return the original object provided, or the home page
if a <code>null</code> or <code>void</code> was provided. It uses the <a href="#_rgsvc_api_HomePageProviderService"><code>HomePageProviderService</code></a>.</p>
</div>
<div class="paragraph">
@@ -2238,7 +2238,7 @@ default implementation of <code>RoutingService</code> service is automatically r
<div class="sect3">
<h4 id="_related_services_8">3.10.4. Related Services</h4>
<div class="paragraph">
-<p>The default implementation of ths service uses the
+<p>The default implementation of this service uses the
<a href="#_rgsvc_api_HomePageProviderService"><code>HomePageProviderService</code></a>.</p>
</div>
</div>
@@ -4070,7 +4070,7 @@ interaction/execution is deferred until some other mechanism invokes the command
<div class="sect3">
<h4 id="_implementation_14">4.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.message.MessageServiceDefault</code>).</p>
+<p>The core framework provides a default implementation of this service (<code>o.a.i.core.runtime.services.message.MessageServiceInternalDefault</code>).</p>
</div>
</div>
<div class="sect3">
@@ -4337,7 +4337,7 @@ to distinguish such.</td>
<div class="sect3">
<h4 id="_implementation_17">4.9.2. Implementation</h4>
<div class="paragraph">
-<p>The core framework provides a default implementation of this service (<code>o.a.i.core.metamodel.services.xactn.TransactionServiceDefault</code>).</p>
+<p>The core framework provides a default implementation of this service (<code>o.a.i.core.metamodel.services.xactn.TransactionServiceInternalDefault</code>).</p>
</div>
</div>
<div class="sect3">
@@ -7246,15 +7246,10 @@ that is being audited.</p>
RESET,
DONT_RESET
}
- <span class="annotation">@Programmatic</span>
<span class="predefined-type">Object</span> lookup(BookmarkHolder bookmarkHolder, FieldResetPolicy policy);
- <span class="annotation">@Programmatic</span>
<span class="predefined-type">Object</span> lookup(Bookmark bookmark, FieldResetPolicy policy);
- <span class="annotation">@Programmatic</span>
<T> T lookup(Bookmark bookmark, FieldResetPolicy policy, <span class="predefined-type">Class</span><T> cls); <i class="conum" data-value="2"></i><b>(2)</b>
- <span class="annotation">@Programmatic</span>
Bookmark bookmarkFor(<span class="predefined-type">Object</span> domainObject);
- <span class="annotation">@Programmatic</span>
Bookmark bookmarkFor(<span class="predefined-type">Class</span><?> cls, <span class="predefined-type">String</span> identifier);
}</code></pre>
</div>
@@ -7272,7 +7267,7 @@ that is being audited.</p>
</table>
</div>
<div class="paragraph">
-<p>The core framework provides a default implementation of this API, namely <code>o.a.i.core.metamodel.services.bookmarks.BookmarkServiceDefault</code></p>
+<p>The core framework provides a default implementation of this API, namely <code>o.a.i.core.metamodel.services.bookmarks.BookmarkServiceInternalDefault</code></p>
</div>
</div>
<div class="sect3">
@@ -7431,15 +7426,13 @@ in the <a href="#_rgsvc_intro_overriding-the-services">introduction</a> to this
<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">EmailService</span> {
- <span class="annotation">@Programmatic</span>
<span class="type">boolean</span> send( <i class="conum" data-value="1"></i><b>(1)</b>
<span class="predefined-type">List</span><<span class="predefined-type">String</span>> to, <span class="predefined-type">List</span><<span class="predefined-type">String</span>> cc, <span class="predefined-type">List</span><<span class="predefined-type">String</span>> bcc, <i class="conum" data-value="2"></i><b>(2)</b>
<span class="predefined-type">String</span> subject,
<span class="predefined-type">String</span> body, <i class="conum" data-value="3"></i><b>(3)</b>
<span class="predefined-type">DataSource</span>... attachments);
- <span class="annotation">@Programmatic</span>
<span class="type">boolean</span> isConfigured(); <i class="conum" data-value="4"></i><b>(4)</b>
- }</code></pre>
+}</code></pre>
</div>
</div>
<div class="colist arabic">
@@ -7739,16 +7732,18 @@ in the <a href="#_rgsvc_intro_overriding-the-services">introduction</a> to this
</div>
</div>
<div class="sect2">
-<h3 id="_rgsvc_api_MementoService">7.6. <code>MementoService</code></h3>
+<h3 id="_rgsvc_api_MementoService">7.6. <code>MementoService</code> (deprecated)</h3>
<div class="paragraph">
<p>The <code>MementoService</code> was originally introduced to simplify the implementation of
<a href="ugbtb.html#_ugbtb_view-models">ViewModel</a>s which are required by the framework to return string representation of
-all of their backing state, moreover which is safe for use within a URL.</p>
+all of their backing state, moreover which is safe for use within a URL. This usage is deprecated; use <a href="ugbtb.html#_ugbtb_view-models_jaxb">JAXB view models</a> instead.</p>
</div>
<div class="paragraph">
-<p>However, it can also be used to create a memento of arbitrary objects. (Prior to <code>1.13.0</code> it wass used
-internally by the core implementation of <a href="#_rgsvc_api_BackgroundService"><code>BackgroundService</code></a> to capture
-the state of action invocations so that they can be executed by a background process; this is now done using <a href="rgfis.html#_rgfis_spi_CommandDtoServiceInternal"><code>CommandDtoServiceInternal</code></a></p>
+<p>The service can also be used to create a memento of arbitrary objects, however this usage is also deprecated. (Prior
+to <code>1.13.0</code> it was used internally by the core implementation of
+<a href="#_rgsvc_api_BackgroundService"><code>BackgroundService</code></a> to capture the state of action invocations so that
+they can be executed by a background process; this is now done using
+<a href="rgfis.html#_rgfis_spi_CommandDtoServiceInternal"><code>CommandDtoServiceInternal</code></a>).</p>
</div>
<div class="admonitionblock note">
<table>
@@ -7758,7 +7753,7 @@ the state of action invocations so that they can be executed by a background pro
</td>
<td class="content">
<div class="paragraph">
-<p>As of <code>1.13.0</code> this service is deprecated.</p>
+<p>As of <code>1.13.0</code> this service is deprecated, replaced by internal domain services.</p>
</div>
</td>
</tr>
@@ -7926,8 +7921,11 @@ entities). Nulls can also be set.</p>
<div class="sect3">
<h4 id="_related_services_20">7.6.3. Related Services</h4>
<div class="paragraph">
-<p>(Prior to <code>1.13.0</code>), the memento service was used by the <a href="#_rgsvc_api_CommandContext"><code>CommandContext</code></a> service and also
-<a href="#_rgsvc_spi_BackgroundCommandService"><code>BackgroundCommandService</code></a>. These both use a memento to capture a representation of an action invocation. This is now done using <a href="rgfis.html#_rgfis_spi_CommandDtoServiceInternal"><code>CommandDtoServiceInternal</code></a>.</p>
+<p>(Prior to <code>1.13.0</code>), the memento service was used by the <a href="#_rgsvc_api_CommandContext"><code>CommandContext</code></a>
+service and also
+<a href="#_rgsvc_spi_BackgroundCommandService"><code>BackgroundCommandService</code></a>. These both use a memento to capture a
+representation of an action invocation. This is now done using
+<a href="rgfis.html#_rgfis_spi_CommandDtoServiceInternal"><code>CommandDtoServiceInternal</code></a>.</p>
</div>
</div>
<div class="sect3">
@@ -8376,6 +8374,12 @@ implementation of <code>ApplicationFeatureRepository</code> service is automatic
in the <a href="#_rgsvc_intro_overriding-the-services">introduction</a> to this guide).</p>
</div>
</div>
+<div class="sect3">
+<h4 id="_related_services_22">8.1.3. Related Services</h4>
+<div class="paragraph">
+<p>The default implementation of this service - <code>ApplicationFeatureRepositoryDefault</code> uses the <code>ApplicationFeatureFactory</code> service to instantiate <code>ApplicationFeature</code> instances.</p>
+</div>
+</div>
</div>
<div class="sect2">
<h3 id="_rgsvc_api_LayoutService">8.2. <code>LayoutService</code></h3>
@@ -8585,7 +8589,7 @@ in the <a href="#_rgsvc_intro_overriding-the-services">introduction</a> to this
</div>
</div>
<div class="sect3">
-<h4 id="_related_services_22">8.3.4. Related Services</h4>
+<h4 id="_related_services_23">8.3.4. Related Services</h4>
<div class="paragraph">
<p>The <code>MetaModelServiceMenu</code> provides a method to download all domain members as a CSV. Internally
this calls <code>MetaModelService#export()</code>. Under the covers this uses the API provided by the
@@ -8776,7 +8780,7 @@ implementation of <code>SwaggerService</code> service is automatically registere
</div>
</div>
<div class="sect3">
-<h4 id="_related_services_23">8.5.4. Related Services</h4>
+<h4 id="_related_services_24">8.5.4. Related Services</h4>
<div class="paragraph">
<p>A <code>SwaggerServiceMenu</code> domain service provides a prototype action that enables the swagger spec to be downloaded from the Wicket viewer’s UI.</p>
</div>
@@ -8817,6 +8821,18 @@ implementation of <code>SwaggerService</code> service is automatically registere
</thead>
<tbody>
<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgsvc_api_ExecutionParametersService"><code>o.a.i.applib.</code><br>
+<code>fixturescripts.</code><br>
+<code>ExecutionParametersService</code></a></p></td>
+<td class="tableblock halign-left valign-top"><div><div class="paragraph">
+<p>…​</p>
+</div></div></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>ExecutionParametersService</code><br>
+<code>o.a.i.core</code><br>
+<code>isis-core-applib</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">API is also a concrete class</p></td>
+</tr>
+<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgsvc_api_FixtureScriptsDefault"><code>o.a.i.applib.</code><br>
<code>services.</code><br>
<code>fixturespec</code><br>
@@ -8853,6 +8869,18 @@ SpecificationProvider</code></a>.</p></td>
<code>isis-core-runtime</code></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">API is also a concrete class</p></td>
</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgsvc_api_SwitchUserService"><code>o.a.i.applib.</code><br>
+<code>fixtures.switchuser</code><br>
+<code>SwitchUserServiceService</code></a></p></td>
+<td class="tableblock halign-left valign-top"><div><div class="paragraph">
+<p>(deprecated)</p>
+</div></div></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>SwitchUserServiceImpl</code><br>
+<code>o.a.i.core</code><br>
+<code>isis-core-runtime</code></p></td>
+<td class="tableblock halign-left valign-top"></td>
+</tr>
</tbody>
</table>
<div class="paragraph">
@@ -8876,7 +8904,31 @@ SpecificationProvider</code></a>.</p></td>
</thead>
</table>
<div class="sect2">
-<h3 id="_rgsvc_api_FixtureScriptsDefault">9.1. <code>FixtureScriptsDefault</code></h3>
+<h3 id="_rgsvc_api_ExecutionParametersService">9.1. <code>ExecutionParametersService</code></h3>
+<div class="paragraph">
+<p>The <code>ExecutionParametersService</code> …​</p>
+</div>
+<div class="paragraph">
+<p>Apache Isis provides a default implementation</p>
+</div>
+<div class="sect3">
+<h4 id="_api_implementation_15">9.1.1. API & Implementation</h4>
+<div class="paragraph">
+<p>The API and implementation of this service is simply:</p>
+</div>
+<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">ExecutionParametersService</span> {
+ <span class="directive">public</span> ExecutionParameters newExecutionParameters(<span class="directive">final</span> <span class="predefined-type">String</span> parameters) {
+ <span class="keyword">return</span> <span class="keyword">new</span> ExecutionParameters(parameters);
+ }
+}</code></pre>
+</div>
+</div>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_rgsvc_api_FixtureScriptsDefault">9.2. <code>FixtureScriptsDefault</code></h3>
<div class="paragraph">
<p>The <code>FixtureScriptsDefault</code> service provides the ability to execute <a href="ugtst.html#_ugtst_fixture-scripts_api-and-usage">fixture scripts</a> .</p>
</div>
@@ -8901,7 +8953,7 @@ SpecificationProvider</code></a>.</p></td>
</table>
</div>
<div class="sect3">
-<h4 id="_api_implementation_15">9.1.1. API & Implementation</h4>
+<h4 id="_api_implementation_16">9.2.1. API & Implementation</h4>
<div class="paragraph">
<p>The API for the service is:</p>
</div>
@@ -8924,7 +8976,7 @@ SpecificationProvider</code></a>.</p></td>
</div>
</div>
<div class="sect3">
-<h4 id="_configuration_2">9.1.2. Configuration</h4>
+<h4 id="_configuration_2">9.2.2. Configuration</h4>
<div class="paragraph">
<p>As noted in the introduction, this service is only instantiated if there is no other implementation of <code>FixtureScripts</code> available on the classpath.</p>
</div>
@@ -8933,20 +8985,105 @@ SpecificationProvider</code></a>.</p></td>
</div>
</div>
<div class="sect3">
-<h4 id="_related_services_24">9.1.3. Related Services</h4>
+<h4 id="_related_services_25">9.2.3. Related Services</h4>
<div class="paragraph">
<p>The service interacts with <a href="#_rgsvc_spi_FixtureScriptsSpecificationProvider"><code>FixtureScriptsSpecificationProvider</code></a>.</p>
</div>
</div>
</div>
<div class="sect2">
-<h3 id="_rgsvc_api_SudoService">9.2. <code>SudoService</code></h3>
+<h3 id="_rgsvc_spi_FixtureScriptsSpecificationProvider">9.3. <code>FixtureScriptsSpec’nProvider</code></h3>
+<div class="paragraph">
+<p>The <code>FixtureScriptsSpecificationProvider</code> configures the
+<a href="#_rgsvc_api_FixtureScriptsDefault"><code>FixtureScriptsDefault</code></a> domain service, providing the
+location to search for fixture scripts and other settings.</p>
+</div>
+<div class="paragraph">
+<p>The service is only used if the <code>FixtureScriptsDefault</code> service is instantiated as a fallback by the framework. If
+the application provides its own subclass of <a href="rgcms.html#_rgcms_classes_super_FixtureScripts"><code>FixtureScripts</code></a>
+superclass, then this provider service is not used.</p>
+</div>
+<div class="admonitionblock tip">
+<table>
+<tr>
+<td class="icon">
+<i class="fa icon-tip" title="Tip"></i>
+</td>
+<td class="content">
+<div class="paragraph">
+<p>Of the two designs, we encourage you to implement this "provider" SPI rather than subclass <code>FixtureScripts</code>. The
+primary benefit (apart from decoupling responsibilities) is that it ensures that there is always an instance of
+<code>FixtureScripts</code> available for use.</p>
+</div>
+</td>
+</tr>
+</table>
+</div>
+<div class="sect3">
+<h4 id="_spi_17">9.3.1. SPI</h4>
+<div class="paragraph">
+<p>The SPI defined by the service 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">FixtureScriptsSpecificationProvider</span> {
+ <span class="annotation">@Programmatic</span>
+ FixtureScriptsSpecification getSpecification();
+}</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>where <code>FixtureScriptsSpecification</code> exposes these values:</p>
+</div>
+<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">FixtureScriptsSpecification</span> {
+ <span class="directive">public</span> <span class="predefined-type">String</span> getPackagePrefix() { ... }
+ <span class="directive">public</span> FixtureScripts.NonPersistedObjectsStrategy getNonPersistedObjectsStrategy() { ... }
+ <span class="directive">public</span> FixtureScripts.MultipleExecutionStrategy getMultipleExecutionStrategy() { ... }
+ <span class="directive">public</span> <span class="predefined-type">Class</span><? <span class="directive">extends</span> FixtureScript> getRunScriptDefaultScriptClass() { ... }
+ <span class="directive">public</span> DropDownPolicy getRunScriptDropDownPolicy() { ... }
+ <span class="directive">public</span> <span class="predefined-type">Class</span><? <span class="directive">extends</span> FixtureScript> getRecreateScriptClass() { ... }
+ ...
+}</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>The class is immutable but it has a builder (obtained using <code>FixturescriptsSpecification.builder(…​)</code>) for a fluent API.</p>
+</div>
+</div>
+<div class="sect3">
+<h4 id="_implementation_26">9.3.2. Implementation</h4>
+<div class="paragraph">
+<p>The <a href="ugfun.html#_ugfun_getting-started_simpleapp-archetype">SimpleApp archetype</a> has a simple implementation of this service:</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">DomainAppFixturesProvider</span> <span class="directive">implements</span> FixtureScriptsSpecificationProvider {
+ <span class="annotation">@Override</span>
+ <span class="directive">public</span> FixtureScriptsSpecification getSpecification() {
+ <span class="keyword">return</span> FixtureScriptsSpecification
+ .builder(DomainAppFixturesProvider.class)
+ .with(FixtureScripts.MultipleExecutionStrategy.EXECUTE)
+ .withRunScriptDefault(RecreateSimpleObjects.class)
+ .withRunScriptDropDown(FixtureScriptsSpecification.DropDownPolicy.CHOICES)
+ .withRecreate(RecreateSimpleObjects.class)
+ .build();
+ }
+}</code></pre>
+</div>
+</div>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_rgsvc_api_SudoService">9.4. <code>SudoService</code></h3>
<div class="paragraph">
<p>The <code>SudoService</code> allows the current user reported by the <code>DomainObjectContainer</code> to be temporarily changed to some
other user. This is useful both for <a href="ugtst.html#_ugtst_integ-test-support">integration testing</a> (eg if testing a workflow system whereby objects are moved from one user to another) and while running <a href="ugtst.html#_ugtst_fixture-scripts">fixture scripts</a> (eg setting up objects that would normally require several users to have acted upon the objects).</p>
</div>
<div class="sect3">
-<h4 id="_api_implementation_16">9.2.1. API & Implementation</h4>
+<h4 id="_api_implementation_17">9.4.1. API & Implementation</h4>
<div class="paragraph">
<p>The API provided by the service is:</p>
</div>
@@ -8973,7 +9110,7 @@ other user. This is useful both for <a href="ugtst.html#_ugtst_integ-test-suppor
</div>
</div>
<div class="sect3">
-<h4 id="_usage_14">9.2.2. Usage</h4>
+<h4 id="_usage_14">9.4.2. Usage</h4>
<div class="paragraph">
<p>A good example can be found in the (non-ASF) <a href="http://github.com/isisaddons/isis-app-todoapp">Isis addons' todoapp</a> which uses the <code>SudoService</code> in a fixture script to set up <code>ToDoItem</code> objects:</p>
</div>
@@ -8994,7 +9131,7 @@ other user. This is useful both for <a href="ugtst.html#_ugtst_integ-test-suppor
</div>
</div>
<div class="sect3">
-<h4 id="_registering_the_service_27">9.2.3. Registering the Service</h4>
+<h4 id="_registering_the_service_27">9.4.3. Registering the Service</h4>
<div class="paragraph">
<p>Assuming that the <code>configuration-and-annotation</code> services installer is configured (implicit if using the
<code>AppManifest</code> to <a href="rgcms.html#_rgcms_classes_AppManifest-bootstrapping">bootstrap the app</a>) then Apache Isis' core
@@ -9009,87 +9146,57 @@ in the <a href="#_rgsvc_intro_overriding-the-services">introduction</a> to this
</div>
</div>
<div class="sect2">
-<h3 id="_rgsvc_spi_FixtureScriptsSpecificationProvider">9.3. <code>FixtureScriptsSpec’nProvider</code></h3>
+<h3 id="_rgsvc_api_SwitchUserService">9.5. <code>SwitchUserService</code> (deprecated)</h3>
<div class="paragraph">
-<p>The <code>FixtureScriptsSpecificationProvider</code> configures the
-<a href="#_rgsvc_api_FixtureScriptsDefault"><code>FixtureScriptsDefault</code></a> domain service, providing the
-location to search for fixture scripts and other settings.</p>
+<p>The <code>SwitchUserService</code> domain service provides the ability to install fixtures changing the effective user half-way
+through. For example, this allows the setup of a test of a workflow system which checks that work is moved between
+different users of the system.</p>
</div>
-<div class="paragraph">
-<p>The service is only used if the <code>FixtureScriptsDefault</code> service is instantiated as a fallback by the framework. If
-the application provides its own subclass of <a href="rgcms.html#_rgcms_classes_super_FixtureScripts"><code>FixtureScripts</code></a>
-superclass, then this provider service is not used.</p>
-</div>
-<div class="admonitionblock tip">
+<div class="admonitionblock note">
<table>
<tr>
<td class="icon">
-<i class="fa icon-tip" title="Tip"></i>
+<i class="fa icon-note" title="Note"></i>
</td>
<td class="content">
<div class="paragraph">
-<p>Of the two designs, we encourage you to implement this "provider" SPI rather than subclass <code>FixtureScripts</code>. The
-primary benefit (apart from decoupling responsibilities) is that it ensures that there is always an instance of
-<code>FixtureScripts</code> available for use.</p>
+<p>This service is deprecated; use <a href="ugtst.html#_ugtst_fixture-scripts">fixture scripts</a> and the
+<a href="#_rgsvc_api_SudoService"><code>SudoService</code></a> instead.</p>
</div>
</td>
</tr>
</table>
</div>
<div class="sect3">
-<h4 id="_spi_17">9.3.1. SPI</h4>
+<h4 id="_api_8">9.5.1. API</h4>
<div class="paragraph">
-<p>The SPI defined by the service is:</p>
+<p>The API of this service:</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">FixtureScriptsSpecificationProvider</span> {
- <span class="annotation">@Programmatic</span>
- FixtureScriptsSpecification getSpecification();
+<pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">class</span> <span class="class">SwitchUserService</span> {
+ <span class="type">void</span> switchUser(<span class="predefined-type">String</span> username, <span class="predefined-type">String</span>... roles); <i class="conum" data-value="1"></i><b>(1)</b>
+ <span class="type">void</span> switchUser(<span class="predefined-type">String</span> username, <span class="predefined-type">List</span><<span class="predefined-type">String</span>> roles); <i class="conum" data-value="2"></i><b>(2)</b>
}</code></pre>
</div>
</div>
-<div class="paragraph">
-<p>where <code>FixtureScriptsSpecification</code> exposes these values:</p>
-</div>
-<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">FixtureScriptsSpecification</span> {
- <span class="directive">public</span> <span class="predefined-type">String</span> getPackagePrefix() { ... }
- <span class="directive">public</span> FixtureScripts.NonPersistedObjectsStrategy getNonPersistedObjectsStrategy() { ... }
- <span class="directive">public</span> FixtureScripts.MultipleExecutionStrategy getMultipleExecutionStrategy() { ... }
- <span class="directive">public</span> <span class="predefined-type">Class</span><? <span class="directive">extends</span> FixtureScript> getRunScriptDefaultScriptClass() { ... }
- <span class="directive">public</span> DropDownPolicy getRunScriptDropDownPolicy() { ... }
- <span class="directive">public</span> <span class="predefined-type">Class</span><? <span class="directive">extends</span> FixtureScript> getRecreateScriptClass() { ... }
- ...
-}</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>The class is immutable but it has a builder (obtained using <code>FixturescriptsSpecification.builder(…​)</code>) for a fluent API.</p>
+<div class="colist arabic">
+<table>
+<tr>
+<td><i class="conum" data-value="1"></i><b>1</b></td>
+<td>Switches the current user with the list of specified roles.</td>
+</tr>
+<tr>
+<td><i class="conum" data-value="2"></i><b>2</b></td>
+<td>Switches the current user with the list of specified roles.</td>
+</tr>
+</table>
</div>
</div>
<div class="sect3">
-<h4 id="_implementation_26">9.3.2. Implementation</h4>
+<h4 id="_implementation_27">9.5.2. Implementation</h4>
<div class="paragraph">
-<p>The <a href="ugfun.html#_ugfun_getting-started_simpleapp-archetype">SimpleApp archetype</a> has a simple implementation of this service:</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">DomainAppFixturesProvider</span> <span class="directive">implements</span> FixtureScriptsSpecificationProvider {
- <span class="annotation">@Override</span>
- <span class="directive">public</span> FixtureScriptsSpecification getSpecification() {
- <span class="keyword">return</span> FixtureScriptsSpecification
- .builder(DomainAppFixturesProvider.class)
- .with(FixtureScripts.MultipleExecutionStrategy.EXECUTE)
- .withRunScriptDefault(RecreateSimpleObjects.class)
- .withRunScriptDropDown(FixtureScriptsSpecification.DropDownPolicy.CHOICES)
- .withRecreate(RecreateSimpleObjects.class)
- .build();
- }
-}</code></pre>
-</div>
+<p>The framework provides a default implementation of this service: <code>SwitchUserServiceImpl</code> in <code>isis-core-runtime</code></p>
</div>
</div>
</div>
@@ -9531,7 +9638,7 @@ ObjectStore to provide a number of counters relating to numbers of object loaded
the <code>PublishedObjects</code> class.</p>
</div>
<div class="sect3">
-<h4 id="_api_implementation_17">10.2.1. API & Implementation</h4>
+<h4 id="_api_implementation_18">10.2.1. API & Implementation</h4>
<div class="paragraph">
<p>The API of the service is:</p>
</div>
@@ -9577,7 +9684,7 @@ so no further configuration is required.</p>
</div>
</div>
<div class="sect3">
-<h4 id="_related_services_25">10.2.3. Related Services</h4>
+<h4 id="_related_services_26">10.2.3. Related Services</h4>
<div class="paragraph">
<p>The <a href="#_rgsvc_spi_PublisherService"><code>PublisherService</code></a> also captures the metrics gathered by the
<code>MetricsService</code> and publishes them as part of the <code>PublishedObjects</code> class (part of its SPI).</p>
@@ -9607,7 +9714,7 @@ so no further configuration is required.</p>
</table>
</div>
<div class="sect3">
-<h4 id="_api_implementation_18">10.3.1. API & Implementation</h4>
+<h4 id="_api_implementation_19">10.3.1. API & Implementation</h4>
<div class="paragraph">
<p>The API defined by <code>QueryResultsCache</code> is:</p>
</div>
@@ -9724,7 +9831,7 @@ in the <a href="#_rgsvc_intro_overriding-the-services">introduction</a> to this
</div>
</div>
<div class="sect3">
-<h4 id="_related_services_26">10.3.4. Related Services</h4>
+<h4 id="_related_services_27">10.3.4. Related Services</h4>
<div class="paragraph">
<p>The <a href="#_rgsvc_api_Scratchpad"><code>Scratchpad</code></a> service is also intended for actions that are called many times, allowing arbitrary information to be shared between them. Those methods could be called from some outer loop in domain code, or by the framework itself if the action invoked has the <a href="rgant.html#_rgant-Action_invokeOn"><code>@Action#invokeOn()</code></a> annotation attribute set to <code>OBJECT_AND_COLLECTION</code> or <code>COLLECTION_ONLY</code>.</p>
</div>
@@ -9756,7 +9863,7 @@ in the <a href="#_rgsvc_intro_overriding-the-services">introduction</a> to this
</table>
</div>
<div class="sect3">
-<h4 id="_api_8">10.4.1. API</h4>
+<h4 id="_api_9">10.4.1. API</h4>
<div class="paragraph">
<p>The API of <code>RepositoryService</code> is:</p>
</div>
@@ -10070,7 +10177,7 @@ collection would not containing the given product:</p>
</div>
</div>
<div class="sect3">
-<h4 id="_implementation_27">10.4.3. Implementation</h4>
+<h4 id="_implementation_28">10.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.repository.RepositoryServiceDefault</code>).</p>
</div>
@@ -10115,7 +10222,7 @@ in the <a href="#_rgsvc_intro_overriding-the-services">introduction</a> to this
</div>
</div>
<div class="sect3">
-<h4 id="_related_services_27">10.4.5. Related Services</h4>
+<h4 id="_related_services_28">10.4.5. Related Services</h4>
<div class="paragraph">
<p>the <a href="#_rgsvc_api_FactoryService"><code>FactoryService</code></a> is often used in conjunction with the <code>RepositoryService</code>, to instantiate domain objects before persisting.</p>
</div>
@@ -10348,7 +10455,7 @@ log4j.appender.AuditerServiceLogging.layout=org.apache.log4j.PatternLayout
log4j.appender.AuditerServiceLogging.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss.SSS} %m%n
log4j.logger.org.apache.isis.applib.services.audit.AuditerServiceLogging=DEBUG,AuditerServiceLogging
-log4j.additivity.log4j.logger.org.apache.isis.applib.services.audit.AuditerServiceLogging=false</code></pre>
+log4j.additivity.org.apache.isis.applib.services.audit.AuditerServiceLogging=false</code></pre>
</div>
</div>
<div class="paragraph">
@@ -10401,7 +10508,7 @@ implementing a <a href="ugbtb.html#_ugbtb_decoupling_vetoing-visibility">vetoing
</div>
</div>
<div class="sect3">
-<h4 id="_related_services_28">11.1.5. Related Services</h4>
+<h4 id="_related_services_29">11.1.5. Related Services</h4>
<div class="paragraph">
<p>The auditing service works very well with implementations of
<a href="#<em>rgsvc_spi_PublisherService"><code>PublisherService</code></a> that persist the <code>Interaction.Execution</code> objects
@@ -10433,7 +10540,7 @@ transactions within a single interaction.</p>
</div>
</div>
<div class="sect2">
-<h3 id="_rgsvc_spi_AuditingService">11.2. <code>AuditingService3</code></h3>
+<h3 id="_rgsvc_spi_AuditingService">11.2. <code>AuditingService3</code> (deprecated)</h3>
<div class="paragraph">
<p>The <code>AuditingService3</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>
@@ -10445,7 +10552,7 @@ transactions within a single interaction.</p>
</td>
<td class="content">
<div class="paragraph">
-<p>In case you are wondering what happened to <code>AuditingService</code> and <code>AuditingService2</code>, these were earlier versions of the SPI that have since been deprecated and removed.</p>
+<p>This service is deprecated, replaced by <a href="#_rgsvc_spi_AuditerService"><code>AuditerService</code></a>.</p>
</div>
</td>
</tr>
@@ -10474,7 +10581,7 @@ transactions within a single interaction.</p>
</div>
</div>
<div class="sect3">
-<h4 id="_implementation_28">11.2.2. Implementation</h4>
+<h4 id="_implementation_29">11.2.2. Implementation</h4>
<div class="paragraph">
<p>The most full-featured available implementation is the (non-ASF) <a href="http://github.com/isisaddons/isis-module-audit">Isis addons' Audit module</a>. This creates an audit records for each changed property (ie every time that <code>AuditingService3#audit(…​)</code> is called. The implementation is <code>org.isisaddons.module.audit.dom.AuditingService</code>.</p>
</div>
@@ -10521,7 +10628,7 @@ implementing a <a href="ugbtb.html#_ugbtb_decoupling_vetoing-visibility">vetoing
</div>
</div>
<div class="sect3">
-<h4 id="_related_services_29">11.2.5. Related Services</h4>
+<h4 id="_related_services_30">11.2.5. Related Services</h4>
<div class="paragraph">
<p>This service has been deprecated and replaced by the equivalent
<a href="#_rgsvc_spi_AuditerService"><code>AuditerService</code></a>.</p>
@@ -10529,7 +10636,7 @@ implementing a <a href="ugbtb.html#_ugbtb_decoupling_vetoing-visibility">vetoing
</div>
</div>
<div class="sect2">
-<h3 id="_rgsvc_spi_EventSerializer">11.3. <code>EventSerializer</code></h3>
+<h3 id="_rgsvc_spi_EventSerializer">11.3. <code>EventSerializer</code> (deprecated)</h3>
<div class="paragraph">
<p>The <code>EmailSerializer</code> service is a supporting service intended for use by (any implementation of) <a href="#_rgsvc_spi_PublishingService"><code>PublishingService</code></a>. Its responsibility is to combine the <code>EventMetadata</code> and the <code>EventPayload</code> into some serialized form (such as JSON, XML or a string) that can then be published.</p>
</div>
@@ -10586,7 +10693,7 @@ implementing a <a href="ugbtb.html#_ugbtb_decoupling_vetoing-visibility">vetoing
</div>
</div>
<div class="sect3">
-<h4 id="_implementation_29">11.3.2. Implementation</h4>
+<h4 id="_implementation_30">11.3.2. Implementation</h4>
<div class="paragraph">
<p>The (non-ASF) <a href="http://github.com/isisaddons/isis-module-publishing">Isis addons' publishing</a> module provides an implementation (<code>org.isisaddons.module.publishing.dom.eventserializer.RestfulObjectsSpecEventSerializer</code>) that represents the event payload using the representation defined by the <a href="http://restfulobjects.org">Restful Objects spec</a> of (transient) objects, grafting on the metadata as additional JSON nodes.</p>
</div>
@@ -10629,7 +10736,7 @@ then this can be activated by updating the <code>pom.xml</code> and updating the
</div>
</div>
<div class="sect3">
-<h4 id="_related_services_30">11.3.4. Related Services</h4>
+<h4 id="_related_services_31">11.3.4. Related Services</h4>
<div class="paragraph">
<p>This service is intended (though not mandated) to be used by implementations of <a href="#_rgsvc_spi_PublishingService"><code>PublishingService</code></a>. The (non-ASF) <a href="http://github.com/isisaddons/isis-module-publishing">Isis addons' publishing</a> module does use it (though the (non-ASF)
<a href="http://github.com/isisaddons/isis-module-publishmq">Isis addons' publishmq</a> module does not).</p>
@@ -10754,7 +10861,7 @@ log4j.appender.PublisherServiceLogging.layout=org.apache.log4j.PatternLayout
log4j.appender.PublisherServiceLogging.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss.SSS} %m%n
log4j.logger.org.apache.isis.applib.services.publish.PublisherServiceLogging=DEBUG,PublisherServiceLogging
-log4j.additivity.log4j.logger.org.apache.isis.applib.services.publish.PublisherServiceLogging=false</code></pre>
+log4j.additivity.org.apache.isis.applib.services.publish.PublisherServiceLogging=false</code></pre>
</div>
</div>
<div class="paragraph">
@@ -10796,7 +10903,7 @@ suppressed either using security or by implementing a
</div>
</div>
<div class="sect3">
-<h4 id="_related_services_31">11.4.5. Related Services</h4>
+<h4 id="_related_services_32">11.4.5. Related Services</h4>
<div class="paragraph">
<p>This service supports two main use cases:</p>
</div>
@@ -10861,7 +10968,7 @@ invocation/property edit causing the current event to be raised using
</div>
</div>
<div class="sect2">
-<h3 id="_rgsvc_spi_PublishingService">11.5. <code>PublishingService</code></h3>
+<h3 id="_rgsvc_spi_PublishingService">11.5. <code>PublishingService</code> (deprecated)</h3>
<div class="paragraph">
<p>The <code>PublishingService</code> API is intended for coarse-grained publish/subscribe for system-to-system interactions, from Apache Isis to some other system. Here the only events published are those that action invocations and of changed objects. A typical use case is to publish onto a pub/sub bus such as <a href="http://activemq.apache.org/">ActiveMQ</a> with <a href="http://camel.apache.org">Camel</a> to keep other systems up to date.</p>
</div>
@@ -10873,7 +10980,7 @@ invocation/property edit causing the current event to be raised using
</td>
<td class="content">
<div class="paragraph">
-<p>This service is deprecated, replaced with <a href="#_rgsvc_spi_PublisherService"><code>PublisherService</code></a>.</p>
+<p>As of <code>1.13.0</code> this service is deprecated, replaced with <a href="#_rgsvc_spi_PublisherService"><code>PublisherService</code></a>.</p>
</div>
</td>
</tr>
@@ -10926,7 +11033,7 @@ invocation/property edit causing the current event to be raised using
</div>
</div>
<div class="sect3">
-<h4 id="_implementation_30">11.5.2. Implementation</h4>
+<h4 id="_implementation_31">11.5.2. Implementation</h4>
<div class="paragraph">
<p>The (non-ASF) <a href="http://github.com/isisaddons/isis-module-publishing">Isis addons' publishing</a> module provides an
implementation (<code>org.isisaddons.module.publishing.dom.PublishingService</code>) that persists each
@@ -11071,7 +11178,7 @@ suppressed either using security or by implementing a
</div>
</div>
<div class="sect3">
-<h4 id="_related_services_32">11.5.5. Related Services</h4>
+<h4 id="_related_services_33">11.5.5. Related Services</h4>
<div class="paragraph">
<p>The <code>PublishingService</code> is intended for coarse-grained publish/subscribe for system-to-system interactions, from
Apache Isis to some other system. Here the only events published are those that action invocations (for actions
@@ -11187,7 +11294,7 @@ current event to be raised using <a href="#_rgsvc_api_InteractionContext"><code>
</div>
</div>
<div class="sect3">
-<h4 id="_implementation_31">11.6.2. Implementation</h4>
+<h4 id="_implementation_32">11.6.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>
@@ -11232,7 +11339,7 @@ to implement a subclass and register.</p>
</div>
</div>
<div class="sect3">
-<h4 id="_related_services_33">11.6.4. Related Services</h4>
+<h4 id="_related_services_34">11.6.4. Related Services</h4>
<div class="paragraph">
<p>The most common use case is to allow users to sign-up through Apache Isis' Wicket viewer. Because the process requires email to be sent, the following services must be configured:</p>
</div>
@@ -11353,7 +11460,7 @@ to implement a subclass and register.</p>
</div>
</div>
<div class="sect3">
-<h4 id="_implementation_32">12.1.2. Implementation</h4>
+<h4 id="_implementation_33">12.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>
@@ -11811,7 +11918,7 @@ in the <a href="#_rgsvc_intro_overriding-the-services">introduction</a> to this
<li><a href="#_registering_the_service_20">7.5.3. Registering the Service</a></li>
</ul>
</li>
-<li><a href="#_rgsvc_api_MementoService">7.6. <code>MementoService</code></a>
+<li><a href="#_rgsvc_api_MementoService">7.6. <code>MementoService</code> (deprecated)</a>
<ul class="sectlevel3">
<li><a href="#_api_implementation_13">7.6.1. API & Implementation</a></li>
<li><a href="#_usage_12">7.6.2. Usage</a></li>
@@ -11837,6 +11944,7 @@ in the <a href="#_rgsvc_intro_overriding-the-services">introduction</a> to this
<ul class="sectlevel3">
<li><a href="#_api_implementation_14">8.1.1. API & Implementation</a></li>
<li><a href="#_registering_the_service_23">8.1.2. Registering the Service</a></li>
+<li><a href="#_related_services_22">8.1.3. Related Services</a></li>
</ul>
</li>
<li><a href="#_rgsvc_api_LayoutService">8.2. <code>LayoutService</code></a>
@@ -11851,7 +11959,7 @@ in the <a href="#_rgsvc_intro_overriding-the-services">introduction</a> to this
<li><a href="#_api_6">8.3.1. API</a></li>
<li><a href="#_implementation_24">8.3.2. Implementation</a></li>
<li><a href="#_registering_the_service_24">8.3.3. Registering the Service</a></li>
-<li><a href="#_related_services_22">8.3.4. Related Services</a></li>
+<li><a href="#_related_services_23">8.3.4. Related Services</a></li>
</ul>
</li>
<li><a href="#_rgsvc_api_ServiceRegistry">8.4. <code>ServiceRegistry2</code></a>
@@ -11867,25 +11975,23 @@ in the <a href="#_rgsvc_intro_overriding-the-services">introduction</a> to this
<li><a href="#_rgsvc_api_SwaggerService_api-and-implementation">8.5.1. API & Implementation</a></li>
<li><a href="#_usage_within_the_framework_3">8.5.2. Usage within the framework</a></li>
<li><a href="#_registering_the_service_26">8.5.3. Registering the Service</a></li>
-<li><a href="#_related_services_23">8.5.4. Related Services</a></li>
+<li><a href="#_related_services_24">8.5.4. Related Services</a></li>
</ul>
</li>
</ul>
</li>
<li><a href="#_rgsvc_testing">9. Testing</a>
<ul class="sectlevel2">
-<li><a href="#_rgsvc_api_FixtureScriptsDefault">9.1. <code>FixtureScriptsDefault</code></a>
+<li><a href="#_rgsvc_api_ExecutionParametersService">9.1. <code>ExecutionParametersService</code></a>
<ul class="sectlevel3">
<li><a href="#_api_implementation_15">9.1.1. API & Implementation</a></li>
-<li><a href="#_configuration_2">9.1.2. Configuration</a></li>
-<li><a href="#_related_services_24">9.1.3. Related Services</a></li>
</ul>
</li>
-<li><a href="#_rgsvc_api_SudoService">9.2. <code>SudoService</code></a>
+<li><a href="#_rgsvc_api_FixtureScriptsDefault">9.2. <code>FixtureScriptsDefault</code></a>
<ul class="sectlevel3">
<li><a href="#_api_implementation_16">9.2.1. API & Implementation</a></li>
-<li><a href="#_usage_14">9.2.2. Usage</a></li>
-<li><a href="#_registering_the_service_27">9.2.3. Registering the Service</a></li>
+<li><a href="#_configuration_2">9.2.2. Configuration</a></li>
+<li><a href="#_related_services_25">9.2.3. Related Services</a></li>
</ul>
</li>
<li><a href="#_rgsvc_spi_FixtureScriptsSpecificationProvider">9.3. <code>FixtureScriptsSpec’nProvider</code></a>
@@ -11894,6 +12000,19 @@ in the <a href="#_rgsvc_intro_overriding-the-services">introduction</a> to this
<li><a href="#_implementation_26">9.3.2. Implementation</a></li>
</ul>
</li>
+<li><a href="#_rgsvc_api_SudoService">9.4. <code>SudoService</code></a>
+<ul class="sectlevel3">
+<li><a href="#_api_implementation_17">9.4.1. API & Implementation</a></li>
+<li><a href="#_usage_14">9.4.2. Usage</a></li>
+<li><a href="#_registering_the_service_27">9.4.3. Registering the Service</a></li>
+</ul>
+</li>
+<li><a href="#_rgsvc_api_SwitchUserService">9.5. <code>SwitchUserService</code> (deprecated)</a>
+<ul class="sectlevel3">
+<li><a href="#_api_8">9.5.1. API</a></li>
+<li><a href="#_implementation_27">9.5.2. Implementation</a></li>
+</ul>
+</li>
</ul>
</li>
<li><a href="#_rgsvc_persistence-layer-api">10. Persistence Layer API</a>
@@ -11910,22 +12029,22 @@ in the <a href="#_rgsvc_intro_overriding-the-services">introduction</a> to this
</li>
<li><a href="#_rgsvc_api_MetricsService">10.2. <code>MetricsService</code></a>
<ul class="sectlevel3">
-<li><a href="#_api_implementation_17">10.2.1. API & Implementation</a></li>
+<li><a href="#_api_implementation_18">10.2.1. API & Implementation</a></li>
<li><a href="#_registering_the_service_28">10.2.2. Registering the Service</a></li>
-<li><a href="#_related_services_25">10.2.3. Related Services</a></li>
+<li><a href="#_related_services_26">10.2.3. Related Services</a></li>
</ul>
</li>
<li><a href="#_rgsvc_api_QueryResultsCache">10.3. <code>QueryResultsCache</code></a>
<ul class="sectlevel3">
-<li><a href="#_api_implementation_18">10.3.1. API & Implementation</a></li>
+<li><a href="#_api_implementation_19">10.3.1. API & Implementation</a></li>
<li><a href="#_usage_15">10.3.2. Usage</a></li>
<li><a href="#_registering_the_service_29">10.3.3. Registering the Service</a></li>
-<li><a href="#_related_services_26">10.3.4. Related Services</a></li>
+<li><a href="#_related_services_27">10.3.4. Related Services</a></li>
</ul>
</li>
<li><a href="#_rgsvc_api_RepositoryService">10.4. <code>RepositoryService</code></a>
<ul class="sectlevel3">
-<li><a href="#_api_8">10.4.1. API</a></li>
+<li><a href="#_api_9">10.4.1. API</a></li>
<li><a href="#_usage_16">10.4.2. Usage</a>
<ul class="sectlevel4">
<li><a href="#_persist">Persist</a></li>
@@ -11933,13 +12052,13 @@ in the <a href="#_rgsvc_intro_overriding-the-services">introduction</a> to this
<li><a href="#_query_and_code_xxxmatches_code">Query and <code>xxxMatches(…​)</code></a></li>
</ul>
</li>
-<li><a href="#_implementation_27">10.4.3. Implementation</a>
+<li><a href="#_implementation_28">10.4.3. Implementation</a>
<ul class="sectlevel4">
<li><a href="#__disabling_auto_flush">(Disabling) Auto-flush</a></li>
</ul>
</li>
<li><a href="#_registering_the_service_30">10.4.4. Registering the Service</a></li>
-<li><a href="#_related_services_27">10.4.5. Related Services</a></li>
+<li><a href="#_related_services_28">10.4.5. Related Services</a></li>
</ul>
</li>
</ul>
@@ -11952,24 +12071,24 @@ in the <a href="#_rgsvc_intro_overriding-the-services">introduction</a> to this
<li><a href="#_implementations_3">11.1.2. Implementations</a></li>
<li><a href="#_usage_17">11.1.3. Usage</a></li>
<li><a href="#_registering_the_services_18">11.1.4. Registering the Services</a></li>
-<li><a href="#_related_services_28">11.1.5. Related Services</a></li>
+<li><a href="#_related_services_29">11.1.5. Related Services</a></li>
</ul>
</li>
-<li><a href="#_rgsvc_spi_AuditingService">11.2. <code>AuditingService3</code></a>
+<li><a href="#_rgsvc_spi_AuditingService">11.2. <code>AuditingService3</code> (deprecated)</a>
<ul class="sectlevel3">
<li><a href="#_spi_19">11.2.1. SPI</a></li>
-<li><a href="#_implementation_28">11.2.2. Implementation</a></li>
+<li><a href="#_implementation_29">11.2.2. Implementation</a></li>
<li><a href="#_usage_18">11.2.3. Usage</a></li>
<li><a href="#_registering_the_services_19">11.2.4. Registering the Services</a></li>
-<li><a href="#_related_services_29">11.2.5. Related Services</a></li>
+<li><a href="#_related_services_30">11.2.5. Related Services</a></li>
</ul>
</li>
-<li><a href="#_rgsvc_spi_EventSerializer">11.3. <code>EventSerializer</code></a>
+<li><a href="#_rgsvc_spi_EventSerializer">11.3. <code>EventSerializer</code> (deprecated)</a>
<ul class="sectlevel3">
<li><a href="#_spi_20">11.3.1. SPI</a></li>
-<li><a href="#_implementation_29">11.3.2. Implementation</a></li>
+<li><a href="#_implementation_30">11.3.2. Implementation</a></li>
<li><a href="#_registering_the_services_20">11.3.3. Registering the Services</a></li>
-<li><a href="#_related_services_30">11.3.4. Related Services</a></li>
+<li><a href="#_related_services_31">11.3.4. Related Services</a></li>
</ul>
</li>
<li><a href="#_rgsvc_spi_PublisherService">11.4. <code>PublisherService</code></a>
@@ -11978,25 +12097,25 @@ in the <a href="#_rgsvc_intro_overriding-the-services">introduction</a> to this
<li><a href="#_implementations_4">11.4.2. Implementations</a></li>
<li><a href="#_usage_19">11.4.3. Usage</a></li>
<li><a href="#_registering_the_services_21">11.4.4. Registering the Services</a></li>
-<li><a href="#_related_services_31">11.4.5. Related Services</a></li>
+<li><a href="#_related_services_32">11.4.5. Related Services</a></li>
</ul>
</li>
-<li><a href="#_rgsvc_spi_PublishingService">11.5. <code>PublishingService</code></a>
+<li><a href="#_rgsvc_spi_PublishingService">11.5. <code>PublishingService</code> (deprecated)</a>
<ul class="sectlevel3">
<li><a href="#_spi_22">11.5.1. SPI</a></li>
-<li><a href="#_implementation_30">11.5.2. Implementation</a></li>
+<li><a href="#_implementation_31">11.5.2. Implementation</a></li>
<li><a href="#_usage_20">11.5.3. Usage</a></li>
<li><a href="#_registering_the_services_22">11.5.4. Registering the Services</a></li>
-<li><a href="#_related_services_32">11.5.5. Related Services</a></li>
+<li><a href="#_related_services_33">11.5.5. Related Services</a></li>
<li><a href="#_design_notes">11.5.6. Design Notes</a></li>
</ul>
</li>
<li><a href="#_rgsvc_spi_UserRegistrationService">11.6. <code>UserRegistrationService</code></a>
<ul class="sectlevel3">
<li><a href="#_spi_23">11.6.1. SPI</a></li>
-<li><a href="#_implementation_31">11.6.2. Implementation</a></li>
+<li><a href="#_implementation_32">11.6.2. Implementation</a></li>
<li><a href="#_registering_the_services_23">11.6.3. Registering the Services</a></li>
-<li><a href="#_related_services_33">11.6.4. Related Services</a></li>
+<li><a href="#_related_services_34">11.6.4. Related Services</a></li>
</ul>
</li>
</ul>
@@ -12006,7 +12125,7 @@ in the <a href="#_rgsvc_intro_overriding-the-services">introduction</a> to this
<li><a href="#_rgsvc_spi_ClassDiscoveryService">12.1. <code>ClassDiscoveryService</code></a>
<ul class="sectlevel3">
<li><a href="#_spi_24">12.1.1. SPI</a></li>
-<li><a href="#_implementation_32">12.1.2. Implementation</a></li>
+<li><a href="#_implementation_33">12.1.2. Implementation</a></li>
<li><a href="#_usage_21">12.1.3. Usage</a></li>
<li><a href="#_registering_the_services_24">12.1.4. Registering the Services</a></li>
</ul>