You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2017/08/07 07:12:45 UTC
[01/10] isis-site git commit: ISIS-1521: docs
Repository: isis-site
Updated Branches:
refs/heads/asf-site 3921d6e7f -> 8b42f65e3
http://git-wip-us.apache.org/repos/asf/isis-site/blob/8b42f65e/content/release-notes/release-notes.html
----------------------------------------------------------------------
diff --git a/content/release-notes/release-notes.html b/content/release-notes/release-notes.html
index ab7f0b3..a055093 100644
--- a/content/release-notes/release-notes.html
+++ b/content/release-notes/release-notes.html
@@ -305,9 +305,9 @@ table.CodeRay td.code>pre{padding:0}
<p>Inline prompts, Wicket 7.x</p>
</div>
</div></td>
- <td class="tableblock halign-right valign-top"></td>
- <td class="tableblock halign-right valign-top"></td>
- <td class="tableblock halign-right valign-top"></td>
+ <td class="tableblock halign-right valign-top"><p class="tableblock">7</p></td>
+ <td class="tableblock halign-right valign-top"><p class="tableblock">25</p></td>
+ <td class="tableblock halign-right valign-top"><p class="tableblock">34</p></td>
<td class="tableblock halign-left valign-top">
<div></div></td>
</tr>
@@ -894,7 +894,7 @@ table.CodeRay td.code>pre{padding:0}
</table>
</div>
<div class="paragraph">
- <p>The main new feature is inline prompts: the ability to edit a property or invoke an action (associated with a property) without requiring a modal dialog box. There have also been several improvements in the ability to tab around the UI.</p>
+ <p>The main new feature of <code>1.15.0</code> is inline prompts: the ability to edit a property or invoke an action (associated with a property) without requiring a modal dialog box. There have also been several improvements in the ability to tab around the UI.</p>
</div>
<div class="paragraph">
<p>The version of Apache Wicket has also been upgraded from <code>6.x</code> to <code>7.x</code>.</p>
@@ -902,6 +902,170 @@ table.CodeRay td.code>pre{padding:0}
<div class="paragraph">
<p>Most applications written against v1.14.x should run against v1.15.0 with few if any changes. That said, we do recommend that you read and keep in mind the <a href="../migration-notes/migration-notes.html#_migration-notes_1.14.0-to-1.15.0">migration notes</a> when you upgrade your app.</p>
</div>
+ <div class="admonitionblock note">
+ <table>
+ <tbody>
+ <tr>
+ <td class="icon"> <i class="fa icon-note" title="Note"></i> </td>
+ <td class="content">
+ <div class="paragraph">
+ <p>(<strong>work in progress</strong>) The supporting (non-ASF) <a href="http://isisaddons.org">Isis Addons</a> and <a href="http://catalog.incode.org">Incode Catalog</a> have also been reorganised into a single <a href="http://platform.incode.org">"Incode Platform"</a>.</p>
+ </div>
+ <div class="paragraph">
+ <p>While each module can still be consumed individually, the new platform versions consistently (a change in any one module will result in a re-release of all). This should make these modules easier to consume, and easier to maintain/develop.</p>
+ </div>
+ <div class="paragraph">
+ <p>All the modules remain open source, still licensed under the ASF v2.0 license.</p>
+ </div> </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ <div class="sect2">
+ <h3 id="_new_feature">New Feature</h3>
+ <div class="ulist">
+ <ul>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1674">ISIS-1674</a> - Create a "hello world" archetype</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1641">ISIS-1641</a> - Allow the Wicket debug bar to be optionally shown, even in non-prototyping mode.</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1640">ISIS-1640</a> - Allow bookmarks and breadcrumb panels to be hidden.</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1633">ISIS-1633</a> - Allow properties to be "edited" using an action (ie using multiple parameters)</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1621">ISIS-1621</a> - Promote HsqlDbManager from simpleapp archetype to applib.</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1617">ISIS-1617</a> - Add support for the Wicket debug bar, for better diagnostics on session size etc</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1603">ISIS-1603</a> - Inline prompts for property edits and action invocations.</p> </li>
+ </ul>
+ </div>
+ </div>
+ <div class="sect2">
+ <h3 id="_improvement">Improvement</h3>
+ <div class="ulist">
+ <ul>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1688">ISIS-1688</a> - Service priority should honour either @DomainServiceLayout#menuOrder or @DomainService#menuOrder</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1687">ISIS-1687</a> - Support for TypeSafe queries with a unique result in IsisJdoSupport</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1686">ISIS-1686</a> - Allow integration tests to be bootstrapped with less boilerplate</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1685">ISIS-1685</a> - Add missing javadocs for packages in the applib</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1669">ISIS-1669</a> - For JAXB view models, metamodel validator for missing JAXB adapters on date/time properties, or on persistable reference types.</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1662">ISIS-1662</a> - Metamodel validator that any view model should have a no-arg constructor.</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1658">ISIS-1658</a> - Subscribers on title UI event, css and icon should override title() or @Title etc in the class itself.</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1655">ISIS-1655</a> - QueryResultsCache should be invalidated prior to the render phase.</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1654">ISIS-1654</a> - per-arg validation not fired for enum (ValueChoicesSelect2Panel)</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1653">ISIS-1653</a> - Allow properties to be dynamically made visible/non-visible when not redirecting</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1652">ISIS-1652</a> - Inline prompts should not show gap when no action buttons visible</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1651">ISIS-1651</a> - Inline prompt should provide CSS identifying the action being prompted for.</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1630">ISIS-1630</a> - view models with inline prompts don’t show which fields are mandatory or not.</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1627">ISIS-1627</a> - Error handling for axon event bus</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1614">ISIS-1614</a> - Improve responsive design of header</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1613">ISIS-1613</a> - On action invoke/property edit, don’t reload page, just repaint changed components (and allow unchanged components to opt out).</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1611">ISIS-1611</a> - Allow framework services to be overridden without having to remember to set @DomainService#menuOrder to a lower value.</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1592">ISIS-1592</a> - Extend XSD for command and interaction events, show logicalMemberIdentifier as well as memberIdentifier</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1590">ISIS-1590</a> - Performance issue: don’t call Clause#getValueOf() with ApplicationFeatureId</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1535">ISIS-1535</a> - MetaModel CSV should not list mixins as types.</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1528">ISIS-1528</a> - Rename isis-viewer-wicket artifacts to isis-core-viewer-wicket, for consistency with other core modules.</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1504">ISIS-1504</a> - Metamodel validator should check that all classes annotated as view models are instantiable (are not member inner classes)</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1468">ISIS-1468</a> - Extend TransactionService to include API of TransactionStateProviderInternal.</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1394">ISIS-1394</a> - Suppress fieldset banner (name) if only one fieldset in tab (to reduce page real estate usage).</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1391">ISIS-1391</a> - Combine MessageBrokerInternalService with MessageService, and…</p> </li>
+ </ul>
+ </div>
+ </div>
+ <div class="sect2">
+ <h3 id="_bug">Bug</h3>
+ <div class="ulist">
+ <ul>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1690">ISIS-1690</a> - Better diagnostics if a service’s @PostConstruct fails, and ensure that all get initialized</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1689">ISIS-1689</a> - ObjectSpecIdFacet from JDO schema being clobbered by objectType inferred from class name, causing a validator to fail unnecessarily</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1676">ISIS-1676</a> - Standardise framework mxins to use @Mixin(method="act") or @Mixin(method="prop") etc.</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1675">ISIS-1675</a> - swagger spec file does not support parameters with an id starting with "."</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1668">ISIS-1668</a> - INLINE_AS_IF_EDIT actions do not honour hidden or disabled facets.</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1667">ISIS-1667</a> - Rework ActionParametersPanel so that only rendered if there is a N-arg action … it isn’t used to implicitly invoke an action for a no-arg action.</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1657">ISIS-1657</a> - Fix for CSS for disabled drop-down actions on right of property.</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1650">ISIS-1650</a> - Disabled properties for JAXB view models are never disabled.</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1649">ISIS-1649</a> - Update docs with Erik’s runAs gist</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1648">ISIS-1648</a> - Disable copy link (because hint as provided in the bookmarks seems to be broken)</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1647">ISIS-1647</a> - Hitting escape twice for modal dialogs causes a stack trace</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1642">ISIS-1642</a> - Refactor breadcrumb panel to remove memory leak</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1631">ISIS-1631</a> - jdoqlFromClause validation error with multi-level inheritance</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1626">ISIS-1626</a> - Confirmation Dialog not shown on no-parameter Menu Actions</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1625">ISIS-1625</a> - Tooltips do not show up on Menu Actions (using the describedAs feature)</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1619">ISIS-1619</a> - Blob/Clob Action results are cached no matter what</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1618">ISIS-1618</a> - Action Button with Confirmation Dialog ignores second shot</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1615">ISIS-1615</a> - Tooltip for Actions not always shown … @ActionLayout.describedAs</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1610">ISIS-1610</a> - Unable to use space bar to toggle checkboxes.</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1609">ISIS-1609</a> - @Property(editing=ENABLED) not working for some JAXB view model properties.</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1608">ISIS-1608</a> - Error "ConcurrentModificationException" during startup</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1607">ISIS-1607</a> - Swagger HTML doesn’t load correctly, missing webjars</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1606">ISIS-1606</a> - Running with bypass authenticator seems to be failing, not looking up class from its 'bypass' alias</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1605">ISIS-1605</a> - When entering / editing LocalDate in UI on Viewmodel the current date is taken instead of entered date</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1602">ISIS-1602</a> - Handle mixins without any NotContributedFacet (assume is contributed as action)</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1600">ISIS-1600</a> - Autocomplete repositories not being used/detected when using an action with a collection parameter</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1597">ISIS-1597</a> - review the buildnumber plugin in the simpleapp archetype</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1596">ISIS-1596</a> - Parameter translations broken ?</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1595">ISIS-1595</a> - Configuration property for JDOQL VARIABLES clause mismatch</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1572">ISIS-1572</a> - RestfulObjects viewer - Service members empty</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1551">ISIS-1551</a> - Problems with startup under certain circumstances</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1486">ISIS-1486</a> - three-way Boolean checkbox doesn’t seem to be rendering correctly (shows as two-way only)</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1224">ISIS-1224</a> - drop down box (select2) is orphaned and floats top-right under certain circumstances</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1183">ISIS-1183</a> - Copying a property value in view mode doesn’t work in Firefox on Windows</p> </li>
+ </ul>
+ </div>
+ </div>
+ <div class="sect2">
+ <h3 id="_dependency_upgrade">Dependency upgrade</h3>
+ <div class="ulist">
+ <ul>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1353">ISIS-1353</a> - Upgrade minor dependencies.</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1223">ISIS-1223</a> - Upgrade Wicket to 7.x</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1523">ISIS-1523</a> - Upgrade wicket-bootstrap and related, and revert ISIS-1520</p> </li>
+ </ul>
+ </div>
+ </div>
+ <div class="sect2">
+ <h3 id="_documentation">Documentation</h3>
+ <div class="ulist">
+ <ul>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1644">ISIS-1644</a> - Broken Links</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1604">ISIS-1604</a> - Extend support for SVG (3 additional dependencies, it seems)</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1594">ISIS-1594</a> - Provide an 'edit' button on the isis documentation</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1579">ISIS-1579</a> - Asciidoc Template/Stylesheet issues</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1575">ISIS-1575</a> - Problems with download page</p> </li>
+ </ul>
+ </div>
+ </div>
+ <div class="sect2">
+ <h3 id="_task">Task</h3>
+ <div class="ulist">
+ <ul>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1521">ISIS-1521</a> - Release activities for 1.15.0</p> </li>
+ </ul>
+ </div>
+ </div>
+ <div class="sect2">
+ <h3 id="_add_ons">Add-ons</h3>
+ <div class="paragraph">
+ <p>Implemented in either the supporting (non-ASF) <a href="http://isisaddons.org">Isis Addons</a> or <a href="http://catalog.incode.org">Incode Catalog</a>.</p>
+ </div>
+ <div class="ulist">
+ <ul>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-513">ISIS-513</a> - [ADDONS] Wicket: Pdf.js display in browser natively</p> </li>
+ </ul>
+ </div>
+ </div>
+ <div class="sect2">
+ <h3 id="_closed_other_reasons">Closed (other reasons)</h3>
+ <div class="paragraph">
+ <p>The issues below are either not a problem, or have been implemented in previous releases but (for whatever reason) not closed at that time.</p>
+ </div>
+ <div class="ulist">
+ <ul>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1691">ISIS-1691</a> - [NOT A PROBLEM] Bootstrap paging navigators "pageNumber" failing to render correctly</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1661">ISIS-1661</a> - [NOT A PROBLEM] once selected, doesn’t seem to be possible to set a @Nullable parameter that has an autoComplete back to null</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1673">ISIS-1673</a> - [CAN’T REPRODUCE] jdoqlFromClause validator is too strict, does not allow for NOT EXISTS</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1467">ISIS-1467</a> - [INCOMPLETE] Deprecate features/API which are either unused or for which there is a better replacemen</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1293">ISIS-1293</a> - [DUPLICATE] when in prototype mode, have a mechanism to temporarily hide the prototyping menus … eg for taking screenshots</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1034">ISIS-1034</a> - [WON’T FIX] Support bulk actions that return Blobs and Clobs</p> </li>
+ <li> <p><a href="https://issues.apache.org/jira/browse/ISIS-511">ISIS-511</a> - Provide the ability to plugin a dashboard for the Wicket viewer</p> </li>
+ </ul>
+ </div>
+ </div>
</div>
</div>
<div class="sect1">
@@ -930,7 +1094,7 @@ table.CodeRay td.code>pre{padding:0}
<p>Most applications written against v1.13.x should run against v1.14.0 with few if any changes. That said, we do recommend that you read and keep in mind the <a href="../migration-notes/migration-notes.html#_migration-notes_1.13.0-to-1.14.0">migration notes</a> when you upgrade your app.</p>
</div>
<div class="sect2">
- <h3 id="_new_feature">New Feature</h3>
+ <h3 id="_new_feature_2">New Feature</h3>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1529">ISIS-1529</a> - TableColumnOrderService, to allow column order to be fine-tuned (or columns suppressed)</p> </li>
@@ -940,7 +1104,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect2">
- <h3 id="_improvement">Improvement</h3>
+ <h3 id="_improvement_2">Improvement</h3>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1587">ISIS-1587</a> - Extend "explicitObjectType" checking to also take in view models.</p> </li>
@@ -958,7 +1122,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect2">
- <h3 id="_bug">Bug</h3>
+ <h3 id="_bug_2">Bug</h3>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1578">ISIS-1578</a> - Should throw a metamodel validation exception if a disable or hide method has any params.</p> </li>
@@ -976,7 +1140,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect2">
- <h3 id="_documentation">Documentation</h3>
+ <h3 id="_documentation_2">Documentation</h3>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1532">ISIS-1532</a> - Move DN OS cfg props to DN OS guide</p> </li>
@@ -984,7 +1148,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect2">
- <h3 id="_task">Task</h3>
+ <h3 id="_task_2">Task</h3>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1561">ISIS-1561</a> - Release 1.14.0</p> </li>
@@ -1010,7 +1174,7 @@ table.CodeRay td.code>pre{padding:0}
<p>Update for the simpleapp archetype only, which improves docker support as well as reducing amount of boilerplate by backing out some of the mixins. It also fixes an issue with the fixture scripts (noted in previous release).</p>
</div>
<div class="sect2">
- <h3 id="_improvement_2">Improvement</h3>
+ <h3 id="_improvement_3">Improvement</h3>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1559">ISIS-1559</a> - Remove the mixins from the simpleapp archetype - adds too much boilerplate</p> </li>
@@ -1019,7 +1183,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect2">
- <h3 id="_task_2">Task</h3>
+ <h3 id="_task_3">Task</h3>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1560">ISIS-1560</a> - Release 1.13.2.1 archetype</p> </li>
@@ -1048,7 +1212,7 @@ table.CodeRay td.code>pre{padding:0}
<p>This release also closes the ticket to provide a better DB migration story; this has been implemented by way of the (non-ASF) <a href="http://github.com/isisaddons/isis-module-flywaydb">Isis addons' flywaydb</a> module.</p>
</div>
<div class="sect2">
- <h3 id="_new_feature_2">New Feature</h3>
+ <h3 id="_new_feature_3">New Feature</h3>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1542">ISIS-1542</a> - Update simpleapp application/archetype to provide access to HSQL DB Manager (via their Swing UI) when running in-memory</p> </li>
@@ -1057,7 +1221,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect2">
- <h3 id="_improvement_3">Improvement</h3>
+ <h3 id="_improvement_4">Improvement</h3>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1554">ISIS-1554</a> - Prevent double click on buttons (which can cause applications to throw an error, eg concurrency exception)</p> </li>
@@ -1073,7 +1237,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect2">
- <h3 id="_bug_2">Bug</h3>
+ <h3 id="_bug_3">Bug</h3>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1545">ISIS-1545</a> - QueryResultsCache can sometimes result in throwing an exception if not properly initialized when fixtures being installed.</p> </li>
@@ -1085,7 +1249,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect2">
- <h3 id="_task_3">Task</h3>
+ <h3 id="_task_4">Task</h3>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1540">ISIS-1540</a> - Release tasks for 1.13.2</p> </li>
@@ -1114,7 +1278,7 @@ table.CodeRay td.code>pre{padding:0}
<p>This release also closes the ticket to provide a better DB migration story; this has been implemented by way of the (non-ASF) <a href="http://github.com/isisaddons/isis-module-flywaydb">Isis addons' flywaydb</a> module.</p>
</div>
<div class="sect2">
- <h3 id="_new_feature_3">New Feature</h3>
+ <h3 id="_new_feature_4">New Feature</h3>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1542">ISIS-1542</a> - Update simpleapp application/archetype to provide access to HSQL DB Manager (via their Swing UI) when running in-memory</p> </li>
@@ -1123,7 +1287,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect2">
- <h3 id="_improvement_4">Improvement</h3>
+ <h3 id="_improvement_5">Improvement</h3>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1554">ISIS-1554</a> - Prevent double click on buttons (which can cause applications to throw an error, eg concurrency exception)</p> </li>
@@ -1139,7 +1303,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect2">
- <h3 id="_bug_3">Bug</h3>
+ <h3 id="_bug_4">Bug</h3>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1545">ISIS-1545</a> - QueryResultsCache can sometimes result in throwing an exception if not properly initialized when fixtures being installed.</p> </li>
@@ -1151,7 +1315,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect2">
- <h3 id="_task_4">Task</h3>
+ <h3 id="_task_5">Task</h3>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1540">ISIS-1540</a> - Release tasks for 1.13.2</p> </li>
@@ -1177,7 +1341,7 @@ table.CodeRay td.code>pre{padding:0}
<p>This is a maintenance release with a number of minor improvements and bug fixes. It also provides better support for docker, by allowing configuration properties to be overridden using either system properties or an ISIS_OPT environment variable.</p>
</div>
<div class="sect2">
- <h3 id="_new_feature_4">New Feature</h3>
+ <h3 id="_new_feature_5">New Feature</h3>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1510">ISIS-1510</a> - Improve support for docker containers by allowing isis configuration properties to be overridden using either system properties or an ISIS_OPT environment variable</p> </li>
@@ -1185,7 +1349,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect2">
- <h3 id="_improvement_5">Improvement</h3>
+ <h3 id="_improvement_6">Improvement</h3>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1527">ISIS-1527</a> - Make overlays consistent for editable properties, with general fix for Firefox</p> </li>
@@ -1205,7 +1369,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect2">
- <h3 id="_bug_4">Bug</h3>
+ <h3 id="_bug_5">Bug</h3>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1525">ISIS-1525</a> - Problems with startup under certain circumstances</p> </li>
@@ -1263,7 +1427,7 @@ table.CodeRay td.code>pre{padding:0}
<p>Most applications written against v1.12.x should run against v1.13.0 with few if any changes. That said, this release has removed a small number of features that were dependent on internal APIs, and some configuration properties are now removed/unsupported. We therefore do recommend that you read and keep in mind the <a href="../migration-notes/migration-notes.html#_migration-notes_1.12.0-to-1.13.0">migration notes</a> when you upgrade your app.</p>
</div>
<div class="sect2">
- <h3 id="_new_feature_5">New Feature</h3>
+ <h3 id="_new_feature_6">New Feature</h3>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1446">ISIS-1446</a> - Extend the Wicket viewer client-side file-open-dialog to allow file extension to be specified.</p> </li>
@@ -1297,7 +1461,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect2">
- <h3 id="_improvement_6">Improvement</h3>
+ <h3 id="_improvement_7">Improvement</h3>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1464">ISIS-1464</a> - DomainChangeJdoAbstract#openTarget should support looking up view models</p> </li>
@@ -1354,7 +1518,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect2">
- <h3 id="_bug_5">Bug</h3>
+ <h3 id="_bug_6">Bug</h3>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1461">ISIS-1461</a> - More reliable fix to concurrency exception</p> </li>
@@ -1384,7 +1548,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect2">
- <h3 id="_task_5">Task</h3>
+ <h3 id="_task_6">Task</h3>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1335">ISIS-1335</a> - Release activities for v1.13.0</p> </li>
@@ -1410,7 +1574,7 @@ table.CodeRay td.code>pre{padding:0}
<p>Apache Isis 1.12.2 is a bug fix release for Apache Isis 1.12.0. It addresses two UI issues which result in the viewer showing invalid data with respect to the data actually stored in the database.</p>
</div>
<div class="sect2">
- <h3 id="_bug_6">Bug</h3>
+ <h3 id="_bug_7">Bug</h3>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1396">ISIS-1396</a> - Some elements on an entity page can be rendered against stale data.</p> </li>
@@ -1419,7 +1583,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect2">
- <h3 id="_task_6">Task</h3>
+ <h3 id="_task_7">Task</h3>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1424">ISIS-1424</a> - Release activities for v1.12.2</p> </li>
@@ -1445,7 +1609,7 @@ table.CodeRay td.code>pre{padding:0}
<p>Apache Isis 1.12.1 is a bug fix release for Apache Isis 1.12.0. The primary issue it addresses are spurious concurrency exceptions that can be thrown when editing an object. It also addresses a subtle issue where the new support in JAXB view models for auto-edit can cause some dirty objects not to be updated.</p>
</div>
<div class="sect2">
- <h3 id="_bug_7">Bug</h3>
+ <h3 id="_bug_8">Bug</h3>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1355">ISIS-1355</a> - concurrency exception after property edit when attempting to render…</p> </li>
@@ -1456,7 +1620,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect2">
- <h3 id="_task_7">Task</h3>
+ <h3 id="_task_8">Task</h3>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1362">ISIS-1362</a> - Release activities for v1.12.1</p> </li>
@@ -1491,7 +1655,7 @@ table.CodeRay td.code>pre{padding:0}
<p>The release also includes a number of new mixins, to automatically surface in the UI an entity’s id, version (if any), and to download the layout XML and rebuild the metamodel for a given domain entity. There is also a mixin to clear any UI hints (part of the file-based layouts functionality). In all cases these mixins can be hidden using either security or by writing a <a href="../guides/rgcms/rgcms.html#_rgcms_classes_super_AbstractSubscriber">subscriber</a> to veto the visibility of the corresponding domain event.</p>
</div>
<div class="sect2">
- <h3 id="_new_feature_6">New Feature</h3>
+ <h3 id="_new_feature_7">New Feature</h3>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1351">ISIS-1351</a> - Extend <a href="../guides/rgsvc/rgsvc.html#_rgsvc_core-domain-api_ConfigurationService"><code>ConfigurationService</code></a> to list all configuration properties in the UI</p> </li>
@@ -1505,7 +1669,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect2">
- <h3 id="_improvement_7">Improvement</h3>
+ <h3 id="_improvement_8">Improvement</h3>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1333">ISIS-1333</a> - Remove self-host profile from the archetype</p> </li>
@@ -1533,7 +1697,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect2">
- <h3 id="_bug_8">Bug</h3>
+ <h3 id="_bug_9">Bug</h3>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1348">ISIS-1348</a> - Bug with <a href="../guides/ugtst/ugtst.html#_ugtst_unit-test-support_soap-fake-server-junit-rule">SoapEndpointPublishingRule</a> when multiple endpoints.</p> </li>
@@ -1561,7 +1725,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect2">
- <h3 id="_dependency_upgrade">Dependency upgrade</h3>
+ <h3 id="_dependency_upgrade_2">Dependency upgrade</h3>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1288">ISIS-1288</a> - Update (minor) dependencies</p> </li>
@@ -1569,7 +1733,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect2">
- <h3 id="_task_8">Task</h3>
+ <h3 id="_task_9">Task</h3>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1287">ISIS-1287</a> - Release activities for v1.12.0</p> </li>
@@ -1598,7 +1762,7 @@ table.CodeRay td.code>pre{padding:0}
<p>Apache Isis is intended to be compatible with both Java 7 and Java 8. However, it was found that v1.11.0 used a number of Java 8 APIs. This release fixes this issue.</p>
</div>
<div class="sect2">
- <h3 id="_bug_9">Bug</h3>
+ <h3 id="_bug_10">Bug</h3>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1276">ISIS-1276</a> - Release activities for v1.11.1</p> </li>
@@ -1636,7 +1800,7 @@ table.CodeRay td.code>pre{padding:0}
<p>The release also includes improved control for domain events (these can now be suppressed if required) , and a new category of UI events (so that titles, icons and CSS classes can be provided by event bus subscribers).</p>
</div>
<div class="sect2">
- <h3 id="_new_feature_7">New Feature</h3>
+ <h3 id="_new_feature_8">New Feature</h3>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1279">ISIS-1279</a> - AcceptHeaderService for application-defined content negotiation.</p> </li>
@@ -1652,7 +1816,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect2">
- <h3 id="_improvement_8">Improvement</h3>
+ <h3 id="_improvement_9">Improvement</h3>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1275">ISIS-1275</a> - Configuration property for RO viewer to relax Accept header checking.</p> </li>
@@ -1678,7 +1842,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect2">
- <h3 id="_bug_10">Bug</h3>
+ <h3 id="_bug_11">Bug</h3>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1283">ISIS-1283</a> - SAFE_AND_CACHEABLE semantics caches incorrectly, works for domain services (stateless) but not for domain entities (where stateful target determines result)</p> </li>
@@ -1697,7 +1861,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect2">
- <h3 id="_task_9">Task</h3>
+ <h3 id="_task_10">Task</h3>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1243">ISIS-1243</a> - Release activities for v1.11.0</p> </li>
@@ -1726,7 +1890,7 @@ table.CodeRay td.code>pre{padding:0}
<p>Internally there have been substantial simplifications to the codebase.</p>
</div>
<div class="sect2">
- <h3 id="_new_feature_8">New Feature</h3>
+ <h3 id="_new_feature_9">New Feature</h3>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1215">ISIS-1215</a> - New MultipleExecutionStrategy for fixture scripts to use value semantics for determining whether to run a fixture script invoked more than once.</p> </li>
@@ -1740,7 +1904,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect2">
- <h3 id="_improvement_9">Improvement</h3>
+ <h3 id="_improvement_10">Improvement</h3>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1231">ISIS-1231</a> - Add jdeps to build as optional profile, to verify use of internal JDK jars.</p> </li>
@@ -1765,7 +1929,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect2">
- <h3 id="_bug_11">Bug</h3>
+ <h3 id="_bug_12">Bug</h3>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1229">ISIS-1229</a> - Calling nextRequest() in an integration test should clear any @RequestScoped services.</p> </li>
@@ -1784,7 +1948,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect2">
- <h3 id="_task_10">Task</h3>
+ <h3 id="_task_11">Task</h3>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1195">ISIS-1195</a> - Release activities for v1.10.0</p> </li>
@@ -1792,7 +1956,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect2">
- <h3 id="_dependency_upgrade_2">Dependency upgrade</h3>
+ <h3 id="_dependency_upgrade_3">Dependency upgrade</h3>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1061">ISIS-1061</a> - Upgrade Wicket to 6.19.0 (or rather, 6.20.0 when released since we found issues with 6.19.0).</p> </li>
@@ -1849,7 +2013,7 @@ table.CodeRay td.code>pre{padding:0}
<p>This release was also the first to include the updated Asciidoc website.</p>
</div>
<div class="sect2">
- <h3 id="_new_feature_9">New Feature</h3>
+ <h3 id="_new_feature_10">New Feature</h3>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1167">ISIS-1167</a> - NullPrintStream in unittestsupport to reduce the noise of unit tests that log to stdout or stderr</p> </li>
@@ -1874,7 +2038,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect2">
- <h3 id="_improvement_10">Improvement</h3>
+ <h3 id="_improvement_11">Improvement</h3>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1191">ISIS-1191</a> - Broken links</p> </li>
@@ -1931,7 +2095,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect2">
- <h3 id="_bug_12">Bug</h3>
+ <h3 id="_bug_13">Bug</h3>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1190">ISIS-1190</a> - If an referenced object cannot be loaded (not found in the database), then this should be handled gracefully</p> </li>
@@ -1963,7 +2127,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect2">
- <h3 id="_dependency_upgrade_3">Dependency upgrade</h3>
+ <h3 id="_dependency_upgrade_4">Dependency upgrade</h3>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1163">ISIS-1163</a> - Update Jetty (as used by our IsisWebServer launcher) to 9.x</p> </li>
@@ -1972,7 +2136,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect2">
- <h3 id="_task_11">Task</h3>
+ <h3 id="_task_12">Task</h3>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-1187">ISIS-1187</a> - Mothball the legacy (never documented) integration testing support</p> </li>
@@ -2009,7 +2173,7 @@ table.CodeRay td.code>pre{padding:0}
<p>Apache Isis 1.8.0 incorporates the Wicket viewer, which was previously a separately released component. Other components that are included in core (that were previously released separately are: the Restful Objects viewer, Shiro Security and the JDO/DataNucleus ObjectStore.</p>
</div>
<div class="sect2">
- <h3 id="_new_feature_10">New Feature</h3>
+ <h3 id="_new_feature_11">New Feature</h3>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-284">ISIS-284</a> - Maven plugin to validate domain object model w.r.t. Apache Isis programming conventions</p> </li>
@@ -2043,7 +2207,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect2">
- <h3 id="_improvement_11">Improvement</h3>
+ <h3 id="_improvement_12">Improvement</h3>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-568">ISIS-568</a> - Drop support for JDK 1.6, standardize on JDK 1.7.</p> </li>
@@ -2091,7 +2255,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect2">
- <h3 id="_bug_13">Bug</h3>
+ <h3 id="_bug_14">Bug</h3>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-853">ISIS-853</a> - joda DateTime properties loose time when persisted</p> </li>
@@ -2118,7 +2282,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect2">
- <h3 id="_task_12">Task</h3>
+ <h3 id="_task_13">Task</h3>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-928">ISIS-928</a> - Apache Isis 1.8.0 release tasks</p> </li>
@@ -2154,7 +2318,7 @@ table.CodeRay td.code>pre{padding:0}
<div class="sect2">
<h3 id="_core">Core</h3>
<div class="sect3">
- <h4 id="_new_feature_11">New Feature</h4>
+ <h4 id="_new_feature_12">New Feature</h4>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-809">ISIS-809</a> - Provide implementation of ViewModelFacet that doesn't require explicit implementation of the IViewModel interface.</p> </li>
@@ -2173,7 +2337,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect3">
- <h4 id="_improvement_12">Improvement</h4>
+ <h4 id="_improvement_13">Improvement</h4>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-864">ISIS-864</a> - Command should be persisted if any dirty objects enlisted into transaction, in order to ensure no accidental orphans.</p> </li>
@@ -2189,7 +2353,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect3">
- <h4 id="_bug_14">Bug</h4>
+ <h4 id="_bug_15">Bug</h4>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-404">ISIS-404</a> - Testing if a "wrapped" Domain Object has been persisted fails</p> </li>
@@ -2235,7 +2399,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect3">
- <h4 id="_task_13">Task</h4>
+ <h4 id="_task_14">Task</h4>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-872">ISIS-872</a> - 1.7.0 release activities</p> </li>
@@ -2246,7 +2410,7 @@ table.CodeRay td.code>pre{padding:0}
<div class="sect2">
<h3 id="_wicket_viewer">Wicket viewer</h3>
<div class="sect3">
- <h4 id="_new_feature_12">New Feature</h4>
+ <h4 id="_new_feature_13">New Feature</h4>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-902">ISIS-902</a> - Enhance ImageResourceCacheClassPath so that can have two entities with the same simple name but in different packages.</p> </li>
@@ -2267,7 +2431,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect3">
- <h4 id="_bug_15">Bug</h4>
+ <h4 id="_bug_16">Bug</h4>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-889">ISIS-889</a> - Action prompt dialog seems to be not quite big enough in Chrome (is ok in Firefox and IEv11)</p> </li>
@@ -2277,7 +2441,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect3">
- <h4 id="_dependency_upgrade_4">Dependency upgrade</h4>
+ <h4 id="_dependency_upgrade_5">Dependency upgrade</h4>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-794">ISIS-794</a> - Upgrade to Wicket 6.16.0, remove CharSequenceResource</p> </li>
@@ -2285,7 +2449,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect3">
- <h4 id="_task_14">Task</h4>
+ <h4 id="_task_15">Task</h4>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-872">ISIS-872</a> - 1.7.0 release activities</p> </li>
@@ -2314,7 +2478,7 @@ table.CodeRay td.code>pre{padding:0}
<p>Isis core 1.6.0 also incorporates the Restful Objects viewer, Shiro Security and JDO Objectstore.</p>
</div>
<div class="sect3">
- <h4 id="_new_feature_13">New Feature</h4>
+ <h4 id="_new_feature_14">New Feature</h4>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-493">ISIS-493</a> - Annotation to identify domain services/repositories</p> </li>
@@ -2324,7 +2488,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect3">
- <h4 id="_improvement_13">Improvement</h4>
+ <h4 id="_improvement_14">Improvement</h4>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-421">ISIS-421</a> - Write TCK tests for Restful Objects viewer</p> </li>
@@ -2340,7 +2504,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect3">
- <h4 id="_bug_16">Bug</h4>
+ <h4 id="_bug_17">Bug</h4>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-796">ISIS-796</a> - lifecycle callback "updating()" is not firing</p> </li>
@@ -2357,7 +2521,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect3">
- <h4 id="_dependency_upgrade_5">Dependency upgrade</h4>
+ <h4 id="_dependency_upgrade_6">Dependency upgrade</h4>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-716">ISIS-716</a> - Update to DN 3.3.8 (deferred)</p> </li>
@@ -2377,7 +2541,7 @@ table.CodeRay td.code>pre{padding:0}
<div class="sect2">
<h3 id="_wicket_viewer_2">Wicket Viewer</h3>
<div class="sect3">
- <h4 id="_new_feature_14">New Feature</h4>
+ <h4 id="_new_feature_15">New Feature</h4>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-800">ISIS-800</a> - like form for Wicket viewer</p> </li>
@@ -2387,7 +2551,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect3">
- <h4 id="_improvement_14">Improvement</h4>
+ <h4 id="_improvement_15">Improvement</h4>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-781">ISIS-781</a> - Add edit capability to view objects</p> </li>
@@ -2397,7 +2561,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect3">
- <h4 id="_bug_17">Bug</h4>
+ <h4 id="_bug_18">Bug</h4>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-544">ISIS-544</a> - focus on an action param date, then doesn’t show calendar picker..</p> </li>
@@ -2409,7 +2573,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect3">
- <h4 id="_task_15">Task</h4>
+ <h4 id="_task_16">Task</h4>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-839">ISIS-839</a> - 1.6.0 release tasks</p> </li>
@@ -2435,7 +2599,7 @@ table.CodeRay td.code>pre{padding:0}
<div class="sect2">
<h3 id="_core_3">Core</h3>
<div class="sect3">
- <h4 id="_new_feature_15">New Feature</h4>
+ <h4 id="_new_feature_16">New Feature</h4>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-550">ISIS-550</a> - Complete the guava EventBus support with new annotations</p> </li>
@@ -2445,7 +2609,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect3">
- <h4 id="_improvement_15">Improvement</h4>
+ <h4 id="_improvement_16">Improvement</h4>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-569">ISIS-569</a> - Fix JMock to support JDK7 (JavassistImposteriser)</p> </li>
@@ -2462,7 +2626,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect3">
- <h4 id="_bug_18">Bug</h4>
+ <h4 id="_bug_19">Bug</h4>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-758">ISIS-758</a> - Auditing should be able to cope with a change to a property where the referenced object has been deleted.</p> </li>
@@ -2474,7 +2638,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect3">
- <h4 id="_task_16">Task</h4>
+ <h4 id="_task_17">Task</h4>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-751">ISIS-751</a> - Update NOTICE copyright dates</p> </li>
@@ -2486,7 +2650,7 @@ table.CodeRay td.code>pre{padding:0}
<div class="sect2">
<h3 id="_wicket_viewer_3">Wicket Viewer</h3>
<div class="sect3">
- <h4 id="_improvement_16">Improvement</h4>
+ <h4 id="_improvement_17">Improvement</h4>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-719">ISIS-719</a> - Use org.webjars for some common dependencies (eg jquery)</p> </li>
@@ -2499,7 +2663,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect3">
- <h4 id="_bug_19">Bug</h4>
+ <h4 id="_bug_20">Bug</h4>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-431">ISIS-431</a> - A boolean atribute should never be mandatory</p> </li>
@@ -2511,7 +2675,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect3">
- <h4 id="_dependency_upgrade_6">Dependency upgrade</h4>
+ <h4 id="_dependency_upgrade_7">Dependency upgrade</h4>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-771">ISIS-771</a> - Upgrade Wicket to wicket 6.15.0 (or whatever is latest)</p> </li>
@@ -2519,7 +2683,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect3">
- <h4 id="_task_17">Task</h4>
+ <h4 id="_task_18">Task</h4>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-792">ISIS-792</a> - up tasks for Apache Isis 1.5.0 release</p> </li>
@@ -2530,7 +2694,7 @@ table.CodeRay td.code>pre{padding:0}
<div class="sect2">
<h3 id="_restfulobjects_viewer">RestfulObjects Viewer</h3>
<div class="sect3">
- <h4 id="_task_18">Task</h4>
+ <h4 id="_task_19">Task</h4>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-792">ISIS-792</a> - up tasks for Apache Isis 1.5.0 release</p> </li>
@@ -2538,7 +2702,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect3">
- <h4 id="_bug_20">Bug</h4>
+ <h4 id="_bug_21">Bug</h4>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-746">ISIS-746</a> - When multiple realms configured for Shiro, should be more intelligent about obtaining roles from those realms</p> </li>
@@ -2546,7 +2710,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect3">
- <h4 id="_task_19">Task</h4>
+ <h4 id="_task_20">Task</h4>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-751">ISIS-751</a> - Update NOTICE copyright dates</p> </li>
@@ -2558,7 +2722,7 @@ table.CodeRay td.code>pre{padding:0}
<div class="sect2">
<h3 id="_jdo_objectstore">JDO ObjectStore</h3>
<div class="sect3">
- <h4 id="_improvement_17">Improvement</h4>
+ <h4 id="_improvement_18">Improvement</h4>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-750">ISIS-750</a> - For consistency with CommandJdo, allow the serializedForm to be stored as a clob (rather than as a zipped byte array)</p> </li>
@@ -2568,7 +2732,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect3">
- <h4 id="_bug_21">Bug</h4>
+ <h4 id="_bug_22">Bug</h4>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-744">ISIS-744</a> - Column size can't be greater than 8000 characters on SQL Server</p> </li>
@@ -2577,7 +2741,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect3">
- <h4 id="_task_20">Task</h4>
+ <h4 id="_task_21">Task</h4>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-751">ISIS-751</a> - Update NOTICE copyright dates</p> </li>
@@ -2604,7 +2768,7 @@ table.CodeRay td.code>pre{padding:0}
<div class="sect2">
<h3 id="_wicket_viewer_4">Wicket Viewer</h3>
<div class="sect3">
- <h4 id="_improvement_18">Improvement</h4>
+ <h4 id="_improvement_19">Improvement</h4>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-732">ISIS-732</a> - The refresh of a standalone collection after invoking a bulk action should only be done if the original action was safe (query only)</p> </li>
@@ -2613,7 +2777,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect3">
- <h4 id="_bug_22">Bug</h4>
+ <h4 id="_bug_23">Bug</h4>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-731">ISIS-731</a> - execute the action fails</p> </li>
@@ -2624,7 +2788,7 @@ table.CodeRay td.code>pre{padding:0}
<div class="sect2">
<h3 id="_jdo_objectstore_2">JDO Objectstore</h3>
<div class="sect3">
- <h4 id="_bug_23">Bug</h4>
+ <h4 id="_bug_24">Bug</h4>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-733">ISIS-733</a> - If toggle an object twice in standalone list (for bulk action), ends up invoking action (when shouldn't) and also throwing concurrency exception</p> </li>
@@ -2650,7 +2814,7 @@ table.CodeRay td.code>pre{padding:0}
<div class="sect2">
<h3 id="_core_4">Core</h3>
<div class="sect3">
- <h4 id="_new_feature_16">New Feature</h4>
+ <h4 id="_new_feature_17">New Feature</h4>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-592">ISIS-592</a> - Make XmlSnapshot (in core.runtime) available as an applib service.</p> </li>
@@ -2689,7 +2853,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect3">
- <h4 id="_improvement_19">Improvement</h4>
+ <h4 id="_improvement_20">Improvement</h4>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-272">ISIS-272</a> - Adding ValueSemanticProviders for UUID and URI</p> </li>
@@ -2721,7 +2885,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect3">
- <h4 id="_bug_24">Bug</h4>
+ <h4 id="_bug_25">Bug</h4>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-234">ISIS-234</a> - Persistence by reachability of aggregated instances fails.</p> </li>
@@ -2738,7 +2902,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect3">
- <h4 id="_task_21">Task</h4>
+ <h4 id="_task_22">Task</h4>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-695">ISIS-695</a> - up tasks for Apache Isis 1.4.0 release</p> </li>
@@ -2749,7 +2913,7 @@ table.CodeRay td.code>pre{padding:0}
<div class="sect2">
<h3 id="_wicket_viewer_5">Wicket Viewer</h3>
<div class="sect3">
- <h4 id="_new_feature_17">New Feature</h4>
+ <h4 id="_new_feature_18">New Feature</h4>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-472">ISIS-472</a> - Limit number of bookmarks</p> </li>
@@ -2768,7 +2932,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect3">
- <h4 id="_improvement_20">Improvement</h4>
+ <h4 id="_improvement_21">Improvement</h4>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-486">ISIS-486</a> - Show action dialogs in a modal dialog rather than new page (less context switching for user)</p> </li>
@@ -2795,7 +2959,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect3">
- <h4 id="_bug_25">Bug</h4>
+ <h4 id="_bug_26">Bug</h4>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-429">ISIS-429</a> - coded dependency to WicketSignInPage in PageAbstract…</p> </li>
@@ -2816,7 +2980,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect3">
- <h4 id="_task_22">Task</h4>
+ <h4 id="_task_23">Task</h4>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-695">ISIS-695</a> - up tasks for Apache Isis 1.4.0 release</p> </li>
@@ -2827,7 +2991,7 @@ table.CodeRay td.code>pre{padding:0}
<div class="sect2">
<h3 id="_restfulobjects_viewer_2">RestfulObjects Viewer</h3>
<div class="sect3">
- <h4 id="_task_23">Task</h4>
+ <h4 id="_task_24">Task</h4>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-695">ISIS-695</a> - up tasks for Apache Isis 1.4.0 release</p> </li>
@@ -2838,7 +3002,7 @@ table.CodeRay td.code>pre{padding:0}
<div class="sect2">
<h3 id="_shiro_security">Shiro Security</h3>
<div class="sect3">
- <h4 id="_new_feature_18">New Feature</h4>
+ <h4 id="_new_feature_19">New Feature</h4>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-586">ISIS-586</a> - Allow the IsisLdapRealm to read its role/perm mappings from an .ini file</p> </li>
@@ -2847,7 +3011,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect3">
- <h4 id="_task_24">Task</h4>
+ <h4 id="_task_25">Task</h4>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-695">ISIS-695</a> - up tasks for Apache Isis 1.4.0 release</p> </li>
@@ -2858,7 +3022,7 @@ table.CodeRay td.code>pre{padding:0}
<div class="sect2">
<h3 id="_jdo_objectstore_3">JDO ObjectStore</h3>
<div class="sect3">
- <h4 id="_new_feature_19">New Feature</h4>
+ <h4 id="_new_feature_20">New Feature</h4>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-660">ISIS-660</a> - Profiling support and also infrastructure for background (async job) support</p> </li>
@@ -2874,7 +3038,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect3">
- <h4 id="_improvement_21">Improvement</h4>
+ <h4 id="_improvement_22">Improvement</h4>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-576">ISIS-576</a> - JDO exception recognizer for sql integrity constraints should only recognize uniqueness constraints</p> </li>
@@ -2898,7 +3062,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect3">
- <h4 id="_bug_26">Bug</h4>
+ <h4 id="_bug_27">Bug</h4>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-632">ISIS-632</a> - PublishingService's PublishedEvent id has an incorrect max length</p> </li>
@@ -2907,7 +3071,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect3">
- <h4 id="_dependency_upgrade_7">Dependency upgrade</h4>
+ <h4 id="_dependency_upgrade_8">Dependency upgrade</h4>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-646">ISIS-646</a> - Upgrade DataNucleus to 3.3.6 (JDO 3.1), and use the convenience 'accessplatform' POMs.</p> </li>
@@ -2915,7 +3079,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect3">
- <h4 id="_task_25">Task</h4>
+ <h4 id="_task_26">Task</h4>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-695">ISIS-695</a> - up tasks for Apache Isis 1.4.0 release</p> </li>
@@ -2941,7 +3105,7 @@ table.CodeRay td.code>pre{padding:0}
<div class="sect2">
<h3 id="_wicket_viewer_6">Wicket Viewer</h3>
<div class="sect3">
- <h4 id="_new_feature_20">New Feature</h4>
+ <h4 id="_new_feature_21">New Feature</h4>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-575">ISIS-575</a> - Tiny new feature… add a tooltip to icons/titles so can see what type it represents.</p> </li>
@@ -2949,7 +3113,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect3">
- <h4 id="_bug_27">Bug</h4>
+ <h4 id="_bug_28">Bug</h4>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-560">ISIS-560</a> - When invoking an action, drop downs get cleared (in the UI) if there is a validation error, but the underlying model is set.</p> </li>
@@ -2959,7 +3123,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect3">
- <h4 id="_task_26">Task</h4>
+ <h4 id="_task_27">Task</h4>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-581">ISIS-581</a> - Release tasks for Apache Isis wicket viewer v1.3.1</p> </li>
@@ -2985,7 +3149,7 @@ table.CodeRay td.code>pre{padding:0}
<div class="sect2">
<h3 id="_core_5">Core</h3>
<div class="sect3">
- <h4 id="_new_feature_21">New Feature</h4>
+ <h4 id="_new_feature_22">New Feature</h4>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-420">ISIS-420</a> - level settings service.</p> </li>
@@ -3018,7 +3182,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect3">
- <h4 id="_improvement_22">Improvement</h4>
+ <h4 id="_improvement_23">Improvement</h4>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-51">ISIS-51</a> - collections/guava or Apache collections)</p> </li>
@@ -3054,7 +3218,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect3">
- <h4 id="_bug_28">Bug</h4>
+ <h4 id="_bug_29">Bug</h4>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-236">ISIS-236</a> - Classes that are not referenced in the DOM aren't found by the specification loader</p> </li>
@@ -3074,7 +3238,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect3">
- <h4 id="_task_27">Task</h4>
+ <h4 id="_task_28">Task</h4>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-437">ISIS-437</a> - up tasks for Apache Isis 1.3.0 and associated components.</p> </li>
@@ -3085,7 +3249,7 @@ table.CodeRay td.code>pre{padding:0}
<div class="sect2">
<h3 id="_wicket_viewer_7">Wicket Viewer</h3>
<div class="sect3">
- <h4 id="_new_feature_22">New Feature</h4>
+ <h4 id="_new_feature_23">New Feature</h4>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-417">ISIS-417</a> - In wicket viewer, provide a 'select all' checkbox on table (for invoking bulk actions)</p> </li>
@@ -3110,7 +3274,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect3">
- <h4 id="_improvement_23">Improvement</h4>
+ <h4 id="_improvement_24">Improvement</h4>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-416">ISIS-416</a> - Make spinning icon image in Wicket pluggable</p> </li>
@@ -3135,7 +3299,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect3">
- <h4 id="_bug_29">Bug</h4>
+ <h4 id="_bug_30">Bug</h4>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-401">ISIS-401</a> - In wicket viewer, concurrency checking is currently disabled when invoke action on an entity.</p> </li>
@@ -3152,7 +3316,7 @@ table.CodeRay td.code>pre{padding:0}
<div class="sect2">
<h3 id="_restfulobjects_viewer_3">RestfulObjects Viewer</h3>
<div class="sect3">
- <h4 id="_new_feature_23">New Feature</h4>
+ <h4 id="_new_feature_24">New Feature</h4>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-553">ISIS-553</a> - Provide view model support, as sketched out in the Restful Objects spec</p> </li>
@@ -3160,7 +3324,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect3">
- <h4 id="_improvement_24">Improvement</h4>
+ <h4 id="_improvement_25">Improvement</h4>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-411">ISIS-411</a> - Enhance RO to allow EAGER rendering of properties (as well as collections)</p> </li>
@@ -3169,7 +3333,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect3">
- <h4 id="_bug_30">Bug</h4>
+ <h4 id="_bug_31">Bug</h4>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-318">ISIS-318</a> - Restful Objects viewer returning 500 instead of 400 when given bad input</p> </li>
@@ -3186,7 +3350,7 @@ table.CodeRay td.code>pre{padding:0}
<div class="sect2">
<h3 id="_shiro_security_2">Shiro Security</h3>
<div class="sect3">
- <h4 id="_improvement_25">Improvement</h4>
+ <h4 id="_improvement_26">Improvement</h4>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-362">ISIS-362</a> - Upgrade to JMock 2.6.0</p> </li>
@@ -3198,7 +3362,7 @@ table.CodeRay td.code>pre{padding:0}
<div class="sect2">
<h3 id="_jdo_objectstore_4">JDO ObjectStore</h3>
<div class="sect3">
- <h4 id="_new_feature_24">New Feature</h4>
+ <h4 id="_new_feature_25">New Feature</h4>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-322">ISIS-322</a> - Allow JDO objectstore to run on the Google App Engine</p> </li>
@@ -3212,7 +3376,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect3">
- <h4 id="_improvement_26">Improvement</h4>
+ <h4 id="_improvement_27">Improvement</h4>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-270">ISIS-270</a> - NotYetImplementedException in JDO objectstore when debug logging enabled</p> </li>
@@ -3228,7 +3392,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect3">
- <h4 id="_bug_31">Bug</h4>
+ <h4 id="_bug_32">Bug</h4>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-476">ISIS-476</a> - Update JDO/DN to allow for fact that invoking the Persisting callback may have resulted in the target object having already been updated.</p> </li>
@@ -3238,7 +3402,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect3">
- <h4 id="_dependency_upgrade_8">Dependency upgrade</h4>
+ <h4 id="_dependency_upgrade_9">Dependency upgrade</h4>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-477">ISIS-477</a> - Update JDO/DataNucleus objectstore to DN 3.2.6 and other latest dependencies</p> </li>
@@ -3247,7 +3411,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect3">
- <h4 id="_task_28">Task</h4>
+ <h4 id="_task_29">Task</h4>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-437">ISIS-437</a> - up tasks for Apache Isis 1.3.0 and associated components.</p> </li>
@@ -3273,7 +3437,7 @@ table.CodeRay td.code>pre{padding:0}
<div class="sect2">
<h3 id="_core_6">Core</h3>
<div class="sect3">
- <h4 id="_new_feature_25">New Feature</h4>
+ <h4 id="_new_feature_26">New Feature</h4>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-323">ISIS-323</a> - Provide the capability to publish events, either changed objects or invoked actions</p> </li>
@@ -3292,7 +3456,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect3">
- <h4 id="_improvement_27">Improvement</h4>
+ <h4 id="_improvement_28">Improvement</h4>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-208">ISIS-208</a> - If two services accidentally have the same Id, then should throw an exception.</p> </li>
@@ -3316,7 +3480,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect3">
- <h4 id="_bug_32">Bug</h4>
+ <h4 id="_bug_33">Bug</h4>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-359">ISIS-359</a> - arg…</p> </li>
@@ -3328,7 +3492,7 @@ table.CodeRay td.code>pre{padding:0}
<div class="sect2">
<h3 id="_wicket_viewer_8">Wicket Viewer</h3>
<div class="sect3">
- <h4 id="_new_feature_26">New Feature</h4>
+ <h4 id="_new_feature_27">New Feature</h4>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-328">ISIS-328</a> - Wicket viewer should shutdown Apache Isis core on completion</p> </li>
@@ -3343,7 +3507,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect3">
- <h4 id="_improvement_28">Improvement</h4>
+ <h4 id="_improvement_29">Improvement</h4>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-314">ISIS-314</a> - The wicket viewer should honour precision and scale when rendering BigDecimal values.</p> </li>
@@ -3371,7 +3535,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect3">
- <h4 id="_bug_33">Bug</h4>
+ <h4 id="_bug_34">Bug</h4>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-295">ISIS-295</a> - NullPointerException when view aggregated entity using Wicket viewer</p> </li>
@@ -3394,7 +3558,7 @@ table.CodeRay td.code>pre{padding:0}
<div class="sect2">
<h3 id="_restfulobjects_viewer_4">RestfulObjects Viewer</h3>
<div class="sect3">
- <h4 id="_new_feature_27">New Feature</h4>
+ <h4 id="_new_feature_28">New Feature</h4>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-323">ISIS-323</a> - Provide the capability to publish events, either changed objects or invoked actions</p> </li>
@@ -3403,7 +3567,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect3">
- <h4 id="_improvement_29">Improvement</h4>
+ <h4 id="_improvement_30">Improvement</h4>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-233">ISIS-233</a> - viewer up to RO spec 1.0.0</p> </li>
@@ -3431,7 +3595,7 @@ table.CodeRay td.code>pre{padding:0}
<div class="sect2">
<h3 id="_core_7">Core</h3>
<div class="sect3">
- <h4 id="_new_feature_28">New Feature</h4>
+ <h4 id="_new_feature_29">New Feature</h4>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-282">ISIS-282</a> - Add support for file uploads and downloads to Wicket viewer and JDO objectstore</p> </li>
@@ -3440,7 +3604,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect3">
- <h4 id="_improvement_30">Improvement</h4>
+ <h4 id="_improvement_31">Improvement</h4>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-305">ISIS-305</a> - compareTo methods (when implement Comparable) should be automatically hidden</p> </li>
@@ -3448,7 +3612,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect3">
- <h4 id="_bug_34">Bug</h4>
+ <h4 id="_bug_35">Bug</h4>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-207">ISIS-207</a> - Improve the message given when a field is too long (exceeds its @MaxLength value)</p> </li>
@@ -3460,7 +3624,7 @@ table.CodeRay td.code>pre{padding:0}
<div class="sect2">
<h3 id="_wicket_viewer_9">Wicket Viewer</h3>
<div class="sect3">
- <h4 id="_new_feature_29">New Feature</h4>
+ <h4 id="_new_feature_30">New Feature</h4>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-282">ISIS-282</a> - Add support for file uploads and downloads to Wicket viewer and JDO objectstore</p> </li>
@@ -3469,7 +3633,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect3">
- <h4 id="_improvement_31">Improvement</h4>
+ <h4 id="_improvement_32">Improvement</h4>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-308">ISIS-308</a> - Don't show (null) for a property or a parameter that has no reference (instead show an empty string)</p> </li>
@@ -3479,7 +3643,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect3">
- <h4 id="_bug_35">Bug</h4>
+ <h4 id="_bug_36">Bug</h4>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-300">ISIS-300</a> - The home page link in Wicket viewer goes to root context "/", rather than to the base of the webapp.</p> </li>
@@ -3490,7 +3654,7 @@ table.CodeRay td.code>pre{padding:0}
<div class="sect2">
<h3 id="_restfulobjects_viewer_5">RestfulObjects Viewer</h3>
<div class="sect3">
- <h4 id="_new_feature_30">New Feature</h4>
+ <h4 id="_new_feature_31">New Feature</h4>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-323">ISIS-323</a> - Provide the capability to publish events, either changed objects or invoked actions</p> </li>
@@ -3499,7 +3663,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect3">
- <h4 id="_improvement_32">Improvement</h4>
+ <h4 id="_improvement_33">Improvement</h4>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-233">ISIS-233</a> - viewer up to RO spec 1.0.0</p> </li>
@@ -3512,7 +3676,7 @@ table.CodeRay td.code>pre{padding:0}
<div class="sect2">
<h3 id="_shiro_security_3">Shiro Security</h3>
<div class="sect3">
- <h4 id="_new_feature_31">New Feature</h4>
+ <h4 id="_new_feature_32">New Feature</h4>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-307">ISIS-307</a> - Allow groups to be mapped to roles (eg AD groups to logically internal application roles)</p> </li>
@@ -3520,7 +3684,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect3">
- <h4 id="_improvement_33">Improvement</h4>
+ <h4 id="_improvement_34">Improvement</h4>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-298">ISIS-298</a> - Provide a shiro Realm implementation that supports looking up roles from an LDAP server.</p> </li>
@@ -3528,7 +3692,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect3">
- <h4 id="_bug_36">Bug</h4>
+ <h4 id="_bug_37">Bug</h4>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-306">ISIS-306</a> - Parsing permission strings should trim both before and after.</p> </li>
@@ -3539,7 +3703,7 @@ table.CodeRay td.code>pre{padding:0}
<div class="sect2">
<h3 id="_jdo_objectstore_5">JDO ObjectStore</h3>
<div class="sect3">
- <h4 id="_new_feature_32">New Feature</h4>
+ <h4 id="_new_feature_33">New Feature</h4>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-370">ISIS-370</a> - Provide a service to allow all @PersistenceCapable entities to be eagerly registered with Apache Isis (and therefore with DataNucleus)</p> </li>
@@ -3549,7 +3713,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect3">
- <h4 id="_improvement_34">Improvement</h4>
+ <h4 id="_improvement_35">Improvement</h4>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-270">ISIS-270</a> - NotYetImplementedException in JDO objectstore when debug logging enabled</p> </li>
@@ -3566,7 +3730,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect3">
- <h4 id="_bug_37">Bug</h4>
+ <h4 id="_bug_38">Bug</h4>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-296">ISIS-296</a> - wicket viewer display ??? ENTITYMODEL OBJECTADAPTER OID: NULL when view a root entity's collection member which data type is primitive String.</p> </li>
@@ -3595,7 +3759,7 @@ table.CodeRay td.code>pre{padding:0}
<div class="sect2">
<h3 id="_core_8">Core</h3>
<div class="sect3">
- <h4 id="_new_feature_33">New Feature</h4>
+ <h4 id="_new_feature_34">New Feature</h4>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-240">ISIS-240</a> - Provide a bookmark service in order to lookup any object</p> </li>
@@ -3607,7 +3771,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect3">
- <h4 id="_improvement_35">Improvement</h4>
+ <h4 id="_improvement_36">Improvement</h4>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-89">ISIS-89</a> - Finish off updating documentation post the first (pre 1.0) release of Apache Isis.</p> </li>
@@ -3642,7 +3806,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect3">
- <h4 id="_bug_38">Bug</h4>
+ <h4 id="_bug_39">Bug</h4>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-184">ISIS-184</a> - PasswordValueSemanticsProvider.doEncode threw exception when I provided a defaultXXX method</p> </li>
@@ -3656,7 +3820,7 @@ table.CodeRay td.code>pre{padding:0}
<div class="sect2">
<h3 id="_wicket_viewer_10">Wicket Viewer</h3>
<div class="sect3">
- <h4 id="_new_feature_34">New Feature</h4>
+ <h4 id="_new_feature_35">New Feature</h4>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-232">ISIS-232</a> - General improvements to the Wicket viewer</p> </li>
@@ -3666,7 +3830,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect3">
- <h4 id="_improvement_36">Improvement</h4>
+ <h4 id="_improvement_37">Improvement</h4>
<div class="ulist">
<ul>
<li> <p><a href="https://issues.apache.org/jira/browse/ISIS-239">ISIS-239</a> - Add support for MultiLine facet in Wicket viewer</p> </li>
@@ -3676,7 +3840,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</d
<TRUNCATED>
[03/10] isis-site git commit: ISIS-1521: docs
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/8b42f65e/content/guides/ugtst/ugtst.pdf
----------------------------------------------------------------------
diff --git a/content/guides/ugtst/ugtst.pdf b/content/guides/ugtst/ugtst.pdf
index fc9bdf6..b715b69 100644
--- a/content/guides/ugtst/ugtst.pdf
+++ b/content/guides/ugtst/ugtst.pdf
@@ -4,16 +4,16 @@
<< /Title (Testing)
/Creator (Asciidoctor PDF 1.5.0.alpha.11, based on Prawn 1.3.0)
/Producer (Asciidoctor PDF 1.5.0.alpha.11, based on Prawn 1.3.0)
-/CreationDate (D:20170801163943+01'00')
-/ModDate (D:20170801163943+01'00')
+/CreationDate (D:20170806194720+01'00')
+/ModDate (D:20170806194720+01'00')
>>
endobj
2 0 obj
<< /Type /Catalog
/Pages 3 0 R
/Names 14 0 R
-/Outlines 374 0 R
-/PageLabels 407 0 R
+/Outlines 393 0 R
+/PageLabels 428 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 51
-/Kids [7 0 R 10 0 R 12 0 R 34 0 R 45 0 R 51 0 R 56 0 R 64 0 R 71 0 R 79 0 R 84 0 R 90 0 R 99 0 R 105 0 R 108 0 R 118 0 R 122 0 R 127 0 R 130 0 R 138 0 R 143 0 R 147 0 R 149 0 R 153 0 R 158 0 R 169 0 R 174 0 R 179 0 R 182 0 R 192 0 R 206 0 R 212 0 R 220 0 R 224 0 R 236 0 R 238 0 R 243 0 R 250 0 R 255 0 R 259 0 R 264 0 R 269 0 R 273 0 R 276 0 R 278 0 R 280 0 R 285 0 R 292 0 R 299 0 R 304 0 R 309 0 R]
+/Count 53
+/Kids [7 0 R 10 0 R 12 0 R 34 0 R 45 0 R 51 0 R 56 0 R 64 0 R 71 0 R 79 0 R 84 0 R 90 0 R 99 0 R 105 0 R 108 0 R 118 0 R 122 0 R 127 0 R 130 0 R 138 0 R 145 0 R 148 0 R 154 0 R 156 0 R 164 0 R 176 0 R 181 0 R 187 0 R 192 0 R 196 0 R 203 0 R 207 0 R 221 0 R 227 0 R 235 0 R 239 0 R 251 0 R 253 0 R 258 0 R 265 0 R 270 0 R 274 0 R 279 0 R 284 0 R 288 0 R 291 0 R 293 0 R 295 0 R 300 0 R 307 0 R 314 0 R 319 0 R 324 0 R]
>>
endobj
4 0 obj
@@ -80,15 +80,15 @@ endobj
<< /Type /Font
/BaseFont /AAAADO+NotoSerif
/Subtype /TrueType
-/FontDescriptor 409 0 R
+/FontDescriptor 430 0 R
/FirstChar 32
/LastChar 255
-/Widths 411 0 R
-/ToUnicode 410 0 R
+/Widths 432 0 R
+/ToUnicode 431 0 R
>>
endobj
9 0 obj
-<< /Length 25996
+<< /Length 27695
>>
stream
q
@@ -893,7 +893,7 @@ ET
BT
60.24 400.7359999999997 Td
/F1.0 10.5 Tf
-[<342e332e205772> 20.01953125 <61707065722046> 40.0390625 <6163746f7279>] TJ
+[<342e332e204162737472> 20.01953125 <61637420636c617373>] TJ
ET
0.000 0.000 0.000 SCN
@@ -902,9 +902,9 @@ ET
0.200 0.200 0.200 SCN
BT
-170.51524999999992 400.7359999999997 Td
+149.13724999999994 400.7359999999997 Td
/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -922,7 +922,7 @@ ET
BT
535.3009999999999 400.7359999999997 Td
/F1.0 10.5 Tf
-<3233> Tj
+<3232> Tj
ET
0.000 0.000 0.000 SCN
@@ -933,7 +933,7 @@ ET
BT
60.24 382.2559999999997 Td
/F1.0 10.5 Tf
-[<342e342e204d6176656e20436f6e6669677572> 20.01953125 <6174696f6e>] TJ
+[<342e342e20436f6e6669677572> 20.01953125 <6174696f6e2050726f70657274696573>] TJ
ET
0.000 0.000 0.000 SCN
@@ -942,9 +942,9 @@ ET
0.200 0.200 0.200 SCN
BT
-191.89324999999997 382.2559999999997 Td
+207.92674999999997 382.2559999999997 Td
/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -962,7 +962,7 @@ ET
BT
535.3009999999999 382.2559999999997 Td
/F1.0 10.5 Tf
-<3237> Tj
+<3233> Tj
ET
0.000 0.000 0.000 SCN
@@ -971,9 +971,9 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24 363.77599999999967 Td
+60.24 363.77599999999967 Td
/F1.0 10.5 Tf
-<352e20424444205370656320537570706f7274> Tj
+[<342e352e205772> 20.01953125 <61707065722046> 40.0390625 <6163746f7279>] TJ
ET
0.000 0.000 0.000 SCN
@@ -982,9 +982,9 @@ ET
0.200 0.200 0.200 SCN
BT
-154.48174999999992 363.77599999999967 Td
+170.51524999999992 363.77599999999967 Td
/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -1002,7 +1002,7 @@ ET
BT
535.3009999999999 363.77599999999967 Td
/F1.0 10.5 Tf
-<3238> Tj
+<3234> Tj
ET
0.000 0.000 0.000 SCN
@@ -1013,7 +1013,7 @@ ET
BT
60.24 345.29599999999965 Td
/F1.0 10.5 Tf
-<352e312e20486f7720697420776f726b73> Tj
+[<342e362e204d6176656e20436f6e6669677572> 20.01953125 <6174696f6e>] TJ
ET
0.000 0.000 0.000 SCN
@@ -1022,9 +1022,9 @@ ET
0.200 0.200 0.200 SCN
BT
-149.13724999999994 345.29599999999965 Td
+191.89324999999997 345.29599999999965 Td
/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -1051,9 +1051,9 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 326.81599999999963 Td
+48.24 326.81599999999963 Td
/F1.0 10.5 Tf
-[<352e322e204b> 20.01953125 <657920636c6173736573>] TJ
+<352e20424444205370656320537570706f7274> Tj
ET
0.000 0.000 0.000 SCN
@@ -1062,9 +1062,9 @@ ET
0.200 0.200 0.200 SCN
BT
-138.44824999999992 326.81599999999963 Td
+154.48174999999992 326.81599999999963 Td
/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -1082,7 +1082,7 @@ ET
BT
535.3009999999999 326.81599999999963 Td
/F1.0 10.5 Tf
-<3238> Tj
+<3330> Tj
ET
0.000 0.000 0.000 SCN
@@ -1093,7 +1093,7 @@ ET
BT
60.24 308.3359999999996 Td
/F1.0 10.5 Tf
-<352e332e2057726974696e672061204244442073706563> Tj
+<352e312e20486f7720697420776f726b73> Tj
ET
0.000 0.000 0.000 SCN
@@ -1102,9 +1102,9 @@ ET
0.200 0.200 0.200 SCN
BT
-181.20424999999994 308.3359999999996 Td
+149.13724999999994 308.3359999999996 Td
/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -1122,7 +1122,7 @@ ET
BT
535.3009999999999 308.3359999999996 Td
/F1.0 10.5 Tf
-<3239> Tj
+<3330> Tj
ET
0.000 0.000 0.000 SCN
@@ -1133,7 +1133,7 @@ ET
BT
60.24 289.8559999999996 Td
/F1.0 10.5 Tf
-[<352e342e204244442054> 29.78515625 <6f6f6c696e67>] TJ
+[<352e322e204b> 20.01953125 <657920636c6173736573>] TJ
ET
0.000 0.000 0.000 SCN
@@ -1142,9 +1142,9 @@ ET
0.200 0.200 0.200 SCN
BT
-143.79274999999996 289.8559999999996 Td
+138.44824999999992 289.8559999999996 Td
/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -1162,7 +1162,7 @@ ET
BT
535.3009999999999 289.8559999999996 Td
/F1.0 10.5 Tf
-<3332> Tj
+<3330> Tj
ET
0.000 0.000 0.000 SCN
@@ -1173,7 +1173,7 @@ ET
BT
60.24 271.3759999999996 Td
/F1.0 10.5 Tf
-[<352e352e204d6176656e20436f6e6669677572> 20.01953125 <6174696f6e>] TJ
+<352e332e2057726974696e672061204244442073706563> Tj
ET
0.000 0.000 0.000 SCN
@@ -1182,9 +1182,9 @@ ET
0.200 0.200 0.200 SCN
BT
-191.89324999999997 271.3759999999996 Td
+181.20424999999994 271.3759999999996 Td
/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -1202,7 +1202,7 @@ ET
BT
535.3009999999999 271.3759999999996 Td
/F1.0 10.5 Tf
-<3332> Tj
+<3331> Tj
ET
0.000 0.000 0.000 SCN
@@ -1211,9 +1211,9 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24 252.89599999999956 Td
+60.24 252.89599999999956 Td
/F1.0 10.5 Tf
-<362e20466978747572652053637269707473> Tj
+[<352e342e204244442054> 29.78515625 <6f6f6c696e67>] TJ
ET
0.000 0.000 0.000 SCN
@@ -1222,9 +1222,9 @@ ET
0.200 0.200 0.200 SCN
BT
-138.44824999999992 252.89599999999956 Td
+143.79274999999996 252.89599999999956 Td
/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -1253,7 +1253,7 @@ ET
BT
60.24 234.41599999999957 Td
/F1.0 10.5 Tf
-<362e312e2041504920616e64205573616765> Tj
+[<352e352e204d6176656e20436f6e6669677572> 20.01953125 <6174696f6e>] TJ
ET
0.000 0.000 0.000 SCN
@@ -1262,9 +1262,9 @@ ET
0.200 0.200 0.200 SCN
BT
-154.48174999999992 234.41599999999957 Td
+191.89324999999997 234.41599999999957 Td
/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -1282,7 +1282,18 @@ ET
BT
535.3009999999999 234.41599999999957 Td
/F1.0 10.5 Tf
-<3335> Tj
+<3334> 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 215.93599999999958 Td
+/F1.0 10.5 Tf
+<362e20466978747572652053637269707473> Tj
ET
0.000 0.000 0.000 SCN
@@ -1291,7 +1302,76 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 215.93599999999958 Td
+138.44824999999992 215.93599999999958 Td
+/F1.0 10.5 Tf
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+
+BT
+533.94125 215.93599999999958 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 215.93599999999958 Td
+/F1.0 10.5 Tf
+<3336> 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 197.4559999999996 Td
+/F1.0 10.5 Tf
+<362e312e2041504920616e64205573616765> 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
+154.48174999999992 197.4559999999996 Td
+/F1.0 10.5 Tf
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+
+BT
+533.94125 197.4559999999996 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 197.4559999999996 Td
+/F1.0 10.5 Tf
+<3337> 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 178.9759999999996 Td
/F1.0 10.5 Tf
<362e322e20> Tj
ET
@@ -1302,7 +1382,7 @@ ET
0.694 0.129 0.275 SCN
BT
-79.9485 215.93599999999958 Td
+79.9485 178.9759999999996 Td
/F6.0 10.5 Tf
<5375646f53657276696365> Tj
ET
@@ -1313,7 +1393,7 @@ ET
0.200 0.200 0.200 SCN
BT
-138.44824999999992 215.93599999999958 Td
+138.44824999999992 178.9759999999996 Td
/F1.0 10.5 Tf
<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
@@ -1322,7 +1402,7 @@ ET
0.000 0.000 0.000 scn
BT
-533.94125 215.93599999999958 Td
+533.94125 178.9759999999996 Td
/F1.0 5.25 Tf
<ca> Tj
ET
@@ -1331,9 +1411,9 @@ ET
0.200 0.200 0.200 SCN
BT
-535.3009999999999 215.93599999999958 Td
+535.3009999999999 178.9759999999996 Td
/F1.0 10.5 Tf
-<3438> Tj
+<3530> Tj
ET
0.000 0.000 0.000 SCN
@@ -1353,7 +1433,7 @@ endobj
/F6.0 43 0 R
>>
>>
-/Annots [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 330 0 R 331 0 R 332 0 R 333 0 R 334 0 R 335 0 R 336 0 R 337 0 R 338 0 R 339 0 R 340 0 R 341 0 R 342 0 R 343 0 R 344 0 R 345 0 R 346 0 R 347 0 R 348 0 R 349 0 R 350 0 R 351 0 R 352 0 R 353 0 R 354 0 R 355 0 R 356 0 R 357 0 R 358 0 R 359 0 R 360 0 R 361 0 R 362 0 R 363 0 R 364 0 R 365 0 R 366 0 R 367 0 R 368 0 R 369 0 R 370 0 R 371 0 R 372 0 R]
+/Annots [325 0 R 326 0 R 327 0 R 328 0 R 329 0 R 330 0 R 331 0 R 332 0 R 333 0 R 334 0 R 335 0 R 336 0 R 337 0 R 338 0 R 339 0 R 340 0 R 341 0 R 342 0 R 343 0 R 344 0 R 345 0 R 346 0 R 347 0 R 348 0 R 349 0 R 350 0 R 351 0 R 352 0 R 353 0 R 354 0 R 355 0 R 356 0 R 357 0 R 358 0 R 359 0 R 360 0 R 361 0 R 362 0 R 363 0 R 364 0 R 365 0 R 366 0 R 367 0 R 368 0 R 369 0 R 370 0 R 371 0 R 372 0 R 373 0 R 374 0 R 375 0 R 376 0 R 377 0 R 378 0 R 379 0 R 380 0 R 381 0 R 382 0 R 383 0 R 384 0 R 385 0 R 386 0 R 387 0 R 388 0 R 389 0 R 390 0 R 391 0 R]
>>
endobj
11 0 obj
@@ -1986,7 +2066,7 @@ endobj
/Font << /F2.0 16 0 R
/F1.0 8 0 R
>>
-/XObject << /Stamp1 373 0 R
+/XObject << /Stamp1 392 0 R
>>
>>
/Annots [18 0 R 19 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]
@@ -2001,18 +2081,18 @@ endobj
>>
endobj
15 0 obj
-<< /Kids [110 0 R 184 0 R 111 0 R]
+<< /Kids [110 0 R 171 0 R 111 0 R]
>>
endobj
16 0 obj
<< /Type /Font
/BaseFont /AAAADP+NotoSerif-Bold
/Subtype /TrueType
-/FontDescriptor 413 0 R
+/FontDescriptor 434 0 R
/FirstChar 32
/LastChar 255
-/Widths 415 0 R
-/ToUnicode 414 0 R
+/Widths 436 0 R
+/ToUnicode 435 0 R
>>
endobj
17 0 obj
@@ -2823,7 +2903,7 @@ endobj
/F5.0 40 0 R
/F6.0 43 0 R
>>
-/XObject << /Stamp1 373 0 R
+/XObject << /Stamp1 392 0 R
>>
>>
/Annots [41 0 R]
@@ -2839,22 +2919,22 @@ endobj
<< /Type /Font
/BaseFont /AAAADQ+FontAwesome
/Subtype /TrueType
-/FontDescriptor 417 0 R
+/FontDescriptor 438 0 R
/FirstChar 32
/LastChar 255
-/Widths 419 0 R
-/ToUnicode 418 0 R
+/Widths 440 0 R
+/ToUnicode 439 0 R
>>
endobj
38 0 obj
<< /Type /Font
/BaseFont /AAAADR+NotoSerif-BoldItalic
/Subtype /TrueType
-/FontDescriptor 421 0 R
+/FontDescriptor 442 0 R
/FirstChar 32
/LastChar 255
-/Widths 423 0 R
-/ToUnicode 422 0 R
+/Widths 444 0 R
+/ToUnicode 443 0 R
>>
endobj
39 0 obj
@@ -2864,11 +2944,11 @@ endobj
<< /Type /Font
/BaseFont /AAAADS+NotoSerif-Italic
/Subtype /TrueType
-/FontDescriptor 425 0 R
+/FontDescriptor 446 0 R
/FirstChar 32
/LastChar 255
-/Widths 427 0 R
-/ToUnicode 426 0 R
+/Widths 448 0 R
+/ToUnicode 447 0 R
>>
endobj
41 0 obj
@@ -2889,11 +2969,11 @@ endobj
<< /Type /Font
/BaseFont /AAAADT+mplus1mn-regular
/Subtype /TrueType
-/FontDescriptor 429 0 R
+/FontDescriptor 450 0 R
/FirstChar 32
/LastChar 255
-/Widths 431 0 R
-/ToUnicode 430 0 R
+/Widths 452 0 R
+/ToUnicode 451 0 R
>>
endobj
44 0 obj
@@ -3496,7 +3576,7 @@ endobj
/F2.0 16 0 R
>>
/XObject << /I1 48 0 R
-/Stamp1 373 0 R
+/Stamp1 392 0 R
>>
>>
/Annots [46 0 R 47 0 R]
@@ -4601,7 +4681,7 @@ endobj
/F3.1 37 0 R
/F2.0 16 0 R
>>
-/XObject << /Stamp1 373 0 R
+/XObject << /Stamp1 392 0 R
>>
>>
/Annots [54 0 R]
@@ -5159,7 +5239,7 @@ endobj
/F2.0 16 0 R
/F3.1 37 0 R
>>
-/XObject << /Stamp1 373 0 R
+/XObject << /Stamp1 392 0 R
>>
>>
/Annots [58 0 R 60 0 R 61 0 R 62 0 R]
@@ -6778,7 +6858,7 @@ endobj
/F1.0 8 0 R
/F6.0 43 0 R
>>
-/XObject << /Stamp1 373 0 R
+/XObject << /Stamp1 392 0 R
>>
>>
/Annots [67 0 R 69 0 R]
@@ -8864,7 +8944,7 @@ endobj
/F2.0 16 0 R
/F3.1 37 0 R
>>
-/XObject << /Stamp1 373 0 R
+/XObject << /Stamp1 392 0 R
>>
>>
/Annots [73 0 R 74 0 R 75 0 R 76 0 R 77 0 R]
@@ -10495,7 +10575,7 @@ endobj
/F7.0 82 0 R
/F3.1 37 0 R
>>
-/XObject << /Stamp1 373 0 R
+/XObject << /Stamp1 392 0 R
>>
>>
/Annots [80 0 R]
@@ -10519,11 +10599,11 @@ endobj
<< /Type /Font
/BaseFont /AAAADU+mplus-1p-regular
/Subtype /TrueType
-/FontDescriptor 433 0 R
+/FontDescriptor 454 0 R
/FirstChar 32
/LastChar 255
-/Widths 435 0 R
-/ToUnicode 434 0 R
+/Widths 456 0 R
+/ToUnicode 455 0 R
>>
endobj
83 0 obj
@@ -12022,7 +12102,7 @@ endobj
/F1.0 8 0 R
/F6.0 43 0 R
>>
-/XObject << /Stamp1 373 0 R
+/XObject << /Stamp1 392 0 R
>>
>>
/Annots [86 0 R 88 0 R]
@@ -13637,7 +13717,7 @@ endobj
/F6.0 43 0 R
/F7.0 82 0 R
>>
-/XObject << /Stamp1 373 0 R
+/XObject << /Stamp1 392 0 R
>>
>>
/Annots [91 0 R 92 0 R 93 0 R 94 0 R 95 0 R 96 0 R 97 0 R]
@@ -14223,7 +14303,7 @@ endobj
/F6.0 43 0 R
/F3.1 37 0 R
>>
-/XObject << /Stamp1 373 0 R
+/XObject << /Stamp1 392 0 R
>>
>>
/Annots [101 0 R 102 0 R]
@@ -17726,7 +17806,7 @@ endobj
/F6.1 106 0 R
/F1.0 8 0 R
>>
-/XObject << /Stamp1 373 0 R
+/XObject << /Stamp1 392 0 R
>>
>>
>>
@@ -17735,11 +17815,11 @@ endobj
<< /Type /Font
/BaseFont /AAAADV+mplus1mn-regular
/Subtype /TrueType
-/FontDescriptor 437 0 R
+/FontDescriptor 458 0 R
/FirstChar 32
/LastChar 255
-/Widths 439 0 R
-/ToUnicode 438 0 R
+/Widths 460 0 R
+/ToUnicode 459 0 R
>>
endobj
107 0 obj
@@ -19147,7 +19227,7 @@ endobj
/F2.0 16 0 R
/F3.1 37 0 R
>>
-/XObject << /Stamp1 373 0 R
+/XObject << /Stamp1 392 0 R
>>
>>
/Annots [113 0 R 114 0 R 115 0 R 116 0 R]
@@ -19157,13 +19237,13 @@ endobj
[108 0 R /XYZ 0 455.51 null]
endobj
110 0 obj
-<< /Limits [(1-13-0-improved-intent) (_ugtst_integ-test-support_wrapper-factory)]
-/Names [(1-13-0-improved-intent) 140 0 R (1-8-0-and-earlier) 145 0 R (1-9-0-code-appmanifest-code) 141 0 R (__ugtst) 13 0 R (__ugtst_fixture-scripts_api-and-usage_organizing) 286 0 R (__ugtst_integ-test-support_bootstrapping_IntegrationTestAbstract) 156 0 R (_ugtst_bdd-spec-support) 193 0 R (_ugtst_bdd-spec-support_bdd-tooling) 228 0 R (_ugtst_bdd-spec-support_how-it-works) 197 0 R (_ugtst_bdd-spec-support_key-classes) 202 0 R (_ugtst_bdd-spec-support_maven-configuration) 233 0 R (_ugtst_bdd-spec-support_writing-a-bdd-spec) 210 0 R (_ugtst_fixture-scripts) 239 0 R (_ugtst_fixture-scripts_api-and-usage) 244 0 R (_ugtst_fixture-scripts_sudo-service) 306 0 R (_ugtst_integ-test-support) 123 0 R (_ugtst_integ-test-support_bootstrapping) 134 0 R (_ugtst_integ-test-support_maven-configuration) 183 0 R (_ugtst_integ-test-support_typical-usage) 124 0 R (_ugtst_integ-test-support_wrapper-factory) 164 0 R]
+<< /Limits [(1-13-0) (_ugtst_integ-test-support_bootstrapping)]
+/Names [(1-13-0) 143 0 R (1-15-0-snapshot) 136 0 R (1-8-0-and-earlier) 152 0 R (1-9-0) 149 0 R (__ugtst) 13 0 R (__ugtst_fixture-scripts_api-and-usage_organizing) 301 0 R (__ugtst_integ-test-support_abstract-class_IntegrationTestAbstract) 170 0 R (__ugtst_integ-test-support_abstract-class_IntegrationTestAbstract2) 159 0 R (_ugtst_bdd-spec-support) 208 0 R (_ugtst_bdd-spec-support_bdd-tooling) 243 0 R (_ugtst_bdd-spec-support_how-it-works) 212 0 R (_ugtst_bdd-spec-support_key-classes) 217 0 R (_ugtst_bdd-spec-support_maven-configuration) 248 0 R (_ugtst_bdd-spec-support_writing-a-bdd-spec) 225 0 R (_ugtst_fixture-scripts) 254 0 R (_ugtst_fixture-scripts_api-and-usage) 259 0 R (_ugtst_fixture-scripts_sudo-service) 321 0 R (_ugtst_integ-test-support) 123 0 R (_ugtst_integ-test-support_abstract-class) 157 0 R (_ugtst_integ-test-support_bootstrapping) 134 0 R]
>>
endobj
111 0 obj
<< /Limits [(fake-data) (xml-marshalling-support)]
-/Names [(fake-data) 57 0 R (feature-toggles) 59 0 R (firing-domain-events) 177 0 R (fixture-management) 53 0 R (further-approaches) 302 0 R (given-when-then) 52 0 R (injected-services-method) 81 0 R (integ-tests-vs-bdd-specs) 39 0 R (isisconfigurationforjdointegtests) 150 0 R (other-guides) 17 0 R (simulated-ui-code-wrapperfactory-code) 42 0 R (system-initializer) 139 0 R (unit-tests-vs-integ-tests) 36 0 R (using-the-wrapper) 175 0 R (using-within-tests) 282 0 R (value-objects) 85 0 R (wrapping-and-unwrapping) 171 0 R (xml-marshalling-support) 109 0 R]
+/Names [(fake-data) 57 0 R (feature-toggles) 59 0 R (firing-domain-events) 193 0 R (fixture-management) 53 0 R (further-approaches) 317 0 R (given-when-then) 52 0 R (injected-services-method) 81 0 R (integ-tests-vs-bdd-specs) 39 0 R (other-guides) 17 0 R (simulated-ui-code-wrapperfactory-code) 42 0 R (unit-tests-vs-integ-tests) 36 0 R (using-the-wrapper) 189 0 R (using-within-tests) 297 0 R (value-objects) 85 0 R (wrapping-and-unwrapping) 185 0 R (xml-marshalling-support) 109 0 R]
>>
endobj
112 0 obj
@@ -20078,7 +20158,7 @@ endobj
/F6.0 43 0 R
/F3.1 37 0 R
>>
-/XObject << /Stamp1 373 0 R
+/XObject << /Stamp1 392 0 R
>>
>>
/Annots [119 0 R 120 0 R]
@@ -22071,7 +22151,7 @@ endobj
/F1.0 8 0 R
/F6.0 43 0 R
>>
-/XObject << /Stamp1 373 0 R
+/XObject << /Stamp1 392 0 R
>>
>>
/Annots [125 0 R]
@@ -24913,7 +24993,7 @@ endobj
/F6.1 106 0 R
/F1.0 8 0 R
>>
-/XObject << /Stamp1 373 0 R
+/XObject << /Stamp1 392 0 R
>>
>>
/Annots [128 0 R]
@@ -24931,7 +25011,7 @@ endobj
>>
endobj
129 0 obj
-<< /Length 25362
+<< /Length 26040
>>
stream
q
@@ -26471,47 +26551,25 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-BT
-48.239999999999995 163.086 Td
-/F1.0 10.5 Tf
-[<4e657665727468656c6573732c20776520646f206e65656420746f20626f6f74737472> 20.01953125 <6170207468652072756e74696d6520666f7220746865207665727920666972737420746573742e>] 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
-
-2.128 Tw
+0.229 Tw
BT
-48.239999999999995 135.306 Td
+48.239999999999995 163.086 Td
/F1.0 10.5 Tf
-[<4173206f6620312e392e302074686520626f6f74737472> 20.01953125 <617070696e67206f6620696e74656772> 20.01953125 <6174696f6e20746573747320616e64207765626170707320686173206265656e2073696d706c6966696564207468726f75676820746865>] TJ
+[<4e657765722072656c6561736573206f6620746865206672> 20.01953125 <616d65776f726b207265647563652074686520616d6f756e74206f6620626f696c6572706c61746520746f20646f20746869733b207468697320677569646520646f63756d656e7473>] TJ
ET
0.000 Tw
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.694 0.129 0.275 scn
-0.694 0.129 0.275 SCN
-
-BT
-48.239999999999995 119.52600000000001 Td
-/F6.0 10.5 Tf
-<4170704d616e6966657374> 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
-105.99000000000001 119.52600000000001 Td
+48.239999999999995 147.306 Td
/F1.0 10.5 Tf
-[<20636c6173732e2053696e636520746869732069736ed574206d616e6461746f7279> 89.84375 <2c20666f72206e6f772077652070726573656e7420626f746820746563686e69717565732e>] TJ
+<6d756c7469706c652076657273696f6e732e> Tj
ET
0.000 0.000 0.000 SCN
@@ -26520,7 +26578,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.239999999999995 91.74600000000001 Td
+48.239999999999995 119.52600000000001 Td
/F1.0 10.5 Tf
[<546865206578616d706c6520636f646520696e20746869732073656374696f6e2069732074616b> 20.01953125 <656e2066726f6d20746865206170702067656e6572> 20.01953125 <617465642062> 20.01953125 <792074686520>] TJ
ET
@@ -26531,7 +26589,7 @@ ET
0.259 0.545 0.792 SCN
BT
-408.746384765625 91.74600000000001 Td
+408.746384765625 119.52600000000001 Td
/F1.0 10.5 Tf
<53696d706c6541707020617263686574797065> Tj
ET
@@ -26542,126 +26600,20 @@ ET
0.200 0.200 0.200 SCN
BT
-515.972384765625 91.74600000000001 Td
+515.972384765625 119.52600000000001 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
-1 w
-0 J
-0 j
-[ ] 0 d
-/Stamp1 Do
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-BT
-535.978 14.388 Td
-/F1.0 9 Tf
-<3137> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-Q
-Q
-
-endstream
-endobj
-130 0 obj
-<< /Type /Page
-/Parent 3 0 R
-/MediaBox [0 0 595.28 841.89]
-/Contents 129 0 R
-/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F6.1 106 0 R
-/F1.0 8 0 R
-/F6.0 43 0 R
-/F2.0 16 0 R
->>
-/XObject << /Stamp1 373 0 R
->>
->>
-/Annots [131 0 R 132 0 R 133 0 R 135 0 R 136 0 R]
->>
-endobj
-131 0 obj
-<< /Border [0 0 0]
-/A << /Type /Action
-/S /URI
-/URI (http://github.com/isisaddons/isis-app-todoapp)
->>
-/Subtype /Link
-/Rect [83.499 790.8599999999999 124.52250000000001 805.14]
-/Type /Annot
->>
-endobj
-132 0 obj
-<< /Border [0 0 0]
-/A << /Type /Action
-/S /URI
-/URI (http://joel-costigliola.github.io/assertj)
->>
-/Subtype /Link
-/Rect [151.707 790.8599999999999 186.57750000000001 805.14]
-/Type /Annot
->>
-endobj
-133 0 obj
-<< /Border [0 0 0]
-/A << /Type /Action
-/S /URI
-/URI (http://junit.org/junit4/javadoc/latest/org/junit/rules/ExpectedException.html)
->>
-/Subtype /Link
-/Rect [194.01299183238638 521.3000000000001 246.62923774857956 535.58]
-/Type /Annot
->>
-endobj
-134 0 obj
-[130 0 R /XYZ 0 274.47 null]
-endobj
-135 0 obj
-<< /Border [0 0 0]
-/A << /Type /Action
-/S /URI
-/URI (../rgcms/rgcms.pdf#_rgcms_classes_AppManifest-bootstrapping)
->>
-/Subtype /Link
-/Rect [48.239999999999995 118.05600000000001 105.99000000000001 128.556]
-/Type /Annot
->>
-endobj
-136 0 obj
-<< /Border [0 0 0]
-/A << /Type /Action
-/S /URI
-/URI (../ugfun/ugfun.pdf#_ugfun_getting-started_simpleapp-archetype)
->>
-/Subtype /Link
-/Rect [408.746384765625 88.68 515.972384765625 102.96000000000001]
-/Type /Annot
->>
-endobj
-137 0 obj
-<< /Length 33944
->>
-stream
-q
-/DeviceRGB cs
0.200 0.200 0.200 scn
-/DeviceRGB CS
0.200 0.200 0.200 SCN
BT
-48.24 792.006 Td
+48.239999999999995 85.02600000000001 Td
/F2.0 13 Tf
-[<342e322e312e2053> 20.01953125 <797374656d20496e697469616c697a6572>] TJ
+[<342e322e312e20312e31352e302d534e415053484f> 20.01953125 <54>] TJ
ET
0.000 0.000 0.000 SCN
@@ -26669,49 +26621,12 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-3.818 Tw
+0.095 Tw
BT
-48.24 765.446 Td
-/F1.0 10.5 Tf
-[<54686520626f6f74737472> 20.01953125 <617070696e6720697473656c6620697320706572666f726d65642062> 20.01953125 <792061202273797374656d20696e697469616c697a65722220636c6173732e205468697320697320726573706f6e7369626c6520666f72>] TJ
-ET
-
-
-0.000 Tw
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-BT
-48.24 749.666 Td
-/F1.0 10.5 Tf
-<696e7374616e74696174696e67207468652041706163686520497369732072756e74696d652c20616e642062696e64696e6720697420746f2061207468726561642d6c6f63616c2e> 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 717.8360000000001 Td
-/F2.0 10.5 Tf
-<312e31332e302028496d70726f76656420696e74656e7429> 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
-
-2.381 Tw
-
-BT
-48.24 692.0060000000002 Td
+48.239999999999995 58.46600000000002 Td
/F1.0 10.5 Tf
-<4173206f6620> Tj
+<496e20> Tj
ET
@@ -26721,12 +26636,12 @@ ET
0.694 0.129 0.275 scn
0.694 0.129 0.275 SCN
-2.381 Tw
+0.095 Tw
BT
-80.512341015625 692.0060000000002 Td
+61.680745916193175 58.46600000000002 Td
/F6.0 10.5 Tf
-<312e31332e30> Tj
+<312e31352e302d534e415053484f54> Tj
ET
@@ -26736,12 +26651,12 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-2.381 Tw
+0.095 Tw
BT
-112.012341015625 692.0060000000002 Td
+140.4307459161932 58.46600000000002 Td
/F1.0 10.5 Tf
-<2c2074686520> Tj
+[<2074686520626f6f74737472> 20.01953125 <617070696e67206973206163636f6d706c6973686564207573696e67206120636f6d62696e6174696f6e206f6620>] TJ
ET
@@ -26751,12 +26666,12 @@ ET
0.694 0.129 0.275 scn
0.694 0.129 0.275 SCN
-2.381 Tw
+0.095 Tw
BT
-140.80918203125 692.0060000000002 Td
+434.9412540838068 58.46600000000002 Td
/F6.0 10.5 Tf
-<49736973436f6e66696775726174696f6e466f724a646f496e7465675465737473> Tj
+<4170704d616e69666573744162737472616374> Tj
ET
@@ -26766,40 +26681,145 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-2.381 Tw
+0.095 Tw
BT
-314.05918203125 692.0060000000002 Td
+534.6912540838068 58.46600000000002 Td
/F1.0 10.5 Tf
-[<202877686963682070726f76696465732061206e756d626572206f6620636f6e6669677572> 20.01953125 <6174696f6e>] TJ
+<202861> Tj
ET
0.000 Tw
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
+q
+0.000 0.000 0.000 scn
+0.000 0.000 0.000 SCN
+1 w
+0 J
+0 j
+[ ] 0 d
+/Stamp1 Do
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-3.870 Tw
+BT
+535.978 14.388 Td
+/F1.0 9 Tf
+<3137> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+Q
+Q
+
+endstream
+endobj
+130 0 obj
+<< /Type /Page
+/Parent 3 0 R
+/MediaBox [0 0 595.28 841.89]
+/Contents 129 0 R
+/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
+/Font << /F6.1 106 0 R
+/F1.0 8 0 R
+/F6.0 43 0 R
+/F2.0 16 0 R
+>>
+/XObject << /Stamp1 392 0 R
+>>
+>>
+/Annots [131 0 R 132 0 R 133 0 R 135 0 R]
+>>
+endobj
+131 0 obj
+<< /Border [0 0 0]
+/A << /Type /Action
+/S /URI
+/URI (http://github.com/isisaddons/isis-app-todoapp)
+>>
+/Subtype /Link
+/Rect [83.499 790.8599999999999 124.52250000000001 805.14]
+/Type /Annot
+>>
+endobj
+132 0 obj
+<< /Border [0 0 0]
+/A << /Type /Action
+/S /URI
+/URI (http://joel-costigliola.github.io/assertj)
+>>
+/Subtype /Link
+/Rect [151.707 790.8599999999999 186.57750000000001 805.14]
+/Type /Annot
+>>
+endobj
+133 0 obj
+<< /Border [0 0 0]
+/A << /Type /Action
+/S /URI
+/URI (http://junit.org/junit4/javadoc/latest/org/junit/rules/ExpectedException.html)
+>>
+/Subtype /Link
+/Rect [194.01299183238638 521.3000000000001 246.62923774857956 535.58]
+/Type /Annot
+>>
+endobj
+134 0 obj
+[130 0 R /XYZ 0 274.47 null]
+endobj
+135 0 obj
+<< /Border [0 0 0]
+/A << /Type /Action
+/S /URI
+/URI (../ugfun/ugfun.pdf#_ugfun_getting-started_simpleapp-archetype)
+>>
+/Subtype /Link
+/Rect [408.746384765625 116.46000000000001 515.972384765625 130.74]
+/Type /Annot
+>>
+endobj
+136 0 obj
+[130 0 R /XYZ 0 103.71000000000001 null]
+endobj
+137 0 obj
+<< /Length 31026
+>>
+stream
+q
+/DeviceRGB cs
+0.200 0.200 0.200 scn
+/DeviceRGB CS
+0.200 0.200 0.200 SCN
BT
-48.24 676.2260000000002 Td
+48.24 794.6759999999999 Td
/F1.0 10.5 Tf
-[<73657474696e6773207370656369666963616c6c7920666f722072756e6e696e6720696e74656772> 20.01953125 <6174696f6e207465737473292063616e2062652072656d6f7665643b20696e737465616420616c6c20636f6e6669677572> 20.01953125 <6174696f6e>] TJ
+[<6672> 20.01953125 <616d65776f726b2d70726f766964656420696d706c656d656e746174696f6e206f6620>] 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
+251.509294921875 794.6759999999999 Td
+/F6.0 10.5 Tf
+<4170704d616e6966657374> Tj
+ET
-0.000 Tw
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
BT
-48.24 660.4460000000003 Td
+309.25929492187504 794.6759999999999 Td
/F1.0 10.5 Tf
-<70726f706572746965732063616e20626520646566696e6564207468726f7567682074686520> Tj
+<2920616e6420> Tj
ET
0.000 0.000 0.000 SCN
@@ -26808,9 +26828,9 @@ ET
0.694 0.129 0.275 SCN
BT
-240.68400000000003 660.4460000000003 Td
+337.44129492187506 794.6759999999999 Td
/F6.0 10.5 Tf
-<4170704d616e6966657374> Tj
+<496e746567726174696f6e54657374416273747261637432> Tj
ET
0.000 0.000 0.000 SCN
@@ -26819,9 +26839,9 @@ ET
0.200 0.200 0.200 SCN
BT
-298.434 660.4460000000003 Td
+463.44129492187506 794.6759999999999 Td
/F1.0 10.5 Tf
-<3a> Tj
+<207375706572636c6173732e> Tj
ET
0.000 0.000 0.000 SCN
@@ -26830,37 +26850,59 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24 632.6660000000002 Td
+48.24 766.896 Td
/F1.0 10.5 Tf
-[<46> 40.0390625 <6f72206578616d706c653a>] TJ
+[<46> 40.0390625 <6f72206578616d706c652c2074686520>] 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
+134.57058984375 766.896 Td
+/F1.0 10.5 Tf
+<53696d706c6541707020617263686574797065> 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
+241.79658984375004 766.896 Td
+/F1.0 10.5 Tf
+[<277320696e74656772> 20.01953125 <6174696f6e20746573747320616c6c20696e68657269742066726f6d207468697320636c6173733a>] 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 616.850 m
-543.040 616.850 l
-545.249 616.850 547.040 615.059 547.040 612.850 c
-547.040 274.570 l
-547.040 272.361 545.249 270.570 543.040 270.570 c
-52.240 270.570 l
-50.031 270.570 48.240 272.361 48.240 274.570 c
-48.240 612.850 l
-48.240 615.059 50.031 616.850 52.240 616.850 c
+52.240 751.080 m
+543.040 751.080 l
+545.249 751.080 547.040 749.289 547.040 747.080 c
+547.040 615.160 l
+547.040 612.951 545.249 611.160 543.040 611.160 c
+52.240 611.160 l
+50.031 611.160 48.240 612.951 48.240 615.160 c
+48.240 747.080 l
+48.240 749.289 50.031 751.080 52.240 751.080 c
h
f
0.800 0.800 0.800 SCN
0.75 w
-52.240 616.850 m
-543.040 616.850 l
-545.249 616.850 547.040 615.059 547.040 612.850 c
-547.040 274.570 l
-547.040 272.361 545.249 270.570 543.040 270.570 c
-52.240 270.570 l
-50.031 270.570 48.240 272.361 48.240 274.570 c
-48.240 612.850 l
-48.240 615.059 50.031 616.850 52.240 616.850 c
+52.240 751.080 m
+543.040 751.080 l
+545.249 751.080 547.040 749.289 547.040 747.080 c
+547.040 615.160 l
+547.040 612.951 545.249 611.160 543.040 611.160 c
+52.240 611.160 l
+50.031 611.160 48.240 612.951 48.240 615.160 c
+48.240 747.080 l
+48.240 749.289 50.031 751.080 52.240 751.080 c
h
S
Q
@@ -26868,7 +26910,7 @@ Q
0.000 0.400 0.600 SCN
BT
-59.24 594.0250000000002 Td
+59.24 728.255 Td
/F6.0 11 Tf
<7075626c6963> Tj
ET
@@ -26879,20 +26921,20 @@ ET
0.200 0.200 0.200 SCN
BT
-92.24000000000001 594.0250000000002 Td
+92.24000000000001 728.255 Td
/F6.0 11 Tf
<20> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.467 0.533 scn
-0.000 0.467 0.533 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
-97.74000000000001 594.0250000000002 Td
+97.74000000000001 728.255 Td
/F6.0 11 Tf
-<636c617373> Tj
+<6162737472616374> Tj
ET
0.000 0.000 0.000 SCN
@@ -26901,20 +26943,20 @@ ET
0.200 0.200 0.200 SCN
BT
-125.24000000000001 594.0250000000002 Td
+141.74 728.255 Td
/F6.0 11 Tf
<20> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.667 0.533 scn
-0.000 0.667 0.533 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
BT
-130.74 594.0250000000002 Td
+147.24 728.255 Td
/F6.0 11 Tf
-<446f6d61696e41707053797374656d496e697469616c697a6572> Tj
+<636c617373> Tj
ET
0.000 0.000 0.000 SCN
@@ -26923,20 +26965,20 @@ ET
0.200 0.200 0.200 SCN
BT
-273.74 594.0250000000002 Td
+174.74 728.255 Td
/F6.0 11 Tf
<20> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
BT
-279.24 594.0250000000002 Td
+180.24 728.255 Td
/F6.0 11 Tf
-<7b> Tj
+<446f6d61696e417070496e746567546573744162737472616374> Tj
ET
0.000 0.000 0.000 SCN
@@ -26945,9 +26987,9 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 579.2850000000002 Td
+323.24 728.255 Td
/F6.0 11 Tf
-<ca202020> Tj
+<20> Tj
ET
0.000 0.000 0.000 SCN
@@ -26956,9 +26998,9 @@ ET
0.000 0.400 0.600 SCN
BT
-81.24000000000001 579.2850000000002 Td
+328.74 728.255 Td
/F6.0 11 Tf
-<7075626c6963> Tj
+<657874656e6473> Tj
ET
0.000 0.000 0.000 SCN
@@ -26967,20 +27009,20 @@ ET
0.200 0.200 0.200 SCN
BT
-114.24000000000001 579.2850000000002 Td
+367.24 728.255 Td
/F6.0 11 Tf
<20> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.400 0.600 scn
-0.000 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
-119.74000000000001 579.2850000000002 Td
+372.74 728.255 Td
/F6.0 11 Tf
-<737461746963> Tj
+<496e746567726174696f6e54657374416273747261637432> Tj
ET
0.000 0.000 0.000 SCN
@@ -26989,20 +27031,20 @@ ET
0.200 0.200 0.200 SCN
BT
-152.74 579.2850000000002 Td
+504.74 728.255 Td
/F6.0 11 Tf
<20> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.467 0.533 scn
-0.000 0.467 0.533 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
-158.24 579.2850000000002 Td
+510.24 728.255 Td
/F6.0 11 Tf
-<766f6964> Tj
+<7b> Tj
ET
0.000 0.000 0.000 SCN
@@ -27011,20 +27053,20 @@ ET
0.200 0.200 0.200 SCN
BT
-180.24 579.2850000000002 Td
+59.24 698.7750000000001 Td
/F6.0 11 Tf
-<20> Tj
+<ca202020> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
BT
-185.74 579.2850000000002 Td
+81.24000000000001 698.7750000000001 Td
/F6.0 11 Tf
-<696e697449736674> Tj
+<404265666f7265436c617373> Tj
ET
0.000 0.000 0.000 SCN
@@ -27033,20 +27075,20 @@ ET
0.200 0.200 0.200 SCN
BT
-229.74 579.2850000000002 Td
+59.24 684.0350000000001 Td
/F6.0 11 Tf
-<28> Tj
+<ca202020> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
-235.24 579.2850000000002 Td
+81.24000000000001 684.0350000000001 Td
/F6.0 11 Tf
-<29> Tj
+<7075626c6963> Tj
ET
0.000 0.000 0.000 SCN
@@ -27055,20 +27097,20 @@ ET
0.200 0.200 0.200 SCN
BT
-240.74 579.2850000000002 Td
+114.24000000000001 684.0350000000001 Td
/F6.0 11 Tf
<20> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
-246.24 579.2850000000002 Td
+119.74000000000001 684.0350000000001 Td
/F6.0 11 Tf
-<7b> Tj
+<737461746963> Tj
ET
0.000 0.000 0.000 SCN
@@ -27077,20 +27119,20 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 564.5450000000003 Td
+152.74 684.0350000000001 Td
/F6.0 11 Tf
-<ca20202020202020> Tj
+<20> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
BT
-103.24000000000001 564.5450000000003 Td
+158.24 684.0350000000001 Td
/F6.0 11 Tf
-<4973697353797374656d466f7254657374> Tj
+<766f6964> Tj
ET
0.000 0.000 0.000 SCN
@@ -27099,7 +27141,7 @@ ET
0.200 0.200 0.200 SCN
BT
-196.74 564.5450000000003 Td
+180.24 684.0350000000001 Td
/F6.0 11 Tf
<20> Tj
ET
@@ -27110,9 +27152,9 @@ ET
0.200 0.200 0.200 SCN
BT
-202.24 564.5450000000003 Td
+185.74 684.0350000000001 Td
/F6.0 11 Tf
-<69736674> Tj
+<696e697453797374656d> Tj
ET
0.000 0.000 0.000 SCN
@@ -27121,9 +27163,9 @@ ET
0.200 0.200 0.200 SCN
BT
-224.24 564.5450000000003 Td
+240.74 684.0350000000001 Td
/F6.0 11 Tf
-<20> Tj
+<28> Tj
ET
0.000 0.000 0.000 SCN
@@ -27132,9 +27174,9 @@ ET
0.200 0.200 0.200 SCN
BT
-229.74 564.5450000000003 Td
+246.24 684.0350000000001 Td
/F6.0 11 Tf
-<3d> Tj
+<29> Tj
ET
0.000 0.000 0.000 SCN
@@ -27143,7 +27185,7 @@ ET
0.200 0.200 0.200 SCN
BT
-235.24 564.5450000000003 Td
+251.74 684.0350000000001 Td
/F6.0 11 Tf
<20> Tj
ET
@@ -27154,9 +27196,9 @@ ET
0.200 0.200 0.200 SCN
BT
-240.74 564.5450000000003 Td
+257.24 684.0350000000001 Td
/F6.0 11 Tf
-<4973697353797374656d466f7254657374> Tj
+<7b> Tj
ET
0.000 0.000 0.000 SCN
@@ -27165,9 +27207,9 @@ ET
0.200 0.200 0.200 SCN
BT
-334.24 564.5450000000003 Td
+59.24 669.2950000000001 Td
/F6.0 11 Tf
-<2e> Tj
+<ca20202020202020> Tj
ET
0.000 0.000 0.000 SCN
@@ -27176,9 +27218,9 @@ ET
0.200 0.200 0.200 SCN
BT
-339.74 564.5450000000003 Td
+103.24000000000001 669.2950000000001 Td
/F6.0 11 Tf
-<676574456c73654e756c6c> Tj
+<626f6f7473747261705573696e67> Tj
ET
0.000 0.000 0.000 SCN
@@ -27187,20 +27229,20 @@ ET
0.200 0.200 0.200 SCN
BT
-400.24 564.5450000000003 Td
+180.24 669.2950000000001 Td
/F6.0 11 Tf
<28> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
-405.74 564.5450000000003 Td
+185.74 669.2950000000001 Td
/F6.0 11 Tf
-<29> Tj
+<6e6577> Tj
ET
0.000 0.000 0.000 SCN
@@ -27209,9 +27251,9 @@ ET
0.200 0.200 0.200 SCN
BT
-411.24 564.5450000000003 Td
+202.24 669.2950000000001 Td
/F6.0 11 Tf
-<3b> Tj
+<20> Tj
ET
0.000 0.000 0.000 SCN
@@ -27220,20 +27262,20 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 549.8050000000003 Td
+207.74 669.2950000000001 Td
/F6.0 11 Tf
-<ca20202020202020> Tj
+<446f6d61696e4170704170704d616e6966657374> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.400 0.600 scn
-0.000 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
-103.24000000000001 549.8050000000003 Td
+317.74 669.2950000000001 Td
/F6.0 11 Tf
-<6966> Tj
+<28> Tj
ET
0.000 0.000 0.000 SCN
@@ -27242,9 +27284,9 @@ ET
0.200 0.200 0.200 SCN
BT
-114.24000000000001 549.8050000000003 Td
+323.24 669.2950000000001 Td
/F6.0 11 Tf
-<28> Tj
+<29> Tj
ET
0.000 0.000 0.000 SCN
@@ -27253,9 +27295,9 @@ ET
0.200 0.200 0.200 SCN
BT
-119.74000000000001 549.8050000000003 Td
+328.74 669.2950000000001 Td
/F6.0 11 Tf
-<69736674> Tj
+<29> Tj
ET
0.000 0.000 0.000 SCN
@@ -27264,9 +27306,9 @@ ET
0.200 0.200 0.200 SCN
BT
-141.74 549.8050000000003 Td
+334.24 669.2950000000001 Td
/F6.0 11 Tf
-<20> Tj
+<3b> Tj
ET
0.000 0.000 0.000 SCN
@@ -27275,9 +27317,9 @@ ET
0.200 0.200 0.200 SCN
BT
-147.24 549.8050000000003 Td
+59.24 654.5550000000001 Td
/F6.0 11 Tf
-<3d3d> Tj
+<ca202020> Tj
ET
0.000 0.000 0.000 SCN
@@ -27286,9 +27328,9 @@ ET
0.200 0.200 0.200 SCN
BT
-158.24 549.8050000000003 Td
+81.24000000000001 654.5550000000001 Td
/F6.0 11 Tf
-<20> Tj
+<7d> Tj
ET
0.000 0.000 0.000 SCN
@@ -27297,9 +27339,9 @@ ET
0.200 0.200 0.200 SCN
BT
-163.74 549.8050000000003 Td
+59.24 625.075 Td
/F6.0 11 Tf
-<6e756c6c> Tj
+<7d> Tj
ET
0.000 0.000 0.000 SCN
@@ -27308,20 +27350,20 @@ ET
0.200 0.200 0.200 SCN
BT
-185.74 549.8050000000003 Td
-/F6.0 11 Tf
-<29> Tj
+48.24 587.196 Td
+/F1.0 10.5 Tf
+<776865726520> 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
-191.24 549.8050000000003 Td
-/F6.0 11 Tf
-<20> Tj
+82.8375 587.196 Td
+/F6.0 10.5 Tf
+<446f6d61696e4170704170704d616e6966657374> Tj
ET
0.000 0.000 0.000 SCN
@@ -27330,9 +27372,47 @@ ET
0.200 0.200 0.200 SCN
BT
-196.74 549.8050000000003 Td
+187.8375 587.196 Td
+/F1.0 10.5 Tf
+<20696e207475726e2069733a> 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 571.380 m
+543.040 571.380 l
+545.249 571.380 547.040 569.589 547.040 567.380 c
+547.040 273.320 l
+547.040 271.111 545.249 269.320 543.040 269.320 c
+52.240 269.320 l
+50.031 269.320 48.240 271.111 48.240 273.320 c
+48.240 567.380 l
+48.240 569.589 50.031 571.380 52.240 571.380 c
+h
+f
+0.800 0.800 0.800 SCN
+0.75 w
+52.240 571.380 m
+543.040 571.380 l
+545.249 571.380 547.040 569.589 547.040 567.380 c
+547.040 273.320 l
+547.040 271.111 545.249 269.320 543.040 269.320 c
+52.240 269.320 l
+50.031 269.320 48.240 271.111 48.240 273.320 c
+48.240 567.380 l
+48.240 569.589 50.031 571.380 52.240 571.380 c
+h
+S
+Q
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
+
+BT
+59.24 548.5550000000001 Td
/F6.0 11 Tf
-<7b> Tj
+<7075626c6963> Tj
ET
0.000 0.000 0.000 SCN
@@ -27341,20 +27421,20 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 535.0650000000003 Td
+92.24000000000001 548.5550000000001 Td
/F6.0 11 Tf
-<ca2020202020202020202020> Tj
+<20> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
BT
-125.24000000000001 535.0650000000003 Td
+97.74000000000001 548.5550000000001 Td
/F6.0 11 Tf
-<69736674> Tj
+<636c617373> Tj
ET
0.000 0.000 0.000 SCN
@@ -27363,20 +27443,20 @@ ET
0.200 0.200 0.200 SCN
BT
-147.24 535.0650000000003 Td
+125.24000000000001 548.5550000000001 Td
/F6.0 11 Tf
<20> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
BT
-152.74 535.0650000000003 Td
+130.74 548.5550000000001 Td
/F6.0 11 Tf
-<3d> Tj
+<446f6d61696e4170704170704d616e6966657374> Tj
ET
0.000 0.000 0.000 SCN
@@ -27385,7 +27465,7 @@ ET
0.200 0.200 0.200 SCN
BT
-158.24 535.0650000000003 Td
+240.74 548.5550000000001 Td
/F6.0 11 Tf
<20> Tj
ET
@@ -27396,9 +27476,9 @@ ET
0.000 0.400 0.600 SCN
BT
-163.74 535.0650000000003 Td
+246.24 548.5550000000001 Td
/F6.0 11 Tf
-<6e6577> Tj
+<657874656e6473> Tj
ET
0.000 0.000 0.000 SCN
@@ -27407,7 +27487,7 @@ ET
0.200 0.200 0.200 SCN
BT
-180.24 535.0650000000003 Td
+284.74 548.5550000000001 Td
/F6.0 11 Tf
<20> Tj
ET
@@ -27418,9 +27498,9 @@ ET
0.200 0.200 0.200 SCN
BT
-185.74 535.0650000000003 Td
+290.24 548.5550000000001 Td
/F6.0 11 Tf
-<4973697353797374656d466f7254657374> Tj
+<4170704d616e69666573744162737472616374> Tj
ET
0.000 0.000 0.000 SCN
@@ -27429,9 +27509,9 @@ ET
0.200 0.200 0.200 SCN
BT
-279.24 535.0650000000003 Td
+394.74 548.5550000000001 Td
/F6.0 11 Tf
-<2e> Tj
+<20> Tj
ET
0.000 0.000 0.000 SCN
@@ -27440,9 +27520,9 @@ ET
0.200 0.200 0.200 SCN
BT
-284.74 535.0650000000003 Td
+400.24 548.5550000000001 Td
/F6.0 11 Tf
-<4275696c646572> Tj
+<7b> Tj
ET
0.000 0.000 0.000 SCN
@@ -27451,20 +27531,20 @@ ET
0.200 0.200 0.200 SCN
BT
-323.24 535.0650000000003 Td
+59.24 519.075 Td
/F6.0 11 Tf
-<28> Tj
+<ca202020> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
-328.74 535.0650000000003 Td
+81.24000000000001 519.075 Td
/F6.0 11 Tf
-<29> Tj
+<7075626c6963> Tj
ET
0.000 0.000 0.000 SCN
@@ -27473,20 +27553,20 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 520.3250000000003 Td
+114.24000000000001 519.075 Td
/F6.0 11 Tf
-<ca20202020202020202020202020202020202020> Tj
+<20> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
-169.24 520.3250000000003 Td
+119.74000000000001 519.075 Td
/F6.0 11 Tf
-<2e> Tj
+<737461746963> Tj
ET
0.000 0.000 0.000 SCN
@@ -27495,20 +27575,20 @@ ET
0.200 0.200 0.200 SCN
BT
-174.74 520.3250000000003 Td
+152.74 519.075 Td
/F6.0 11 Tf
-<776974684c6f6767696e674174> Tj
+<20> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
-246.24 520.3250000000003 Td
+158.24 519.075 Td
/F6.0 11 Tf
-<28> Tj
+<66696e616c> Tj
ET
0.000 0.000 0.000 SCN
@@ -27517,9 +27597,9 @@ ET
0.200 0.200 0.200 SCN
BT
-251.74 520.3250000000003 Td
+185.74 519.075 Td
/F6.0 11 Tf
-<6f7267> Tj
+<20> Tj
ET
0.000 0.000 0.000 SCN
@@ -27528,9 +27608,9 @@ ET
0.200 0.200 0.200 SCN
BT
-268.24 520.3250000000003 Td
+191.24 519.075 Td
/F6.0 11 Tf
-<2e> Tj
+<4275696c646572> Tj
ET
0.000 0.000 0.000 SCN
@@ -27539,9 +27619,9 @@ ET
0.200 0.200 0.200 SCN
BT
-273.74 520.3250000000003 Td
+229.74 519.075 Td
/F6.0 11 Tf
-<617061636865> Tj
+<20> Tj
ET
0.000 0.000 0.000 SCN
@@ -27550,9 +27630,9 @@ ET
0.200 0.200 0.200 SCN
BT
-306.74 520.3250000000003 Td
+235.24 519.075 Td
/F6.0 11 Tf
-<2e> Tj
+<4255494c444552> Tj
ET
0.000 0.000 0.000 SCN
@@ -27561,9 +27641,9 @@ ET
0.200 0.200 0.200 SCN
BT
-312.24 520.3250000000003 Td
+273.74 519.075 Td
/F6.0 11 Tf
-<6c6f67346a> Tj
+<20> Tj
ET
0.000 0.000 0.000 SCN
@@ -27572,9 +27652,9 @@ ET
0.200 0.200 0.200 SCN
BT
-339.74 520.3250000000003 Td
+279.24 519.075 Td
/F6.0 11 Tf
-<2e> Tj
+<3d> Tj
ET
0.000 0.000 0.000 SCN
@@ -27583,9 +27663,9 @@ ET
0.200 0.200 0.200 SCN
BT
-345.24 520.3250000000003 Td
+284.74 519.075 Td
/F6.0 11 Tf
-<4c6576656c> Tj
+<20> Tj
ET
0.000 0.000 0.000 SCN
@@ -27594,9 +27674,9 @@ ET
0.200 0.200 0.200 SCN
BT
-372.74 520.3250000000003 Td
+290.24 519.075 Td
/F6.0 11 Tf
-<2e> Tj
+<4275696c646572> Tj
ET
0.000 0.000 0.000 SCN
@@ -27605,9 +27685,9 @@ ET
0.200 0.200 0.200 SCN
BT
-378.24 520.3250000000003 Td
+328.74 519.075 Td
/F6.0 11 Tf
-<494e464f> Tj
+<2e> Tj
ET
0.000 0.000 0.000 SCN
@@ -27616,9 +27696,9 @@ ET
0.200 0.200 0.200 SCN
BT
-400.24 520.3250000000003 Td
+334.24 519.075 Td
/F6.0 11 Tf
-<29> Tj
+<666f724d6f64756c6573> Tj
ET
0.000 0.000 0.000 SCN
@@ -27627,9 +27707,9 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 505.58500000000026 Td
+389.24 519.075 Td
/F6.0 11 Tf
-<ca20202020202020202020202020202020202020> Tj
+<28> Tj
ET
0.000 0.000 0.000 SCN
@@ -27638,9 +27718,9 @@ ET
0.200 0.200 0.200 SCN
BT
-169.24 505.58500000000026 Td
+59.24 504.3350000000001 Td
/F6.0 11 Tf
-<2e> Tj
+<ca20202020202020202020202020202020202020> Tj
ET
0.000 0.000 0.000 SCN
@@ -27649,9 +27729,9 @@ ET
0.200 0.200 0.200 SCN
BT
-174.74 505.58500000000026 Td
+169.24 504.3350000000001 Td
/F6.0 11 Tf
-<77697468> Tj
+<53696d706c654d6f64756c65446f6d5375626d6f64756c65> Tj
ET
0.000 0.000 0.000 SCN
@@ -27660,20 +27740,9 @@ ET
0.200 0.200 0.200 SCN
BT
-196.74 505.58500000000026 Td
-/F6.0 11 Tf
-<28> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.000 0.400 0.600 scn
-0.000 0.400 0.600 SCN
-
-BT
-202.24 505.58500000000026 Td
+301.24 504.3350000000001 Td
/F6.0 11 Tf
-<6e6577> Tj
+<2e> Tj
ET
0.000 0.000 0.000 SCN
@@ -27682,9 +27751,9 @@ ET
0.200 0.200 0.200 SCN
BT
-218.74 505.58500000000026 Td
+306.74 504.3350000000001 Td
/F6.0 11 Tf
-<20> Tj
+<636c617373> Tj
ET
0.000 0.000 0.000 SCN
@@ -27693,9 +27762,9 @@ ET
0.200 0.200 0.200 SCN
BT
-224.24 505.58500000000026 Td
+334.24 504.3350000000001 Td
/F6.0 11 Tf
-<446f6d61696e4170704170704d616e6966657374> Tj
+<2c> Tj
ET
0.000 0.000 0.000 SCN
@@ -27704,9 +27773,9 @@ ET
0.200 0.200 0.200 SCN
BT
-334.24 505.58500000000026 Td
+59.24 489.5950000000001 Td
/F6.0 11 Tf
-<28> Tj
+<ca20202020202020202020202020202020202020> Tj
ET
0.000 0.000 0.000 SCN
@@ -27715,9 +27784,9 @@ ET
0.200 0.200 0.200 SCN
BT
-339.74 505.58500000000026 Td
+169.24 489.5950000000001 Td
/F6.0 11 Tf
-<29> Tj
+<446f6d61696e4170704170706c69636174696f6e4d6f64756c65466978747572655375626d6f64756c65> Tj
ET
0.000 0.000 0.000 SCN
@@ -27726,9 +27795,9 @@ ET
0.200 0.200 0.200 SCN
BT
-345.24 505.58500000000026 Td
+400.24 489.5950000000001 Td
/F6.0 11 Tf
-<20> Tj
+<2e> Tj
ET
0.000 0.000 0.000 SCN
@@ -27737,9 +27806,9 @@ ET
0.200 0.200 0.200 SCN
BT
-350.74 505.58500000000026 Td
+405.74 489.5950000000001 Td
/F6.0 11 Tf
-<7b> Tj
+<636c617373> Tj
ET
0.000 0.000 0.000 SCN
@@ -27748,20 +27817,20 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 490.84500000000025 Td
+433.24 489.5950000000001 Td
/F6.0 11 Tf
-<ca2020202020202020202020202020202020202020202020> Tj
+<2c> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.600 0.600 1.000 scn
-0.600 0.600 1.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
-191.24 490.84500000000025 Td
+59.24 474.85500000000013 Td
/F6.0 11 Tf
-<404f76657272696465> Tj
+<ca20202020202020202020202020202020202020> Tj
ET
0.000 0.000 0.000 SCN
@@ -27770,20 +27839,20 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 476.10500000000025 Td
+169.24 474.85500000000013 Td
/F6.0 11 Tf
-<ca2020202020202020202020202020202020202020202020> Tj
+<446f6d61696e4170704170706c69636174696f6e4d6f64756c6553657276696365735375626d6f64756c65> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.400 0.600 scn
-0.000 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
-191.24 476.10500000000025 Td
+405.74 474.85500000000013 Td
/F6.0 11 Tf
-<7075626c6963> Tj
+<2e> Tj
ET
0.000 0.000 0.000 SCN
@@ -27792,20 +27861,20 @@ ET
0.200 0.200 0.200 SCN
BT
-224.24 476.10500000000025 Td
+411.24 474.85500000000013 Td
/F6.0 11 Tf
-<20> Tj
+<636c617373> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.467 0.533 scn
-0.000 0.467 0.533 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
-229.74 476.10500000000025 Td
+59.24 460.1150000000001 Td
/F6.0 11 Tf
-<4d6170> Tj
+<ca2020202020202020202020> Tj
ET
0.000 0.000 0.000 SCN
@@ -27814,20 +27883,20 @@ ET
0.200 0.200 0.200 SCN
BT
-246.24 476.10500000000025 Td
+125.24000000000001 460.1150000000001 Td
/F6.0 11 Tf
-<3c> Tj
+<29> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.467 0.533 scn
-0.000 0.467 0.533 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
-251.74 476.10500000000025 Td
+59.24 445.3750000000001 Td
/F6.0 11 Tf
-<537472696e67> Tj
+<ca2020202020202020202020> Tj
ET
0.000 0.000 0.000 SCN
@@ -27836,9 +27905,9 @@ ET
0.200 0.200 0.200 SCN
BT
-284.74 476.10500000000025 Td
+125.24000000000001 445.3750000000001 Td
/F6.0 11 Tf
-<2c> Tj
+<2e> Tj
ET
0.000 0.000 0.000 SCN
@@ -27847,20 +27916,20 @@ ET
0.200 0.200 0.200 SCN
BT
-290.24 476.10500000000025 Td
+130.74 445.3750000000001 Td
/F6.0 11 Tf
-<20> Tj
+<77697468436f6e66696775726174696f6e50726f7065727469657346696c65> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.467 0.533 scn
-0.000 0.467 0.533 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
-295.74 476.10500000000025 Td
+301.24 445.3750000000001 Td
/F6.0 11 Tf
-<537472696e67> Tj
+<28> Tj
ET
0.000 0.000 0.000 SCN
@@ -27869,9 +27938,9 @@ ET
0.200 0.200 0.200 SCN
BT
-328.74 476.10500000000025 Td
+306.74 445.3750000000001 Td
/F6.0 11 Tf
-<3e> Tj
+<446f6d61696e4170704170704d616e6966657374> Tj
ET
0.000 0.000 0.000 SCN
@@ -27880,9 +27949,9 @@ ET
0.200 0.200 0.200 SCN
BT
-334.24 476.10500000000025 Td
+416.74 445.3750000000001 Td
/F6.0 11 Tf
-<20> Tj
+<2e> Tj
ET
0.000 0.000 0.000 SCN
@@ -27891,9 +27960,9 @@ ET
0.200 0.200 0.200 SCN
BT
-339.74 476.10500000000025 Td
+422.24 445.3750000000001 Td
/F6.0 11 Tf
-<676574436f6e66696775726174696f6e50726f70657274696573> Tj
+<636c617373> Tj
ET
0.000 0.000 0.000 SCN
@@ -27902,9 +27971,9 @@ ET
0.200 0.200 0.200 SCN
BT
-482.74 476.10500000000025 Td
+449.74 445.3750000000001 Td
/F6.0 11 Tf
-<28> Tj
+<2c> Tj
ET
0.000 0.000 0.000 SCN
@@ -27913,53 +27982,53 @@ ET
0.200 0.200 0.200 SCN
BT
-488.24 476.10500000000025 Td
+59.24 430.6350000000001 Td
/F6.0 11 Tf
-<29> Tj
+<ca20202020202020202020202020202020202020> 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.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
BT
-493.74 476.10500000000025 Td
+169.24 430.6350000000001 Td
/F6.0 11 Tf
-<20> Tj
+<22> 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.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
BT
-499.24 476.10500000000025 Td
+174.74 430.6350000000001 Td
/F6.0 11 Tf
-<7b> Tj
+<697369732e70726f70657274696573> 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.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
BT
-59.24 461.36500000000024 Td
+257.24 430.6350000000001 Td
/F6.0 11 Tf
-<ca202020202020202020202020202020202020202020202020202020> Tj
+<22> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.400 0.600 scn
-0.000 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
-213.24 461.36500000000024 Td
+262.74 430.6350000000001 Td
/F6.0 11 Tf
-<66696e616c> Tj
+<2c> Tj
ET
0.000 0.000 0.000 SCN
@@ -27968,42 +28037,42 @@ ET
0.200 0.200 0.200 SCN
BT
-240.74 461.36500000000024 Td
+59.24 415.8950000000001 Td
/F6.0 11 Tf
-<20> Tj
+<ca20202020202020202020202020202020202020> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.467 0.533 scn
-0.000 0.467 0.533 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
BT
-246.24 461.36500000000024 Td
+169.24 415.8950000000001 Td
/F6.0 11 Tf
-<4d6170> Tj
+<22> 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.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
BT
-262.74 461.36500000000024 Td
+174.74 415.8950000000001 Td
/F6.0 11 Tf
-<3c> Tj
+<61757468656e7469636174696f6e5f736869726f2e70726f70657274696573> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.467 0.533 scn
-0.000 0.467 0.533 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
BT
-268.24 461.36500000000024 Td
+345.24 415.8950000000001 Td
/F6.0 11 Tf
-<537472696e67> Tj
+<22> Tj
ET
0.000 0.000 0.000 SCN
@@ -28012,7 +28081,7 @@ ET
0.200 0.200 0.200 SCN
BT
-301.24 461.36500000000024 Td
+350.74 415.8950000000001 Td
/F6.0 11 Tf
<2c> Tj
ET
@@ -28023,42 +28092,42 @@ ET
0.200 0.200 0.200 SCN
BT
-306.74 461.36500000000024 Td
+59.24 401.1550000000001 Td
/F6.0 11 Tf
-<20> Tj
+<ca20202020202020202020202020202020202020> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.467 0.533 scn
-0.000 0.467 0.533 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
BT
-312.24 461.36500000000024 Td
+169.24 401.1550000000001 Td
/F6.0 11 Tf
-<537472696e67> Tj
+<22> 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.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
BT
-345.24 461.36500000000024 Td
+174.74 401.1550000000001 Td
/F6.0 11 Tf
-<3e> Tj
+<706572736973746f725f646174616e75636c6575732e70726f70657274696573> 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.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
BT
-350.74 461.36500000000024 Td
+350.74 401.1550000000001 Td
/F6.0 11 Tf
-<20> Tj
+<22> Tj
ET
0.000 0.000 0.000 SCN
@@ -28067,9 +28136,9 @@ ET
0.200 0.200 0.200 SCN
BT
-356.24 461.36500000000024 Td
+356.24 401.1550000000001 Td
/F6.0 11 Tf
-<6d6170> Tj
+<2c> Tj
ET
0.000 0.000 0.000 SCN
@@ -28078,42 +28147,42 @@ ET
0.200 0.200 0.200 SCN
BT
-372.74 461.36500000000024 Td
+59.24 386.4150000000001 Td
/F6.0 11 Tf
-<20> Tj
+<ca20202020202020202020202020202020202020> 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.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
BT
-378.24 461.36500000000024 Td
+169.24 386.4150000000001 Td
/F6.0 11 Tf
-<3d> Tj
+<22> 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.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
BT
-383.74 461.36500000000024 Td
+174.74 386.4150000000001 Td
/F6.0 11 Tf
-<20> Tj
+<7669657765725f7265737466756c6f626a656374732e70726f70657274696573> 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.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
BT
-389.24 461.36500000000024 Td
+350.74 386.4150000000001 Td
/F6.0 11 Tf
-<4d617073> Tj
+<22> Tj
ET
0.000 0.000 0.000 SCN
@@ -28122,9 +28191,9 @@ ET
0.200 0.200 0.200 SCN
BT
-411.24 461.36500000000024 Td
+356.24 386.4150000000001 Td
/F6.0 11 Tf
-<2e> Tj
+<2c> Tj
ET
0.000 0.000 0.000 SCN
@@ -28133,97 +28202,42 @@ ET
0.200 0.200 0.200 SCN
BT
-416.74 461.36500000000024 Td
+59.24 371.67500000000007 Td
/F6.0 11 Tf
-<6e6577486173684d6170> Tj
+<ca20202020202020202020202020202020202020> 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
-471.74 461.36500000000024 Td
-/F6.0 11 Tf
-<28> 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
-477.24 461.36500000000024 Td
-/F6.0 11 Tf
-<29> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-BT
-482.74 461.36500000000024 Td
-/F6.0 11 Tf
-<3b> 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 446.6250000000002 Td
-/F6.0 11 Tf
-<ca202020202020202020202020202020202020202020202020202020> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.000 0.467 0.533 scn
-0.000 0.467 0.533 SCN
-
-BT
-213.24 446.6250000000002 Td
-/F6.0 11 Tf
-<5574696c> 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.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
BT
-235.24 446.6250000000002 Td
+169.24 371.67500000000007 Td
/F6.0 11 Tf
-<2e> Tj
+<22> 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.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
BT
-240.74 446.6250000000002 Td
+174.74 371.67500000000007 Td
/F6.0 11 Tf
-<776974684a617661784a646f52756e496e4d656d6f727950726f70657274696573> Tj
+<7669657765725f7769636b65742e70726f70657274696573> 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.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
BT
-422.24 446.6250000000002 Td
+306.74 371.67500000000007 Td
/F6.0 11 Tf
-<28> Tj
+<22> Tj
ET
0.000 0.000 0.000 SCN
@@ -28232,9 +28246,9 @@ ET
0.200 0.200 0.200 SCN
BT
-427.74 446.6250000000002 Td
+59.24 356.93500000000006 Td
/F6.0 11 Tf
-<6d6170> Tj
+<ca2020202020202020202020> Tj
ET
0.000 0.000 0.000 SCN
@@ -28243,7 +28257,7 @@ ET
0.200 0.200 0.200 SCN
BT
-444.24 446.6250000000002 Td
+125.24000000000001 356.93500000000006 Td
/F6.0 11 Tf
<29> Tj
ET
@@ -28254,9 +28268,9 @@ ET
0.200 0.200 0.200 SCN
BT
-449.74 446.6250000000002 Td
+130.74 356.93500000000006 Td
/F6.0 11 Tf
-<3b> Tj
+<2e> Tj
ET
0.000 0.000 0.000 SCN
@@ -28265,20 +28279,9 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 431.8850000000002 Td
+136.24 356.93500000000006 Td
/F6.0 11 Tf
-<ca202020202020202020202020202020202020202020202020202020> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.000 0.467 0.533 scn
-0.000 0.467 0.533 SCN
-
-BT
-213.24 431.8850000000002 Td
-/F6.0 11 Tf
-<5574696c> Tj
+<77697468417574684d656368616e69736d> Tj
ET
0.000 0.000 0.000 SCN
@@ -28287,42 +28290,42 @@ ET
0.200 0.200 0.200 SCN
BT
-235.24 431.8850000000002 Td
+229.74 356.93500000000006 Td
/F6.0 11 Tf
-<2e> Tj
+<28> 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.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
BT
-240.74 431.8850000000002 Td
+235.24 356.93500000000006 Td
/F6.0 11 Tf
-<77697468446174614e75636c65757350726f70657274696573> Tj
+<22> 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.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
BT
-378.24 431.8850000000002 Td
+240.74 356.93500000000006 Td
/F6.0 11 Tf
-<28> Tj
+<736869726f> 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.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
BT
-383.74 431.8850000000002 Td
+268.24 356.93500000000006 Td
/F6.0 11 Tf
-<6d6170> Tj
+<22> Tj
ET
0.000 0.000 0.000 SCN
@@ -28331,7 +28334,7 @@ ET
0.200 0.200 0.200 SCN
BT
-400.24 431.8850000000002 Td
+273.74 356.93500000000006 Td
/F6.0 11 Tf
<29> Tj
ET
@@ -28342,7 +28345,7 @@ ET
0.200 0.200 0.200 SCN
BT
-405.74 431.8850000000002 Td
+279.24 356.93500000000006 Td
/F6.0 11 Tf
<3b> Tj
ET
@@ -28353,20 +28356,20 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 417.1450000000002 Td
+59.24 327.45500000000004 Td
/F6.0 11 Tf
-<ca202020202020202020202020202020202020202020202020202020> Tj
+<ca202020> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.467 0.533 scn
-0.000 0.467 0.533 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
-213.24 417.1450000000002 Td
+81.24000000000001 327.45500000000004 Td
/F6.0 11 Tf
-<5574696c> Tj
+<7075626c6963> Tj
ET
0.000 0.000 0.000 SCN
@@ -28375,9 +28378,9 @@ ET
0.200 0.200 0.200 SCN
BT
-235.24 417.1450000000002 Td
+114.24000000000001 327.45500000000004 Td
/F6.0 11 Tf
-<2e> Tj
+<20> Tj
ET
0.000 0.000 0.000 SCN
@@ -28386,9 +28389,9 @@ ET
0.200 0.200 0.200 SCN
BT
-240.74 417.1450000000002 Td
+119.74000000000001 327.45500000000004 Td
/F6.0 11 Tf
-<7769746849736973496e7465675465737450726f70657274696573> Tj
+<446f6d61696e4170704170704d616e6966657374> Tj
ET
0.000 0.000 0.000 SCN
@@ -28397,7 +28400,7 @@ ET
0.200 0.200 0.200 SCN
BT
-389.24 417.1450000000002 Td
+229.74 327.45500000000004 Td
/F6.0 11 Tf
<28> Tj
ET
@@ -28408,9 +28411,9 @@ ET
0.200 0.200 0.200 SCN
BT
-394.74 417.1450000000002 Td
+235.24 327.45500000000004 Td
/F6.0 11 Tf
-<6d6170> Tj
+<29> Tj
ET
0.000 0.000 0.000 SCN
@@ -28419,9 +28422,9 @@ ET
0.200 0.200 0.200 SCN
BT
-411.24 417.1450000000002 Td
+240.74 327.45500000000004 Td
/F6.0 11 Tf
-<29> Tj
+<20> Tj
ET
0.000 0.000 0.000 SCN
@@ -28430,9 +28433,9 @@ ET
0.200 0.200 0.200 SCN
BT
-416.74 417.1450000000002 Td
+246.24 327.45500000000004 Td
/F6.0 11 Tf
-<3b> Tj
+<7b> Tj
ET
0.000 0.000 0.000 SCN
@@ -28441,20 +28444,9 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 402.4050000000002 Td
+59.24 312.71500000000003 Td
/F6.0 11 Tf
-<ca202020202020202020202020202020202020202020202020202020> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.000 0.400 0.600 scn
-0.000 0.400 0.600 SCN
-
-BT
-213.24 402.4050000000002 Td
-/F6.0 11 Tf
-<72657475726e> Tj
+<ca20202020202020> Tj
ET
0.000 0.000 0.000 SCN
@@ -28463,9 +28455,9 @@ ET
0.200 0.200 0.200 SCN
BT
-246.24 402.4050000000002 Td
+103.24000000000001 312.71500000000003 Td
/F6.0 11 Tf
-<20> Tj
+<7375706572> Tj
ET
0.000 0.000 0.000 SCN
@@ -28474,9 +28466,9 @@ ET
0.200 0.200 0.200 SCN
BT
-251.74 402.4050000000002 Td
+130.74 312.71500000000003 Td
/F6.0 11 Tf
-<6d6170> Tj
+<28> Tj
ET
0.000 0.000 0.000 SCN
@@ -28485,9 +28477,9 @@ ET
0.200 0.200 0.200 SCN
BT
-268.24 402.4050000000002 Td
+136.24 312.71500000000003 Td
/F6.0 11 Tf
-<3b> Tj
+<4255494c444552> Tj
ET
0.000 0.000 0.000 SCN
@@ -28496,9 +28488,9 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 387.6650000000002 Td
+174.74 312.71500000000003 Td
/F6.0 11 Tf
-<ca2020202020202020202020202020202020202020202020> Tj
+<29> Tj
ET
0.000 0.000 0.000 SCN
@@ -28507,9 +28499,9 @@ ET
0.200 0.200 0.200 SCN
BT
-191.24 387.6650000000002 Td
+180.24 312.71500000000003 Td
/F6.0 11 Tf
-<7d> Tj
+<3b> Tj
ET
0.000 0.000 0.000 SCN
@@ -28518,9 +28510,9 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 372.9250000000002 Td
+59.24 297.9750000000001 Td
/F6.0 11 Tf
-<ca20202020202020202020202020202020202020> Tj
+<ca202020> Tj
ET
0.000 0.000 0.000 SCN
@@ -28529,7 +28521,7 @@ ET
0.200 0.200 0.200 SCN
BT
-169.24 372.9250000000002 Td
+81.24000000000001 297.9750000000001 Td
/F6.0 11 Tf
<7d> Tj
ET
@@ -28540,9 +28532,9 @@ ET
0.200 0.200 0.200 SCN
BT
-174.74 372.9250000000002 Td
+59.24 283.23500000000007 Td
/F6.0 11 Tf
-<29> Tj
+<7d> Tj
ET
0.000 0.000 0.000 SCN
@@ -28550,120 +28542,66 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-BT
-59.24 358.1850000000002 Td
-/F6.0 11 Tf
-<ca20202020202020202020202020202020202020> 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.168 Tw
BT
-169.24 358.1850000000002 Td
-/F6.0 11 Tf
-<2e> Tj
+48.24 245.35600000000005 Td
+/F1.0 10.5 Tf
+<54686520> 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
-174.74 358.1850000000002 Td
-/F6.0 11 Tf
-<6275696c64> Tj
-ET
+0.000 Tw
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
-BT
-202.24 358.1850000000002 Td
-/F6.0 11 Tf
-<28> 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.168 Tw
BT
-207.74 358.1850000000002 Td
-/F6.0 11 Tf
-<29> Tj
+69.82786067708334 245.35600000000005 Td
+/F6.0 10.5 Tf
+<4170704d616e69666573744162737472616374> Tj
ET
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-BT
-213.24 358.1850000000002 Td
-/F6.0 11 Tf
-<3b> 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
-59.24 343.4450000000002 Td
-/F6.0 11 Tf
-<ca2020202020202020202020> 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.168 Tw
BT
-125.24000000000001 343.4450000000002 Td
-/F6.0 11 Tf
-<69736674> Tj
+169.57786067708332 245.35600000000005 Td
+/F1.0 10.5 Tf
+[<20636c6173732028776869636820697320616c736f207573656420746f20626f6f74737472> 20.01953125 <61702074686520726567756c6172206170702061732077656c6c20617320696e74656772> 20.01953125 <6174696f6e>] 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
-147.24 343.4450000000002 Td
-/F6.0 11 Tf
-<2e> 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
-152.74 343.4450000000002 Td
-/F6.0 11 Tf
-<736574557053797374656d> Tj
+48.24 229.57600000000005 Td
+/F1.0 10.5 Tf
+<74657374732920697320646973637573736564206675727468657220> 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
-213.24 343.4450000000002 Td
-/F6.0 11 Tf
-<28> Tj
+177.579 229.57600000000005 Td
+/F1.0 10.5 Tf
+<68657265> Tj
ET
0.000 0.000 0.000 SCN
@@ -28672,20 +28610,20 @@ ET
0.200 0.200 0.200 SCN
BT
-218.74 343.4450000000002 Td
-/F6.0 11 Tf
-<29> Tj
+200.4165 229.57600000000005 Td
+/F1.0 10.5 Tf
+<2c207768696c652074686520> 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
-224.24 343.4450000000002 Td
-/F6.0 11 Tf
-<3b> Tj
+255.09000000000003 229.57600000000005 Td
+/F6.0 10.5 Tf
+<496e746567726174696f6e54657374416273747261637432> Tj
ET
0.000 0.000 0.000 SCN
@@ -28694,20 +28632,20 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 328.7050000000002 Td
-/F6.0 11 Tf
-<ca2020202020202020202020> Tj
+381.09000000000003 229.57600000000005 Td
+/F1.0 10.5 Tf
+<20636c61737320697320646973637573736564206675727468657220> 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
-125.24000000000001 328.7050000000002 Td
-/F6.0 11 Tf
-<4973697353797374656d466f7254657374> Tj
+510.82800000000003 229.57600000000005 Td
+/F1.0 10.5 Tf
+<68657265> Tj
ET
0.000 0.000 0.000 SCN
@@ -28716,8 +28654,8 @@ ET
0.200 0.200 0.200 SCN
BT
-218.74 328.7050000000002 Td
-/F6.0 11 Tf
+533.6655 229.57600000000005 Td
+/F1.0 10.5 Tf
<2e> Tj
ET
@@ -28727,9 +28665,9 @@ ET
0.200 0.200 0.200 SCN
BT
-224.24 328.7050000000002 Td
-/F6.0 11 Tf
-<736574> Tj
+48.24 195.07600000000002 Td
+/F2.0 13 Tf
+<342e322e322e20312e31332e30> Tj
ET
0.000 0.000 0.000 SCN
@@ -28737,126 +28675,113 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-BT
-240.74 328.7050000000002 Td
-/F6.0 11 Tf
-<28> 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
+2.675 Tw
BT
-246.24 328.7050000000002 Td
-/F6.0 11 Tf
-<69736674> Tj
+48.24 168.51600000000002 Td
+/F1.0 10.5 Tf
+<496e20> 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
-268.24 328.7050000000002 Td
-/F6.0 11 Tf
-<29> Tj
-ET
+0.000 Tw
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-BT
-273.74 328.7050000000002 Td
-/F6.0 11 Tf
-<3b> Tj
-ET
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
+2.675 Tw
BT
-59.24 313.9650000000002 Td
-/F6.0 11 Tf
-<ca20202020202020> Tj
+64.26060072544642 168.51600000000002 Td
+/F6.0 10.5 Tf
+<312e31332e30> Tj
ET
+
+0.000 Tw
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
+2.675 Tw
+
BT
-103.24000000000001 313.9650000000002 Td
-/F6.0 11 Tf
-<7d> Tj
+95.76060072544644 168.51600000000002 Td
+/F1.0 10.5 Tf
+[<2074686520626f6f74737472> 20.01953125 <617070696e6720697473656c66206973207479706963616c6c7920706572666f726d65642062> 20.01953125 <792061202273797374656d20696e697469616c697a65722220636c6173732e2054686973206973>] 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.006 Tw
+
BT
-59.24 299.2250000000002 Td
-/F6.0 11 Tf
-<ca202020> Tj
+48.24 152.73600000000002 Td
+/F1.0 10.5 Tf
+<726573706f6e7369626c6520666f7220696e7374616e74696174696e67207468652041706163686520497369732072756e74696d6520286261736564206f6e20612070726f766964656420> 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
+
+0.006 Tw
BT
-81.24000000000001 299.2250000000002 Td
-/F6.0 11 Tf
-<7d> Tj
+422.3294615384615 152.73600000000002 Td
+/F6.0 10.5 Tf
+<4170704d616e6966657374> 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.006 Tw
+
BT
-59.24 284.4850000000002 Td
-/F6.0 11 Tf
-<7d> Tj
+480.0794615384615 152.73600000000002 Td
+/F1.0 10.5 Tf
+<2920616e642062696e64696e67> 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
-5.894 Tw
-
BT
-48.24 246.60600000000017 Td
+48.24 136.95600000000002 Td
/F1.0 10.5 Tf
-[<5768696c652074686520636f646520697320736c696768746c79206c6f6e676572207468616e2070726576696f75736c79> 89.84375 <2c2074686520726573706f6e736962696c697469657320666f722072657475726e696e6720746865>] TJ
+<697420746f2061207468726561642d6c6f63616c2e> 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.036 Tw
+2.397 Tw
BT
-48.24 230.82600000000016 Td
+48.24 109.17600000000002 Td
/F1.0 10.5 Tf
-[<636f6e6669677572> 20.01953125 <6174696f6e2070726f7065727469657320746f2075736520666f72207468652074657374206e6f772072657369646520696e20612073696e676c65206c6f636174696f6e2e20546865206e6577>] TJ
+<54686520> Tj
ET
@@ -28866,10 +28791,10 @@ ET
0.694 0.129 0.275 scn
0.694 0.129 0.275 SCN
-3.178 Tw
+2.397 Tw
BT
-48.24 215.04600000000016 Td
+72.05667365056817 109.17600000000002 Td
/F6.0 10.5 Tf
<4170704d616e69666573742e5574696c> Tj
ET
@@ -28881,12 +28806,12 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-3.178 Tw
+2.397 Tw
BT
-132.24 215.04600000000016 Td
+156.05667365056817 109.17600000000002 Td
/F1.0 10.5 Tf
-<20636c6173732070726f7669646573207468652068656c706572206d6574686f647320746f2061637475616c6c792061646420696e2074686520617070726f70726961746520636f6e666967> Tj
+[<20636c61737320616c6c6f777320636f6e6669677572> 20.01953125 <6174696f6e2070726f7065727469657320666f7220696e74656772> 20.01953125 <6174696f6e2074657374696e6720746f20626520646566696e6564>] TJ
ET
@@ -28897,20 +28822,9 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24 199.26600000000016 Td
+48.24 93.39600000000002 Td
/F1.0 10.5 Tf
-<70726f706572746965732e> 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 167.43600000000015 Td
-/F2.0 10.5 Tf
-<312e392e302028> Tj
+<287265706c6163696e672074686520> Tj
ET
0.000 0.000 0.000 SCN
@@ -28919,20 +28833,9 @@ ET
0.694 0.129 0.275 SCN
BT
-78.9105 167.43600000000015 Td
+120.375 93.39600000000002 Td
/F6.0 10.5 Tf
-<4170704d616e6966657374> 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
-136.6605 167.43600000000015 Td
-/F2.0 10.5 Tf
-<29> Tj
+<49736973436f6e66696775726174696f6e466f724a646f496e7465675465737473> Tj
ET
0.000 0.000 0.000 SCN
@@ -28941,20 +28844,9 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24 141.60600000000014 Td
+293.625 93.39600000000002 Td
/F1.0 10.5 Tf
-<4173206f6620312e392e302c2074686520636f646520287573696e6720> 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
-182.157 141.60600000000014 Td
-/F6.0 10.5 Tf
-<4170704d616e6966657374> Tj
+<206f66206561726c6965722072656c6561736573292e> Tj
ET
0.000 0.000 0.000 SCN
@@ -28963,9 +28855,9 @@ ET
0.200 0.200 0.200 SCN
BT
-239.907 141.60600000000014 Td
+48.24 65.61600000000001 Td
/F1.0 10.5 Tf
-<292069733a> Tj
+[<46> 40.0390625 <6f72206578616d706c653a>] TJ
ET
0.000 0.000 0.000 SCN
@@ -29000,26 +28892,62 @@ endobj
/MediaBox [0 0 595.28 841.89]
/Contents 137 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F2.0 16 0 R
-/F1.0 8 0 R
+/Font << /F1.0 8 0 R
/F6.0 43 0 R
+/F2.0 16 0 R
>>
-/XObject << /Stamp1 373 0 R
+/XObject << /Stamp1 392 0 R
>>
>>
+/Annots [139 0 R 140 0 R 141 0 R 142 0 R]
>>
endobj
139 0 obj
-[138 0 R /XYZ 0 841.89 null]
+<< /Border [0 0 0]
+/A << /Type /Action
+/S /URI
+/URI (../rgcms/rgcms.pdf#_rgcms_classes_AppManifest-bootstrapping)
+>>
+/Subtype /Link
+/Rect [251.509294921875 793.2059999999999 309.25929492187504 803.7059999999999]
+/Type /Annot
+>>
endobj
140 0 obj
-[138 0 R /XYZ 0 733.8500000000001 null]
+<< /Border [0 0 0]
+/A << /Type /Action
+/S /URI
+/URI (../ugfun/ugfun.pdf#_ugfun_getting-started_simpleapp-archetype)
+>>
+/Subtype /Link
+/Rect [134.57058984375 763.8299999999999 241.79658984375004 778.11]
+/Type /Annot
+>>
endobj
141 0 obj
-[138 0 R /XYZ 0 183.45000000000016 null]
+<< /Border [0 0 0]
+/A << /Type /Action
+/S /URI
+/URI (../rgcms/rgcms.pdf#_rgcms_classes_AppManifest-bootstrapping)
+>>
+/Subtype /Link
+/Rect [177.579 226.51000000000005 200.4165 240.79000000000005]
+/Type /Annot
+>>
endobj
142 0 obj
-<< /Length 30723
+<< /Border [0 0 0]
+/Dest (_ugtst_integ-test-support_abstract-class)
+/Subtype /Link
+/Rect [510.82800000000003 226.51000000000005 533.6655 240.79000000000005]
+/Type /Annot
+>>
+endobj
+143 0 obj
+[138 0 R /XYZ 0 213.76000000000005 null]
+endobj
+144 0 obj
+<< /Length 51913
>>
stream
q
@@ -29029,10 +28957,10 @@ q
52.240 805.890 m
543.040 805.890 l
545.249 805.890 547.040 804.099 547.040 801.890 c
-547.040 581.530 l
-547.040 579.321 545.249 577.530 543.040 577.530 c
-52.240 577.530 l
-50.031 577.530 48.240 579.321 48.240 581.530 c
+547.040 463.610 l
+547.040 461.401 545.249 459.610 543.040 459.610 c
+52.240 459.610 l
+50.031 459.610 48.240 461.401 48.240 463.610 c
48.240 801.890 l
48.240 804.099 50.031 805.890 52.240 805.890 c
h
@@ -29043,10 +28971,10 @@ f
52.240 805.890 m
543.040 805.890 l
545.249 805.890 547.040 804.099 547.040 801.890 c
-547.040 581.530 l
-547.040 579.321 545.249 577.530 543.040 577.530 c
-52.240 577.530 l
-50.031 577.530 48.240 579.321 48.240 581.530 c
+547.040 463.610 l
+547.040 461.401 545.249 459.610 543.040 459.610 c
+52.240 459.610 l
+50.031 459.610 48.240 461.401 48.240 463.610 c
48.240 801.890 l
48.240 804.099 50.031 805.890 52.240 805.890 c
h
@@ -29918,7 +29846,7 @@ ET
BT
345.24 694.625 Td
/F6.0 11 Tf
-<29> Tj
+<20> Tj
ET
0.000 0.000 0.000 SCN
@@ -29927,9 +29855,9 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 679.885 Td
+350.74 694.625 Td
/F6.0 11 Tf
-<ca20202020202020202020202020202020202020> Tj
+<7b> Tj
ET
0.000 0.000 0.000 SCN
@@ -29938,20 +29866,20 @@ ET
0.200 0.200 0.200 SCN
BT
-169.24 679.885 Td
+59.24 679.885 Td
/F6.0 11 Tf
-<2e> Tj
+<ca2020202020202020202020202020202020202020202020> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
BT
-174.74 679.885 Td
+191.24 679.885 Td
/F6.0 11 Tf
-<77697468> Tj
+<404f76657272696465> Tj
ET
0.000 0.000 0.000 SCN
@@ -29960,9 +29888,9 @@ ET
0.200 0.200 0.200 SCN
BT
-196.74 679.885 Td
+59.24 665.145 Td
/F6.0 11 Tf
-<28> Tj
+<ca2020202020202020202020202020202020202020202020> Tj
ET
0.000 0.000 0.000 SCN
@@ -29971,9 +29899,9 @@ ET
0.000 0.400 0.600 SCN
BT
-202.24 679.885 Td
+191.24 665.145 Td
/F6.0 11 Tf
-<6e6577> Tj
+<7075626c6963> Tj
ET
0.000 0.000 0.000 SCN
@@ -29982,20 +29910,20 @@ ET
0.200 0.200 0.200 SCN
BT
-218.74 679.885 Td
+224.24 665.145 Td
/F6.0 11 Tf
<20> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
BT
-224.24 679.885 Td
+229.74 665.145 Td
/F6.0 11 Tf
-<49736973436f6e66696775726174696f6e466f724a646f496e7465675465737473> Tj
+<4d6170> Tj
ET
0.000 0.000 0.000 SCN
@@ -30004,9 +29932,20 @@ ET
0.200 0.200 0.200 SCN
BT
-405.74 679.885 Td
+246.24 665.145 Td
/F6.0 11 Tf
-<28> Tj
+<3c> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
+
+BT
+251.74 665.145 Td
+/F6.0 11 Tf
+<537472696e67> Tj
ET
0.000 0.000 0.000 SCN
@@ -30015,9 +29954,9 @@ ET
0.200 0.200 0.200 SCN
BT
-411.24 679.885 Td
+284.74 665.145 Td
/F6.0 11 Tf
-<29> Tj
+<2c> Tj
ET
0.000 0.000 0.000 SCN
@@ -30026,9 +29965,20 @@ ET
0.200 0.200 0.200 SCN
BT
-416.74 679.885 Td
+290.24 665.145 Td
/F6.0 11 Tf
-<29> Tj
+<20> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
+
+BT
+295.74 665.145 Td
+/F6.0 11 Tf
+<537472696e67> Tj
ET
0.000 0.000 0.000 SCN
@@ -30037,9 +29987,9 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 665.145 Td
+328.74 665.145 Td
/F6.0 11 Tf
-<ca20202020202020202020202020202020202020> Tj
+<3e> Tj
ET
0.000 0.000 0.000 SCN
@@ -30048,9 +29998,9 @@ ET
0.200 0.200 0.200 SCN
BT
-169.24 665.145 Td
+334.24 665.145 Td
/F6.0 11 Tf
-<2e> Tj
+<20> Tj
ET
0.000 0.000 0.000 SCN
@@ -30059,9 +30009,9 @@ ET
0.200 0.200 0.200 SCN
BT
-174.74 665.145 Td
+339.74 665.145 Td
/F6.0 11 Tf
-<6275696c64> Tj
+<676574436f6e66696775726174696f6e50726f70657274696573> Tj
ET
0.000 0.000 0.000 SCN
@@ -30070,7 +30020,7 @@ ET
0.200 0.200 0.200 SCN
BT
-202.24 665.145 Td
+482.74 665.145 Td
/F6.0 11 Tf
<28> Tj
ET
@@ -30081,7 +30031,7 @@ ET
0.200 0.200 0.200 SCN
BT
-207.74 665.145 Td
+488.24 665.145 Td
/F6.0 11 Tf
<29> Tj
ET
@@ -30092,9 +30042,9 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 650.405 Td
+493.74 665.145 Td
/F6.0 11 Tf
-<ca20202020202020202020202020202020202020> Tj
+<20> Tj
ET
0.000 0.000 0.000 SCN
@@ -30103,9 +30053,9 @@ ET
0.200 0.200 0.200 SCN
BT
-169.24 650.405 Td
+499.24 665.145 Td
/F6.0 11 Tf
-<2e> Tj
+<7b> Tj
ET
0.000 0.000 0.000 SCN
@@ -30114,20 +30064,20 @@ ET
0.200 0.200 0.200 SCN
BT
-174.74 650.405 Td
+59.24 650.405 Td
/F6.0 11 Tf
-<736574557053797374656d> Tj
+<ca202020202020202020202020202020202020202020202020202020> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
-235.24 650.405 Td
+213.24 650.405 Td
/F6.0 11 Tf
-<28> Tj
+<66696e616c> Tj
ET
0.000 0.000 0.000 SCN
@@ -30138,18 +30088,18 @@ ET
BT
240.74 650.405 Td
/F6.0 11 Tf
-<29> Tj
+<20> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
BT
246.24 650.405 Td
/F6.0 11 Tf
-<3b> Tj
+<4d6170> Tj
ET
0.000 0.000 0.000 SCN
@@ -30158,20 +30108,20 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 635.665 Td
+262.74 650.405 Td
/F6.0 11 Tf
-<ca2020202020202020202020> Tj
+<3c> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
BT
-125.24000000000001 635.665 Td
+268.24 650.405 Td
/F6.0 11 Tf
-<4973697353797374656d466f7254657374> Tj
+<537472696e67> Tj
ET
0.000 0.000 0.000 SCN
@@ -30180,9 +30130,9 @@ ET
0.200 0.200 0.200 SCN
BT
-218.74 635.665 Td
+301.24 650.405 Td
/F6.0 11 Tf
-<2e> Tj
+<2c> Tj
ET
0.000 0.000 0.000 SCN
@@ -30191,20 +30141,20 @@ ET
0.200 0.200 0.200 SCN
BT
-224.24 635.665 Td
+306.74 650.405 Td
/F6.0 11 Tf
-<736574> Tj
+<20> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
BT
-240.74 635.665 Td
+312.24 650.405 Td
/F6.0 11 Tf
-<28> Tj
+<537472696e67> Tj
ET
0.000 0.000 0.000 SCN
@@ -30213,9 +30163,9 @@ ET
0.200 0.200 0.200 SCN
BT
-246.24 635.665 Td
+345.24 650.405 Td
/F6.0 11 Tf
-<69736674> Tj
+<3e> Tj
ET
0.000 0.000 0.000 SCN
@@ -30224,9 +30174,9 @@ ET
0.200 0.200 0.200 SCN
BT
-268.24 635.665 Td
+350.74 650.405 Td
/F6.0 11 Tf
-<29> Tj
+<20> Tj
ET
0.000 0.000 0.000 SCN
@@ -30235,9 +30185,9 @@ ET
0.200 0.200 0.200 SCN
BT
-273.74 635.665 Td
+356.24 650.405 Td
/F6.0 11 Tf
-<3b> Tj
+<6d6170> Tj
ET
0.000 0.000 0.000 SCN
@@ -30246,9 +30196,9 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 620.925 Td
+372.74 650.405 Td
/F6.0 11 Tf
-<ca20202020202020> Tj
+<20> Tj
ET
0.000 0.000 0.000 SCN
@@ -30257,9 +30207,9 @@ ET
0.200 0.200 0.200 SCN
BT
-103.24000000000001 620.925 Td
+378.24 650.405 Td
/F6.0 11 Tf
-<7d> Tj
+<3d> Tj
ET
0.000 0.000 0.000 SCN
@@ -30268,9 +30218,9 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 606.185 Td
+383.74 650.405 Td
/F6.0 11 Tf
-<ca202020> Tj
+<20> Tj
ET
0.000 0.000 0.000 SCN
@@ -30279,9 +30229,9 @@ ET
0.200 0.200 0.200 SCN
BT
-81.24000000000001 606.185 Td
+389.24 650.405 Td
/F6.0 11 Tf
-<7d> Tj
+<4d617073> Tj
ET
0.000 0.000 0.000 SCN
@@ -30290,9 +30240,9 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 591.4449999999999 Td
+411.24 650.405 Td
/F6.0 11 Tf
-<7d> Tj
+<2e> Tj
ET
0.000 0.000 0.000 SCN
@@ -30301,20 +30251,20 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24 553.566 Td
-/F1.0 10.5 Tf
-<776865726520> Tj
+416.74 650.405 Td
+/F6.0 11 Tf
+<6e6577486173684d6170> 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
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
-82.8375 553.566 Td
-/F6.0 10.5 Tf
-<446f6d61696e4170704170704d616e6966657374> Tj
+471.74 650.405 Td
+/F6.0 11 Tf
+<28> Tj
ET
0.000 0.000 0.000 SCN
@@ -30323,47 +30273,20 @@ ET
0.200 0.200 0.200 SCN
BT
-187.8375 553.566 Td
-/F1.0 10.5 Tf
-<20696e207475726e20697320646566696e65642061733a> Tj
+477.24 650.405 Td
+/F6.0 11 Tf
+<29> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-q
-0.961 0.961 0.961 scn
-52.240 537.750 m
-543.040 537.750 l
-545.249 537.750 547.040 535.959 547.040 533.750 c
-547.040 357.610 l
-547.040 355.401 545.249 353.610 543.040 353.610 c
-52.240 353.610 l
-50.031 353.610 48.240 355.401 48.240 357.610 c
-48.240 533.750 l
-48.240 535.959 50.031 537.750 52.240 537.750 c
-h
-f
-0.800 0.800 0.800 SCN
-0.75 w
-52.240 537.750 m
-543.040 537.750 l
-545.249 537.7
<TRUNCATED>
[10/10] isis-site git commit: ISIS-1521: docs
Posted by da...@apache.org.
ISIS-1521: docs
Project: http://git-wip-us.apache.org/repos/asf/isis-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis-site/commit/8b42f65e
Tree: http://git-wip-us.apache.org/repos/asf/isis-site/tree/8b42f65e
Diff: http://git-wip-us.apache.org/repos/asf/isis-site/diff/8b42f65e
Branch: refs/heads/asf-site
Commit: 8b42f65e3995cc5fa86f7776e30b19fc6bb7af8a
Parents: 3921d6e
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Sun Aug 6 19:48:14 2017 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Sun Aug 6 19:48:14 2017 +0100
----------------------------------------------------------------------
content/elasticlunr/index.json | 2 +-
content/guides/rgcms/rgcms.html | 234 +-
content/guides/rgcms/rgcms.pdf | 17471 ++++-----
content/guides/rgsvc/rgsvc.html | 227 +-
content/guides/rgsvc/rgsvc.pdf | 39682 +++++++++++---------
content/guides/ugtst/ugtst.html | 922 +-
content/guides/ugtst/ugtst.pdf | 18955 ++++++----
content/migration-notes/migration-notes.html | 143 +-
content/release-notes/release-notes.html | 472 +-
9 files changed, 42248 insertions(+), 35860 deletions(-)
----------------------------------------------------------------------
[07/10] isis-site git commit: ISIS-1521: docs
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/8b42f65e/content/guides/rgcms/rgcms.pdf
----------------------------------------------------------------------
diff --git a/content/guides/rgcms/rgcms.pdf b/content/guides/rgcms/rgcms.pdf
index fc863f5..a7bf15a 100644
--- a/content/guides/rgcms/rgcms.pdf
+++ b/content/guides/rgcms/rgcms.pdf
@@ -4,16 +4,16 @@
<< /Title (Classes, Methods and Schema)
/Creator (Asciidoctor PDF 1.5.0.alpha.11, based on Prawn 1.3.0)
/Producer (Asciidoctor PDF 1.5.0.alpha.11, based on Prawn 1.3.0)
-/CreationDate (D:20170801163739+01'00')
-/ModDate (D:20170801163739+01'00')
+/CreationDate (D:20170806194519+01'00')
+/ModDate (D:20170806194519+01'00')
>>
endobj
2 0 obj
<< /Type /Catalog
/Pages 3 0 R
/Names 14 0 R
-/Outlines 1032 0 R
-/PageLabels 1061 0 R
+/Outlines 1034 0 R
+/PageLabels 1063 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 94
-/Kids [7 0 R 10 0 R 12 0 R 39 0 R 62 0 R 127 0 R 150 0 R 155 0 R 163 0 R 168 0 R 172 0 R 177 0 R 187 0 R 191 0 R 194 0 R 204 0 R 209 0 R 216 0 R 223 0 R 240 0 R 243 0 R 247 0 R 260 0 R 291 0 R 299 0 R 308 0 R 311 0 R 327 0 R 337 0 R 347 0 R 356 0 R 374 0 R 402 0 R 420 0 R 423 0 R 435 0 R 442 0 R 450 0 R 455 0 R 458 0 R 464 0 R 492 0 R 506 0 R 529 0 R 548 0 R 560 0 R 566 0 R 572 0 R 579 0 R 585 0 R 594 0 R 601 0 R 611 0 R 621 0 R 637 0 R 654 0 R 668 0 R 684 0 R 701 0 R 710 0 R 713 0 R 717 0 R 725 0 R 729 0 R 736 0 R 739 0 R 747 0 R 754 0 R 764 0 R 778 0 R 789 0 R 803 0 R 823 0 R 832 0 R 846 0 R 865 0 R 869 0 R 882 0 R 887 0 R 891 0 R 898 0 R 905 0 R 912 0 R 918 0 R 922 0 R 929 0 R 934 0 R 940 0 R 945 0 R 948 0 R 955 0 R 961 0 R 967 0 R 970 0 R]
+/Count 95
+/Kids [7 0 R 10 0 R 12 0 R 39 0 R 62 0 R 127 0 R 150 0 R 155 0 R 163 0 R 168 0 R 172 0 R 177 0 R 187 0 R 191 0 R 194 0 R 204 0 R 209 0 R 216 0 R 223 0 R 240 0 R 243 0 R 247 0 R 260 0 R 291 0 R 299 0 R 308 0 R 311 0 R 327 0 R 337 0 R 347 0 R 356 0 R 374 0 R 402 0 R 420 0 R 423 0 R 432 0 R 440 0 R 449 0 R 454 0 R 460 0 R 462 0 R 471 0 R 504 0 R 523 0 R 542 0 R 556 0 R 566 0 R 568 0 R 574 0 R 581 0 R 587 0 R 596 0 R 603 0 R 613 0 R 623 0 R 639 0 R 656 0 R 670 0 R 686 0 R 703 0 R 712 0 R 715 0 R 719 0 R 727 0 R 731 0 R 738 0 R 741 0 R 750 0 R 757 0 R 767 0 R 781 0 R 792 0 R 806 0 R 824 0 R 833 0 R 847 0 R 866 0 R 870 0 R 883 0 R 888 0 R 892 0 R 899 0 R 906 0 R 913 0 R 919 0 R 923 0 R 931 0 R 936 0 R 942 0 R 947 0 R 950 0 R 957 0 R 963 0 R 969 0 R 972 0 R]
>>
endobj
4 0 obj
@@ -80,11 +80,11 @@ endobj
<< /Type /Font
/BaseFont /AAAABE+NotoSerif
/Subtype /TrueType
-/FontDescriptor 1063 0 R
+/FontDescriptor 1065 0 R
/FirstChar 32
/LastChar 255
-/Widths 1065 0 R
-/ToUnicode 1064 0 R
+/Widths 1067 0 R
+/ToUnicode 1066 0 R
>>
endobj
9 0 obj
@@ -562,7 +562,7 @@ ET
BT
535.3009999999999 567.0559999999998 Td
/F1.0 10.5 Tf
-<3438> Tj
+<3439> Tj
ET
0.000 0.000 0.000 SCN
@@ -602,7 +602,7 @@ ET
BT
535.3009999999999 548.5759999999998 Td
/F1.0 10.5 Tf
-<3532> Tj
+<3533> Tj
ET
0.000 0.000 0.000 SCN
@@ -642,7 +642,7 @@ ET
BT
535.3009999999999 530.0959999999998 Td
/F1.0 10.5 Tf
-<3537> Tj
+<3538> Tj
ET
0.000 0.000 0.000 SCN
@@ -682,7 +682,7 @@ ET
BT
535.3009999999999 511.6159999999998 Td
/F1.0 10.5 Tf
-<3630> Tj
+<3631> Tj
ET
0.000 0.000 0.000 SCN
@@ -722,7 +722,7 @@ ET
BT
535.3009999999999 493.1359999999998 Td
/F1.0 10.5 Tf
-<3634> Tj
+<3635> Tj
ET
0.000 0.000 0.000 SCN
@@ -762,7 +762,7 @@ ET
BT
535.3009999999999 474.6559999999998 Td
/F1.0 10.5 Tf
-<3636> Tj
+<3637> Tj
ET
0.000 0.000 0.000 SCN
@@ -802,7 +802,7 @@ ET
BT
535.3009999999999 456.17599999999976 Td
/F1.0 10.5 Tf
-<3636> Tj
+<3637> Tj
ET
0.000 0.000 0.000 SCN
@@ -842,7 +842,7 @@ ET
BT
535.3009999999999 437.69599999999974 Td
/F1.0 10.5 Tf
-<3637> Tj
+<3638> Tj
ET
0.000 0.000 0.000 SCN
@@ -882,7 +882,7 @@ ET
BT
535.3009999999999 419.2159999999997 Td
/F1.0 10.5 Tf
-<3639> Tj
+<3730> Tj
ET
0.000 0.000 0.000 SCN
@@ -922,7 +922,7 @@ ET
BT
535.3009999999999 400.7359999999997 Td
/F1.0 10.5 Tf
-<3732> Tj
+<3733> Tj
ET
0.000 0.000 0.000 SCN
@@ -962,7 +962,7 @@ ET
BT
535.3009999999999 382.2559999999997 Td
/F1.0 10.5 Tf
-<3735> Tj
+<3736> Tj
ET
0.000 0.000 0.000 SCN
@@ -1002,7 +1002,7 @@ ET
BT
535.3009999999999 363.77599999999967 Td
/F1.0 10.5 Tf
-<3735> Tj
+<3736> Tj
ET
0.000 0.000 0.000 SCN
@@ -1042,7 +1042,7 @@ ET
BT
535.3009999999999 345.29599999999965 Td
/F1.0 10.5 Tf
-<3738> Tj
+<3739> Tj
ET
0.000 0.000 0.000 SCN
@@ -1082,7 +1082,7 @@ ET
BT
535.3009999999999 326.81599999999963 Td
/F1.0 10.5 Tf
-<3833> Tj
+<3834> Tj
ET
0.000 0.000 0.000 SCN
@@ -1122,7 +1122,7 @@ ET
BT
535.3009999999999 308.3359999999996 Td
/F1.0 10.5 Tf
-<3835> Tj
+<3836> Tj
ET
0.000 0.000 0.000 SCN
@@ -1162,7 +1162,7 @@ ET
BT
535.3009999999999 289.8559999999996 Td
/F1.0 10.5 Tf
-<3838> Tj
+<3839> Tj
ET
0.000 0.000 0.000 SCN
@@ -1182,7 +1182,7 @@ endobj
/F3.0 18 0 R
>>
>>
-/Annots [977 0 R 978 0 R 979 0 R 980 0 R 981 0 R 982 0 R 983 0 R 984 0 R 985 0 R 986 0 R 987 0 R 988 0 R 989 0 R 990 0 R 991 0 R 992 0 R 993 0 R 994 0 R 995 0 R 996 0 R 997 0 R 998 0 R 999 0 R 1000 0 R 1001 0 R 1002 0 R 1003 0 R 1004 0 R 1005 0 R 1006 0 R 1007 0 R 1008 0 R 1009 0 R 1010 0 R 1011 0 R 1012 0 R 1013 0 R 1014 0 R 1015 0 R 1016 0 R 1017 0 R 1018 0 R 1019 0 R 1020 0 R 1021 0 R 1022 0 R 1023 0 R 1024 0 R 1025 0 R 1026 0 R 1027 0 R 1028 0 R 1029 0 R 1030 0 R]
+/Annots [979 0 R 980 0 R 981 0 R 982 0 R 983 0 R 984 0 R 985 0 R 986 0 R 987 0 R 988 0 R 989 0 R 990 0 R 991 0 R 992 0 R 993 0 R 994 0 R 995 0 R 996 0 R 997 0 R 998 0 R 999 0 R 1000 0 R 1001 0 R 1002 0 R 1003 0 R 1004 0 R 1005 0 R 1006 0 R 1007 0 R 1008 0 R 1009 0 R 1010 0 R 1011 0 R 1012 0 R 1013 0 R 1014 0 R 1015 0 R 1016 0 R 1017 0 R 1018 0 R 1019 0 R 1020 0 R 1021 0 R 1022 0 R 1023 0 R 1024 0 R 1025 0 R 1026 0 R 1027 0 R 1028 0 R 1029 0 R 1030 0 R 1031 0 R 1032 0 R]
>>
endobj
11 0 obj
@@ -1989,7 +1989,7 @@ endobj
/F3.0 18 0 R
/F4.0 19 0 R
>>
-/XObject << /Stamp1 1031 0 R
+/XObject << /Stamp1 1033 0 R
>>
>>
/Annots [17 0 R 20 0 R 21 0 R 23 0 R 24 0 R 25 0 R 26 0 R 27 0 R 28 0 R 29 0 R 30 0 R 31 0 R 32 0 R 33 0 R 34 0 R 35 0 R 36 0 R 37 0 R]
@@ -2004,18 +2004,18 @@ endobj
>>
endobj
15 0 obj
-<< /Kids [220 0 R 972 0 R 844 0 R 697 0 R 819 0 R 539 0 R 722 0 R 425 0 R 221 0 R 938 0 R 287 0 R 807 0 R 448 0 R 815 0 R]
+<< /Kids [220 0 R 464 0 R 974 0 R 845 0 R 699 0 R 820 0 R 539 0 R 724 0 R 425 0 R 221 0 R 940 0 R 287 0 R 929 0 R 748 0 R]
>>
endobj
16 0 obj
<< /Type /Font
/BaseFont /AAAABF+NotoSerif-Bold
/Subtype /TrueType
-/FontDescriptor 1067 0 R
+/FontDescriptor 1069 0 R
/FirstChar 32
/LastChar 255
-/Widths 1069 0 R
-/ToUnicode 1068 0 R
+/Widths 1071 0 R
+/ToUnicode 1070 0 R
>>
endobj
17 0 obj
@@ -2033,22 +2033,22 @@ endobj
<< /Type /Font
/BaseFont /AAAABG+mplus1mn-regular
/Subtype /TrueType
-/FontDescriptor 1071 0 R
+/FontDescriptor 1073 0 R
/FirstChar 32
/LastChar 255
-/Widths 1073 0 R
-/ToUnicode 1072 0 R
+/Widths 1075 0 R
+/ToUnicode 1074 0 R
>>
endobj
19 0 obj
<< /Type /Font
/BaseFont /AAAABH+mplus-1p-regular
/Subtype /TrueType
-/FontDescriptor 1075 0 R
+/FontDescriptor 1077 0 R
/FirstChar 32
/LastChar 255
-/Widths 1077 0 R
-/ToUnicode 1076 0 R
+/Widths 1079 0 R
+/ToUnicode 1078 0 R
>>
endobj
20 0 obj
@@ -3790,7 +3790,7 @@ endobj
/F6.0 44 0 R
/F4.0 19 0 R
>>
-/XObject << /Stamp1 1031 0 R
+/XObject << /Stamp1 1033 0 R
>>
>>
/Annots [41 0 R 45 0 R 46 0 R 47 0 R 48 0 R 49 0 R 50 0 R 51 0 R 52 0 R 53 0 R 54 0 R 55 0 R 56 0 R 57 0 R 58 0 R 59 0 R 60 0 R]
@@ -3817,22 +3817,22 @@ endobj
<< /Type /Font
/BaseFont /AAAABI+FontAwesome
/Subtype /TrueType
-/FontDescriptor 1079 0 R
+/FontDescriptor 1081 0 R
/FirstChar 32
/LastChar 255
-/Widths 1081 0 R
-/ToUnicode 1080 0 R
+/Widths 1083 0 R
+/ToUnicode 1082 0 R
>>
endobj
44 0 obj
<< /Type /Font
/BaseFont /AAAABJ+NotoSerif-Italic
/Subtype /TrueType
-/FontDescriptor 1083 0 R
+/FontDescriptor 1085 0 R
/FirstChar 32
/LastChar 255
-/Widths 1085 0 R
-/ToUnicode 1084 0 R
+/Widths 1087 0 R
+/ToUnicode 1086 0 R
>>
endobj
45 0 obj
@@ -8015,7 +8015,7 @@ endobj
/F4.0 19 0 R
/F1.0 8 0 R
>>
-/XObject << /Stamp1 1031 0 R
+/XObject << /Stamp1 1033 0 R
>>
>>
/Annots [63 0 R 64 0 R 65 0 R 66 0 R 67 0 R 68 0 R 69 0 R 70 0 R 71 0 R 72 0 R 73 0 R 74 0 R 75 0 R 76 0 R 77 0 R 78 0 R 79 0 R 80 0 R 81 0 R 82 0 R 83 0 R 84 0 R 85 0 R 86 0 R 87 0 R 88 0 R 89 0 R 90 0 R 91 0 R 92 0 R 93 0 R 94 0 R 95 0 R 96 0 R 97 0 R 98 0 R 99 0 R 100 0 R 101 0 R 102 0 R 103 0 R 104 0 R 105 0 R 106 0 R 107 0 R 108 0 R 109 0 R 110 0 R 111 0 R 112 0 R 113 0 R 114 0 R 115 0 R 116 0 R 117 0 R 118 0 R 119 0 R 120 0 R 121 0 R 122 0 R 123 0 R 124 0 R 125 0 R]
@@ -11463,7 +11463,7 @@ endobj
/F5.1 43 0 R
/F3.1 141 0 R
>>
-/XObject << /Stamp1 1031 0 R
+/XObject << /Stamp1 1033 0 R
>>
>>
/Annots [128 0 R 129 0 R 130 0 R 131 0 R 132 0 R 133 0 R 134 0 R 135 0 R 136 0 R 137 0 R 138 0 R 140 0 R 142 0 R 143 0 R 144 0 R 146 0 R 147 0 R 148 0 R]
@@ -11608,11 +11608,11 @@ endobj
<< /Type /Font
/BaseFont /AAAABK+mplus1mn-regular
/Subtype /TrueType
-/FontDescriptor 1087 0 R
+/FontDescriptor 1089 0 R
/FirstChar 32
/LastChar 255
-/Widths 1089 0 R
-/ToUnicode 1088 0 R
+/Widths 1091 0 R
+/ToUnicode 1090 0 R
>>
endobj
142 0 obj
@@ -14702,7 +14702,7 @@ endobj
/F3.0 18 0 R
/F3.1 141 0 R
>>
-/XObject << /Stamp1 1031 0 R
+/XObject << /Stamp1 1033 0 R
>>
>>
/Annots [152 0 R]
@@ -16271,7 +16271,7 @@ endobj
/F4.0 19 0 R
/F6.0 44 0 R
>>
-/XObject << /Stamp1 1031 0 R
+/XObject << /Stamp1 1033 0 R
>>
>>
/Annots [156 0 R 158 0 R 159 0 R 160 0 R]
@@ -18602,7 +18602,7 @@ endobj
/F2.0 16 0 R
/F1.0 8 0 R
>>
-/XObject << /Stamp1 1031 0 R
+/XObject << /Stamp1 1033 0 R
>>
>>
/Annots [165 0 R]
@@ -20762,7 +20762,7 @@ endobj
/Contents 167 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/XObject << /I1 166 0 R
-/Stamp1 1031 0 R
+/Stamp1 1033 0 R
>>
/Font << /F1.0 8 0 R
/F3.0 18 0 R
@@ -23299,7 +23299,7 @@ endobj
/F4.0 19 0 R
/F1.1 175 0 R
>>
-/XObject << /Stamp1 1031 0 R
+/XObject << /Stamp1 1033 0 R
>>
>>
>>
@@ -23314,11 +23314,11 @@ endobj
<< /Type /Font
/BaseFont /AAAABL+NotoSerif
/Subtype /TrueType
-/FontDescriptor 1091 0 R
+/FontDescriptor 1093 0 R
/FirstChar 32
/LastChar 255
-/Widths 1093 0 R
-/ToUnicode 1092 0 R
+/Widths 1095 0 R
+/ToUnicode 1094 0 R
>>
endobj
176 0 obj
@@ -25379,7 +25379,7 @@ endobj
/F1.1 175 0 R
/F6.0 44 0 R
>>
-/XObject << /Stamp1 1031 0 R
+/XObject << /Stamp1 1033 0 R
>>
>>
/Annots [178 0 R 179 0 R 180 0 R 182 0 R 183 0 R 184 0 R]
@@ -27838,7 +27838,7 @@ endobj
/F3.1 141 0 R
/F1.0 8 0 R
>>
-/XObject << /Stamp1 1031 0 R
+/XObject << /Stamp1 1033 0 R
>>
>>
/Annots [188 0 R 189 0 R]
@@ -31082,7 +31082,7 @@ endobj
/F1.0 8 0 R
/F2.0 16 0 R
>>
-/XObject << /Stamp1 1031 0 R
+/XObject << /Stamp1 1033 0 R
>>
>>
>>
@@ -32070,7 +32070,7 @@ endobj
/F4.0 19 0 R
/F5.1 43 0 R
>>
-/XObject << /Stamp1 1031 0 R
+/XObject << /Stamp1 1033 0 R
>>
>>
/Annots [196 0 R 197 0 R 198 0 R 199 0 R 201 0 R 202 0 R]
@@ -34654,7 +34654,7 @@ endobj
/F2.0 16 0 R
/F4.0 19 0 R
>>
-/XObject << /Stamp1 1031 0 R
+/XObject << /Stamp1 1033 0 R
>>
>>
/Annots [205 0 R 206 0 R]
@@ -36371,7 +36371,7 @@ endobj
/F4.0 19 0 R
/F2.0 16 0 R
>>
-/XObject << /Stamp1 1031 0 R
+/XObject << /Stamp1 1033 0 R
>>
>>
/Annots [210 0 R 211 0 R 212 0 R 214 0 R]
@@ -39249,7 +39249,7 @@ endobj
/F1.1 175 0 R
/F3.1 141 0 R
>>
-/XObject << /Stamp1 1031 0 R
+/XObject << /Stamp1 1033 0 R
>>
>>
/Annots [217 0 R 218 0 R]
@@ -39281,8 +39281,8 @@ endobj
[216 0 R /XYZ 0 466.25 null]
endobj
220 0 obj
-<< /Limits [(__rgcms) (__rgcms_schema-cmd_commandDto)]
-/Names [(__rgcms) 13 0 R (__rgcms_classes_layout_component) 856 0 R (__rgcms_classes_layout_grid-bootstrap3) 861 0 R (__rgcms_classes_mixins_Object_clearHints) 795 0 R (__rgcms_classes_mixins_Object_downloadLayoutXml) 800 0 R (__rgcms_classes_mixins_Object_rebuildMetamodel) 811 0 R (__rgcms_classes_mixins_Persistable_datanucleusXxx) 840 0 R (__rgcms_classes_mixins_Persistable_downloadJdoMetadata) 833 0 R (__rgcms_schema-cmd_ancillary) 893 0 R (__rgcms_schema-cmd_commandDto) 880 0 R]
+<< /Limits [(__rgcms) (__rgcms_classes_AppManifest-bootstrapping_bootstrapping_AppManifestAbstract)]
+/Names [(__rgcms) 13 0 R (__rgcms_classes_AppManifest-bootstrapping_api) 430 0 R (__rgcms_classes_AppManifest-bootstrapping_api_getAdditionalServices) 438 0 R (__rgcms_classes_AppManifest-bootstrapping_api_getAuthenticationMechanism) 443 0 R (__rgcms_classes_AppManifest-bootstrapping_api_getAuthorizationMechanism) 445 0 R (__rgcms_classes_AppManifest-bootstrapping_api_getConfigurationProperties) 450 0 R (__rgcms_classes_AppManifest-bootstrapping_api_getFixtures) 447 0 R (__rgcms_classes_AppManifest-bootstrapping_api_getModules) 433 0 R (__rgcms_classes_AppManifest-bootstrapping_bootstrapping) 451 0 R (__rgcms_classes_AppManifest-bootstrapping_bootstrapping_AppManifestAbstract) 457 0 R]
>>
endobj
221 0 obj
@@ -41444,7 +41444,7 @@ endobj
/F5.1 43 0 R
/F6.0 44 0 R
>>
-/XObject << /Stamp1 1031 0 R
+/XObject << /Stamp1 1033 0 R
>>
>>
/Annots [224 0 R 225 0 R 226 0 R 228 0 R 229 0 R 230 0 R 231 0 R 233 0 R 234 0 R 235 0 R 237 0 R]
@@ -43735,7 +43735,7 @@ endobj
/F1.0 8 0 R
/F2.0 16 0 R
>>
-/XObject << /Stamp1 1031 0 R
+/XObject << /Stamp1 1033 0 R
>>
>>
>>
@@ -46731,7 +46731,7 @@ endobj
/F1.0 8 0 R
/F4.0 19 0 R
>>
-/XObject << /Stamp1 1031 0 R
+/XObject << /Stamp1 1033 0 R
>>
>>
>>
@@ -49103,7 +49103,7 @@ endobj
/F4.0 19 0 R
/F2.0 16 0 R
>>
-/XObject << /Stamp1 1031 0 R
+/XObject << /Stamp1 1033 0 R
>>
>>
/Annots [248 0 R 249 0 R 250 0 R 251 0 R 252 0 R 253 0 R 254 0 R 255 0 R 257 0 R 258 0 R]
@@ -51665,7 +51665,7 @@ endobj
/F2.0 16 0 R
/F6.0 44 0 R
>>
-/XObject << /Stamp1 1031 0 R
+/XObject << /Stamp1 1033 0 R
>>
>>
/Annots [261 0 R 262 0 R 263 0 R 264 0 R 265 0 R 266 0 R 268 0 R 269 0 R 270 0 R 271 0 R 272 0 R 273 0 R 274 0 R 275 0 R 276 0 R 277 0 R 278 0 R 279 0 R 280 0 R 281 0 R 282 0 R 283 0 R 284 0 R 285 0 R 288 0 R 289 0 R]
@@ -51943,7 +51943,7 @@ endobj
endobj
287 0 obj
<< /Limits [(action-parameter-set) (api-3)]
-/Names [(action-parameter-set) 241 0 R (adapter-classes) 750 0 R (alternative-approaches) 781 0 R (alternatives) 195 0 R (alternatives-2) 306 0 R (alternatives-3) 329 0 R (alternatives-4) 790 0 R (api) 430 0 R (api-2) 564 0 R (api-3) 570 0 R]
+/Names [(action-parameter-set) 241 0 R (adapter-classes) 753 0 R (alternative-approaches) 784 0 R (alternatives) 195 0 R (alternatives-2) 306 0 R (alternatives-3) 329 0 R (alternatives-4) 793 0 R (api) 564 0 R (api-2) 572 0 R (api-3) 582 0 R]
>>
endobj
288 0 obj
@@ -53004,7 +53004,7 @@ endobj
/F3.0 18 0 R
>>
/XObject << /I2 293 0 R
-/Stamp1 1031 0 R
+/Stamp1 1033 0 R
>>
>>
/Annots [292 0 R 294 0 R 295 0 R 296 0 R 297 0 R]
@@ -55385,7 +55385,7 @@ endobj
/F4.0 19 0 R
/F1.1 175 0 R
>>
-/XObject << /Stamp1 1031 0 R
+/XObject << /Stamp1 1033 0 R
>>
>>
/Annots [301 0 R 302 0 R 303 0 R 304 0 R 305 0 R]
@@ -57875,7 +57875,7 @@ endobj
/F1.0 8 0 R
/F2.0 16 0 R
>>
-/XObject << /Stamp1 1031 0 R
+/XObject << /Stamp1 1033 0 R
>>
>>
>>
@@ -59204,7 +59204,7 @@ endobj
/F5.1 43 0 R
/F4.0 19 0 R
>>
-/XObject << /Stamp1 1031 0 R
+/XObject << /Stamp1 1033 0 R
>>
>>
/Annots [312 0 R 313 0 R 314 0 R 315 0 R 316 0 R 319 0 R 320 0 R 321 0 R 323 0 R 324 0 R 325 0 R]
@@ -60702,7 +60702,7 @@ endobj
/F1.1 175 0 R
>>
/XObject << /I3 334 0 R
-/Stamp1 1031 0 R
+/Stamp1 1033 0 R
>>
>>
/Annots [328 0 R 330 0 R 332 0 R 333 0 R 335 0 R]
@@ -62008,7 +62008,7 @@ endobj
/F6.0 44 0 R
>>
/XObject << /I4 338 0 R
-/Stamp1 1031 0 R
+/Stamp1 1033 0 R
>>
>>
/Annots [340 0 R 341 0 R 342 0 R 344 0 R 345 0 R]
@@ -64437,7 +64437,7 @@ endobj
/F5.1 43 0 R
/F6.0 44 0 R
>>
-/XObject << /Stamp1 1031 0 R
+/XObject << /Stamp1 1033 0 R
>>
>>
/Annots [348 0 R 349 0 R 350 0 R 351 0 R 352 0 R 354 0 R]
@@ -66130,7 +66130,7 @@ endobj
/F6.0 44 0 R
/F3.0 18 0 R
>>
-/XObject << /Stamp1 1031 0 R
+/XObject << /Stamp1 1033 0 R
>>
>>
/Annots [358 0 R 359 0 R 360 0 R 361 0 R 362 0 R 363 0 R 364 0 R 365 0 R 366 0 R 367 0 R 368 0 R 369 0 R 370 0 R 371 0 R 372 0 R]
@@ -67441,7 +67441,7 @@ endobj
/F1.0 8 0 R
/F5.1 43 0 R
>>
-/XObject << /Stamp1 1031 0 R
+/XObject << /Stamp1 1033 0 R
>>
>>
/Annots [376 0 R 377 0 R 378 0 R 379 0 R 381 0 R 382 0 R 383 0 R 385 0 R 386 0 R 387 0 R 388 0 R 390 0 R 391 0 R 392 0 R 393 0 R 395 0 R 396 0 R 397 0 R 398 0 R 400 0 R]
@@ -68398,7 +68398,7 @@ endobj
/F3.0 18 0 R
/F2.0 16 0 R
>>
-/XObject << /Stamp1 1031 0 R
+/XObject << /Stamp1 1033 0 R
>>
>>
/Annots [403 0 R 404 0 R 405 0 R 407 0 R 408 0 R 409 0 R 410 0 R 412 0 R 413 0 R 414 0 R 415 0 R 417 0 R 418 0 R]
@@ -70620,7 +70620,7 @@ endobj
/F3.1 141 0 R
/F1.0 8 0 R
>>
-/XObject << /Stamp1 1031 0 R
+/XObject << /Stamp1 1033 0 R
>>
>>
/Annots [421 0 R]
@@ -70638,7 +70638,7 @@ endobj
>>
endobj
422 0 obj
-<< /Length 31696
+<< /Length 31990
>>
stream
q
@@ -70836,11 +70836,194 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
+q
+0.5 w
+0.933 0.933 0.933 SCN
+113.807 566.850 m
+113.807 637.970 l
+S
+Q
+0.067 0.067 0.067 scn
+0.067 0.067 0.067 SCN
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.067 0.067 0.067 scn
+0.067 0.067 0.067 SCN
+
+BT
+80.17133333333334 593.8300000000003 Td
+/F5.1 24 Tf
+<22> 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
+7.090 Tw
+
BT
-48.24 619.2860000000003 Td
+125.80666666666667 622.0060000000002 Td
+/F1.0 10.5 Tf
+<284173206f6620> 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.090 Tw
+
+BT
+171.13034613715277 622.0060000000002 Td
+/F3.0 10.5 Tf
+<312e31352e302d534e415053484f54> 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
+
+7.090 Tw
+
+BT
+249.88034613715277 622.0060000000002 Td
+/F1.0 10.5 Tf
+[<292c20746865206672> 20.01953125 <616d65776f726b2d70726f766964656420>] 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.090 Tw
+
+BT
+406.3701602647569 622.0060000000002 Td
+/F3.0 10.5 Tf
+<4170704d616e69666573744162737472616374> 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
+
+7.090 Tw
+
+BT
+506.1201602647569 622.0060000000002 Td
+/F1.0 10.5 Tf
+<20616e64> Tj
+ET
+
+
+0.000 Tw
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
+
+1.627 Tw
+
+BT
+125.80666666666667 606.2260000000002 Td
+/F3.0 10.5 Tf
+<4170704d616e696665737441627374726163742e4275696c646572> 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.627 Tw
+
+BT
+267.5566666666667 606.2260000000002 Td
+/F1.0 10.5 Tf
+[<206d616b> 20.01953125 <65206974206561737920746f20777269746520>] TJ
+ET
+
+
+0.000 Tw
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
+
+1.627 Tw
+
+BT
+386.61358463541666 606.2260000000002 Td
+/F3.0 10.5 Tf
+<4170704d616e6966657374> 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.627 Tw
+
+BT
+444.36358463541666 606.2260000000002 Td
+/F1.0 10.5 Tf
+<20746861742063616e2062652075736564> Tj
+ET
+
+
+0.000 Tw
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+2.535 Tw
+
+BT
+125.80666666666667 590.4460000000003 Td
+/F1.0 10.5 Tf
+[<626f746820746f20626f6f74737472> 20.01953125 <617020746865206170706c69636174696f6e202270726f706572222c20616e6420746f20626520747765616b> 20.01953125 <656420666f72207573652077697468696e>] 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
+125.80666666666667 574.6660000000003 Td
+/F1.0 10.5 Tf
+[<696e74656772> 20.01953125 <6174696f6e2074657374732e>] 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 536.1660000000003 Td
/F2.0 13 Tf
<332e312e312e20415049> Tj
ET
@@ -70853,7 +71036,7 @@ ET
6.316 Tw
BT
-48.24 592.7260000000003 Td
+48.24000000000001 509.6060000000004 Td
/F1.0 10.5 Tf
<54686520> Tj
ET
@@ -70868,7 +71051,7 @@ ET
6.316 Tw
BT
-75.97554166666666 592.7260000000003 Td
+75.97554166666667 509.6060000000004 Td
/F3.0 10.5 Tf
<4170704d616e6966657374> Tj
ET
@@ -70883,7 +71066,7 @@ ET
6.316 Tw
BT
-133.7255416666667 592.7260000000003 Td
+133.7255416666667 509.6060000000004 Td
/F1.0 10.5 Tf
<20696e7465726661636520616c6c6f77732074686520636f6e7374697475656e74207061727473206f6620616e206170706c69636174696f6e20746f20626520646566696e6564> Tj
ET
@@ -70898,7 +71081,7 @@ ET
1.891 Tw
BT
-48.24 576.9460000000004 Td
+48.24000000000001 493.82600000000036 Td
/F1.0 10.5 Tf
[<70726f6772> 20.01953125 <616d6d61746963616c6c79> 89.84375 <2c206d6f7374207370656369666963616c6c7920746865207061636b61676573207468617420636f6e7461696e20646f6d61696e20736572766963657320616e642f6f722070657273697374656e74>] TJ
ET
@@ -70911,7 +71094,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24 561.1660000000004 Td
+48.24000000000001 478.0460000000004 Td
/F1.0 10.5 Tf
<656e7469746965732e204974732041504920697320646566696e65642061733a> Tj
ET
@@ -70920,28 +71103,28 @@ ET
0.000 0.000 0.000 scn
q
0.961 0.961 0.961 scn
-52.240 545.350 m
-543.040 545.350 l
-545.249 545.350 547.040 543.559 547.040 541.350 c
-547.040 409.430 l
-547.040 407.221 545.249 405.430 543.040 405.430 c
-52.240 405.430 l
-50.031 405.430 48.240 407.221 48.240 409.430 c
-48.240 541.350 l
-48.240 543.559 50.031 545.350 52.240 545.350 c
+52.240 462.230 m
+543.040 462.230 l
+545.249 462.230 547.040 460.439 547.040 458.230 c
+547.040 326.310 l
+547.040 324.101 545.249 322.310 543.040 322.310 c
+52.240 322.310 l
+50.031 322.310 48.240 324.101 48.240 326.310 c
+48.240 458.230 l
+48.240 460.439 50.031 462.230 52.240 462.230 c
h
f
0.800 0.800 0.800 SCN
0.75 w
-52.240 545.350 m
-543.040 545.350 l
-545.249 545.350 547.040 543.559 547.040 541.350 c
-547.040 409.430 l
-547.040 407.221 545.249 405.430 543.040 405.430 c
-52.240 405.430 l
-50.031 405.430 48.240 407.221 48.240 409.430 c
-48.240 541.350 l
-48.240 543.559 50.031 545.350 52.240 545.350 c
+52.240 462.230 m
+543.040 462.230 l
+545.249 462.230 547.040 460.439 547.040 458.230 c
+547.040 326.310 l
+547.040 324.101 545.249 322.310 543.040 322.310 c
+52.240 322.310 l
+50.031 322.310 48.240 324.101 48.240 326.310 c
+48.240 458.230 l
+48.240 460.439 50.031 462.230 52.240 462.230 c
h
S
Q
@@ -70949,7 +71132,7 @@ Q
0.000 0.400 0.600 SCN
BT
-59.24 522.5250000000003 Td
+59.24000000000001 439.40500000000037 Td
/F3.0 11 Tf
<7075626c6963> Tj
ET
@@ -70960,7 +71143,7 @@ ET
0.200 0.200 0.200 SCN
BT
-92.24000000000001 522.5250000000003 Td
+92.24000000000001 439.40500000000037 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -70971,7 +71154,7 @@ ET
0.000 0.467 0.533 SCN
BT
-97.74000000000001 522.5250000000003 Td
+97.74000000000001 439.40500000000037 Td
/F3.0 11 Tf
<696e74657266616365> Tj
ET
@@ -70982,7 +71165,7 @@ ET
0.200 0.200 0.200 SCN
BT
-147.24 522.5250000000003 Td
+147.24 439.40500000000037 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -70993,7 +71176,7 @@ ET
0.000 0.667 0.533 SCN
BT
-152.74 522.5250000000003 Td
+152.74 439.40500000000037 Td
/F3.0 11 Tf
<4170704d616e6966657374> Tj
ET
@@ -71004,7 +71187,7 @@ ET
0.200 0.200 0.200 SCN
BT
-213.24 522.5250000000003 Td
+213.24 439.40500000000037 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -71015,7 +71198,7 @@ ET
0.200 0.200 0.200 SCN
BT
-218.74 522.5250000000003 Td
+218.74 439.40500000000037 Td
/F3.0 11 Tf
<7b> Tj
ET
@@ -71026,7 +71209,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 507.78500000000037 Td
+59.24000000000001 424.66500000000036 Td
/F3.0 11 Tf
<ca202020> Tj
ET
@@ -71037,7 +71220,7 @@ ET
0.000 0.400 0.600 SCN
BT
-81.24000000000001 507.78500000000037 Td
+81.24000000000001 424.66500000000036 Td
/F3.0 11 Tf
<7075626c6963> Tj
ET
@@ -71048,7 +71231,7 @@ ET
0.200 0.200 0.200 SCN
BT
-114.24000000000001 507.78500000000037 Td
+114.24000000000001 424.66500000000036 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -71059,7 +71242,7 @@ ET
0.000 0.467 0.533 SCN
BT
-119.74000000000001 507.78500000000037 Td
+119.74000000000001 424.66500000000036 Td
/F3.0 11 Tf
<4c697374> Tj
ET
@@ -71070,7 +71253,7 @@ ET
0.200 0.200 0.200 SCN
BT
-141.74 507.78500000000037 Td
+141.74 424.66500000000036 Td
/F3.0 11 Tf
<3c> Tj
ET
@@ -71081,7 +71264,7 @@ ET
0.000 0.467 0.533 SCN
BT
-147.24 507.78500000000037 Td
+147.24 424.66500000000036 Td
/F3.0 11 Tf
<436c617373> Tj
ET
@@ -71092,7 +71275,7 @@ ET
0.200 0.200 0.200 SCN
BT
-174.74 507.78500000000037 Td
+174.74 424.66500000000036 Td
/F3.0 11 Tf
<3c> Tj
ET
@@ -71103,7 +71286,7 @@ ET
0.200 0.200 0.200 SCN
BT
-180.24 507.78500000000037 Td
+180.24 424.66500000000036 Td
/F3.0 11 Tf
<3f> Tj
ET
@@ -71114,7 +71297,7 @@ ET
0.200 0.200 0.200 SCN
BT
-185.74 507.78500000000037 Td
+185.74 424.66500000000036 Td
/F3.0 11 Tf
<3e> Tj
ET
@@ -71125,7 +71308,7 @@ ET
0.200 0.200 0.200 SCN
BT
-191.24 507.78500000000037 Td
+191.24 424.66500000000036 Td
/F3.0 11 Tf
<3e> Tj
ET
@@ -71136,7 +71319,7 @@ ET
0.200 0.200 0.200 SCN
BT
-196.74 507.78500000000037 Td
+196.74 424.66500000000036 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -71147,7 +71330,7 @@ ET
0.200 0.200 0.200 SCN
BT
-202.24 507.78500000000037 Td
+202.24 424.66500000000036 Td
/F3.0 11 Tf
<6765744d6f64756c6573> Tj
ET
@@ -71158,7 +71341,7 @@ ET
0.200 0.200 0.200 SCN
BT
-257.24 507.78500000000037 Td
+257.24 424.66500000000036 Td
/F3.0 11 Tf
<28> Tj
ET
@@ -71169,7 +71352,7 @@ ET
0.200 0.200 0.200 SCN
BT
-262.74 507.78500000000037 Td
+262.74 424.66500000000036 Td
/F3.0 11 Tf
<29> Tj
ET
@@ -71180,7 +71363,7 @@ ET
0.200 0.200 0.200 SCN
BT
-268.24 507.78500000000037 Td
+268.24 424.66500000000036 Td
/F3.0 11 Tf
<3b> Tj
ET
@@ -71191,7 +71374,7 @@ ET
0.200 0.200 0.200 SCN
BT
-273.74 507.78500000000037 Td
+273.74 424.66500000000036 Td
/F3.0 11 Tf
<20202020202020202020202020202020202020202020202020> Tj
ET
@@ -71202,7 +71385,7 @@ ET
0.694 0.129 0.275 SCN
BT
-411.24 507.78500000000037 Td
+411.24 424.66500000000036 Td
/F3.1 11 Tf
<21> Tj
ET
@@ -71213,7 +71396,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 493.04500000000036 Td
+59.24000000000001 409.92500000000035 Td
/F3.0 11 Tf
<ca202020> Tj
ET
@@ -71224,7 +71407,7 @@ ET
0.000 0.400 0.600 SCN
BT
-81.24000000000001 493.04500000000036 Td
+81.24000000000001 409.92500000000035 Td
/F3.0 11 Tf
<7075626c6963> Tj
ET
@@ -71235,7 +71418,7 @@ ET
0.200 0.200 0.200 SCN
BT
-114.24000000000001 493.04500000000036 Td
+114.24000000000001 409.92500000000035 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -71246,7 +71429,7 @@ ET
0.000 0.467 0.533 SCN
BT
-119.74000000000001 493.04500000000036 Td
+119.74000000000001 409.92500000000035 Td
/F3.0 11 Tf
<4c697374> Tj
ET
@@ -71257,7 +71440,7 @@ ET
0.200 0.200 0.200 SCN
BT
-141.74 493.04500000000036 Td
+141.74 409.92500000000035 Td
/F3.0 11 Tf
<3c> Tj
ET
@@ -71268,7 +71451,7 @@ ET
0.000 0.467 0.533 SCN
BT
-147.24 493.04500000000036 Td
+147.24 409.92500000000035 Td
/F3.0 11 Tf
<436c617373> Tj
ET
@@ -71279,7 +71462,7 @@ ET
0.200 0.200 0.200 SCN
BT
-174.74 493.04500000000036 Td
+174.74 409.92500000000035 Td
/F3.0 11 Tf
<3c> Tj
ET
@@ -71290,7 +71473,7 @@ ET
0.200 0.200 0.200 SCN
BT
-180.24 493.04500000000036 Td
+180.24 409.92500000000035 Td
/F3.0 11 Tf
<3f> Tj
ET
@@ -71301,7 +71484,7 @@ ET
0.200 0.200 0.200 SCN
BT
-185.74 493.04500000000036 Td
+185.74 409.92500000000035 Td
/F3.0 11 Tf
<3e> Tj
ET
@@ -71312,7 +71495,7 @@ ET
0.200 0.200 0.200 SCN
BT
-191.24 493.04500000000036 Td
+191.24 409.92500000000035 Td
/F3.0 11 Tf
<3e> Tj
ET
@@ -71323,7 +71506,7 @@ ET
0.200 0.200 0.200 SCN
BT
-196.74 493.04500000000036 Td
+196.74 409.92500000000035 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -71334,7 +71517,7 @@ ET
0.200 0.200 0.200 SCN
BT
-202.24 493.04500000000036 Td
+202.24 409.92500000000035 Td
/F3.0 11 Tf
<6765744164646974696f6e616c5365727669636573> Tj
ET
@@ -71345,7 +71528,7 @@ ET
0.200 0.200 0.200 SCN
BT
-317.74 493.04500000000036 Td
+317.74 409.92500000000035 Td
/F3.0 11 Tf
<28> Tj
ET
@@ -71356,7 +71539,7 @@ ET
0.200 0.200 0.200 SCN
BT
-323.24 493.04500000000036 Td
+323.24 409.92500000000035 Td
/F3.0 11 Tf
<29> Tj
ET
@@ -71367,7 +71550,7 @@ ET
0.200 0.200 0.200 SCN
BT
-328.74 493.04500000000036 Td
+328.74 409.92500000000035 Td
/F3.0 11 Tf
<3b> Tj
ET
@@ -71378,7 +71561,7 @@ ET
0.200 0.200 0.200 SCN
BT
-334.24 493.04500000000036 Td
+334.24 409.92500000000035 Td
/F3.0 11 Tf
<2020202020202020202020202020> Tj
ET
@@ -71389,7 +71572,7 @@ ET
0.694 0.129 0.275 SCN
BT
-411.24 493.04500000000036 Td
+411.24 409.92500000000035 Td
/F3.1 11 Tf
<22> Tj
ET
@@ -71400,7 +71583,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 478.30500000000035 Td
+59.24000000000001 395.18500000000034 Td
/F3.0 11 Tf
<ca202020> Tj
ET
@@ -71411,7 +71594,7 @@ ET
0.000 0.400 0.600 SCN
BT
-81.24000000000001 478.30500000000035 Td
+81.24000000000001 395.18500000000034 Td
/F3.0 11 Tf
<7075626c6963> Tj
ET
@@ -71422,7 +71605,7 @@ ET
0.200 0.200 0.200 SCN
BT
-114.24000000000001 478.30500000000035 Td
+114.24000000000001 395.18500000000034 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -71433,7 +71616,7 @@ ET
0.000 0.467 0.533 SCN
BT
-119.74000000000001 478.30500000000035 Td
+119.74000000000001 395.18500000000034 Td
/F3.0 11 Tf
<537472696e67> Tj
ET
@@ -71444,7 +71627,7 @@ ET
0.200 0.200 0.200 SCN
BT
-152.74 478.30500000000035 Td
+152.74 395.18500000000034 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -71455,7 +71638,7 @@ ET
0.200 0.200 0.200 SCN
BT
-158.24 478.30500000000035 Td
+158.24 395.18500000000034 Td
/F3.0 11 Tf
<67657441757468656e7469636174696f6e4d656368616e69736d> Tj
ET
@@ -71466,7 +71649,7 @@ ET
0.200 0.200 0.200 SCN
BT
-301.24 478.30500000000035 Td
+301.24 395.18500000000034 Td
/F3.0 11 Tf
<28> Tj
ET
@@ -71477,7 +71660,7 @@ ET
0.200 0.200 0.200 SCN
BT
-306.74 478.30500000000035 Td
+306.74 395.18500000000034 Td
/F3.0 11 Tf
<29> Tj
ET
@@ -71488,7 +71671,7 @@ ET
0.200 0.200 0.200 SCN
BT
-312.24 478.30500000000035 Td
+312.24 395.18500000000034 Td
/F3.0 11 Tf
<3b> Tj
ET
@@ -71499,7 +71682,7 @@ ET
0.200 0.200 0.200 SCN
BT
-317.74 478.30500000000035 Td
+317.74 395.18500000000034 Td
/F3.0 11 Tf
<2020202020202020202020202020202020> Tj
ET
@@ -71510,7 +71693,7 @@ ET
0.694 0.129 0.275 SCN
BT
-411.24 478.30500000000035 Td
+411.24 395.18500000000034 Td
/F3.1 11 Tf
<23> Tj
ET
@@ -71521,7 +71704,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 463.56500000000034 Td
+59.24000000000001 380.44500000000033 Td
/F3.0 11 Tf
<ca202020> Tj
ET
@@ -71532,7 +71715,7 @@ ET
0.000 0.400 0.600 SCN
BT
-81.24000000000001 463.56500000000034 Td
+81.24000000000001 380.44500000000033 Td
/F3.0 11 Tf
<7075626c6963> Tj
ET
@@ -71543,7 +71726,7 @@ ET
0.200 0.200 0.200 SCN
BT
-114.24000000000001 463.56500000000034 Td
+114.24000000000001 380.44500000000033 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -71554,7 +71737,7 @@ ET
0.000 0.467 0.533 SCN
BT
-119.74000000000001 463.56500000000034 Td
+119.74000000000001 380.44500000000033 Td
/F3.0 11 Tf
<537472696e67> Tj
ET
@@ -71565,7 +71748,7 @@ ET
0.200 0.200 0.200 SCN
BT
-152.74 463.56500000000034 Td
+152.74 380.44500000000033 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -71576,7 +71759,7 @@ ET
0.200 0.200 0.200 SCN
BT
-158.24 463.56500000000034 Td
+158.24 380.44500000000033 Td
/F3.0 11 Tf
<676574417574686f72697a6174696f6e4d656368616e69736d> Tj
ET
@@ -71587,7 +71770,7 @@ ET
0.200 0.200 0.200 SCN
BT
-295.74 463.56500000000034 Td
+295.74 380.44500000000033 Td
/F3.0 11 Tf
<28> Tj
ET
@@ -71598,7 +71781,7 @@ ET
0.200 0.200 0.200 SCN
BT
-301.24 463.56500000000034 Td
+301.24 380.44500000000033 Td
/F3.0 11 Tf
<29> Tj
ET
@@ -71609,7 +71792,7 @@ ET
0.200 0.200 0.200 SCN
BT
-306.74 463.56500000000034 Td
+306.74 380.44500000000033 Td
/F3.0 11 Tf
<3b> Tj
ET
@@ -71620,7 +71803,7 @@ ET
0.200 0.200 0.200 SCN
BT
-312.24 463.56500000000034 Td
+312.24 380.44500000000033 Td
/F3.0 11 Tf
<202020202020202020202020202020202020> Tj
ET
@@ -71631,7 +71814,7 @@ ET
0.694 0.129 0.275 SCN
BT
-411.24 463.56500000000034 Td
+411.24 380.44500000000033 Td
/F3.1 11 Tf
<24> Tj
ET
@@ -71642,7 +71825,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 448.8250000000004 Td
+59.24000000000001 365.7050000000004 Td
/F3.0 11 Tf
<ca202020> Tj
ET
@@ -71653,7 +71836,7 @@ ET
0.000 0.400 0.600 SCN
BT
-81.24000000000001 448.8250000000004 Td
+81.24000000000001 365.7050000000004 Td
/F3.0 11 Tf
<7075626c6963> Tj
ET
@@ -71664,7 +71847,7 @@ ET
0.200 0.200 0.200 SCN
BT
-114.24000000000001 448.8250000000004 Td
+114.24000000000001 365.7050000000004 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -71675,7 +71858,7 @@ ET
0.000 0.467 0.533 SCN
BT
-119.74000000000001 448.8250000000004 Td
+119.74000000000001 365.7050000000004 Td
/F3.0 11 Tf
<4c697374> Tj
ET
@@ -71686,7 +71869,7 @@ ET
0.200 0.200 0.200 SCN
BT
-141.74 448.8250000000004 Td
+141.74 365.7050000000004 Td
/F3.0 11 Tf
<3c> Tj
ET
@@ -71697,7 +71880,7 @@ ET
0.000 0.467 0.533 SCN
BT
-147.24 448.8250000000004 Td
+147.24 365.7050000000004 Td
/F3.0 11 Tf
<436c617373> Tj
ET
@@ -71708,7 +71891,7 @@ ET
0.200 0.200 0.200 SCN
BT
-174.74 448.8250000000004 Td
+174.74 365.7050000000004 Td
/F3.0 11 Tf
<3c> Tj
ET
@@ -71719,7 +71902,7 @@ ET
0.200 0.200 0.200 SCN
BT
-180.24 448.8250000000004 Td
+180.24 365.7050000000004 Td
/F3.0 11 Tf
<3f> Tj
ET
@@ -71730,7 +71913,7 @@ ET
0.200 0.200 0.200 SCN
BT
-185.74 448.8250000000004 Td
+185.74 365.7050000000004 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -71741,7 +71924,7 @@ ET
0.000 0.400 0.600 SCN
BT
-191.24 448.8250000000004 Td
+191.24 365.7050000000004 Td
/F3.0 11 Tf
<657874656e6473> Tj
ET
@@ -71752,7 +71935,7 @@ ET
0.200 0.200 0.200 SCN
BT
-229.74 448.8250000000004 Td
+229.74 365.7050000000004 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -71763,7 +71946,7 @@ ET
0.200 0.200 0.200 SCN
BT
-235.24 448.8250000000004 Td
+235.24 365.7050000000004 Td
/F3.0 11 Tf
<46697874757265536372697074> Tj
ET
@@ -71774,7 +71957,7 @@ ET
0.200 0.200 0.200 SCN
BT
-306.74 448.8250000000004 Td
+306.74 365.7050000000004 Td
/F3.0 11 Tf
<3e> Tj
ET
@@ -71785,7 +71968,7 @@ ET
0.200 0.200 0.200 SCN
BT
-312.24 448.8250000000004 Td
+312.24 365.7050000000004 Td
/F3.0 11 Tf
<3e> Tj
ET
@@ -71796,7 +71979,7 @@ ET
0.200 0.200 0.200 SCN
BT
-317.74 448.8250000000004 Td
+317.74 365.7050000000004 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -71807,7 +71990,7 @@ ET
0.200 0.200 0.200 SCN
BT
-323.24 448.8250000000004 Td
+323.24 365.7050000000004 Td
/F3.0 11 Tf
<6765744669787475726573> Tj
ET
@@ -71818,7 +72001,7 @@ ET
0.200 0.200 0.200 SCN
BT
-383.74 448.8250000000004 Td
+383.74 365.7050000000004 Td
/F3.0 11 Tf
<28> Tj
ET
@@ -71829,7 +72012,7 @@ ET
0.200 0.200 0.200 SCN
BT
-389.24 448.8250000000004 Td
+389.24 365.7050000000004 Td
/F3.0 11 Tf
<29> Tj
ET
@@ -71840,7 +72023,7 @@ ET
0.200 0.200 0.200 SCN
BT
-394.74 448.8250000000004 Td
+394.74 365.7050000000004 Td
/F3.0 11 Tf
<3b> Tj
ET
@@ -71851,7 +72034,7 @@ ET
0.200 0.200 0.200 SCN
BT
-400.24 448.8250000000004 Td
+400.24 365.7050000000004 Td
/F3.0 11 Tf
<2020> Tj
ET
@@ -71862,7 +72045,7 @@ ET
0.694 0.129 0.275 SCN
BT
-411.24 448.8250000000004 Td
+411.24 365.7050000000004 Td
/F3.1 11 Tf
<25> Tj
ET
@@ -71873,7 +72056,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 434.0850000000004 Td
+59.24000000000001 350.9650000000004 Td
/F3.0 11 Tf
<ca202020> Tj
ET
@@ -71884,7 +72067,7 @@ ET
0.000 0.400 0.600 SCN
BT
-81.24000000000001 434.0850000000004 Td
+81.24000000000001 350.9650000000004 Td
/F3.0 11 Tf
<7075626c6963> Tj
ET
@@ -71895,7 +72078,7 @@ ET
0.200 0.200 0.200 SCN
BT
-114.24000000000001 434.0850000000004 Td
+114.24000000000001 350.9650000000004 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -71906,7 +72089,7 @@ ET
0.000 0.467 0.533 SCN
BT
-119.74000000000001 434.0850000000004 Td
+119.74000000000001 350.9650000000004 Td
/F3.0 11 Tf
<4d6170> Tj
ET
@@ -71917,7 +72100,7 @@ ET
0.200 0.200 0.200 SCN
BT
-136.24 434.0850000000004 Td
+136.24 350.9650000000004 Td
/F3.0 11 Tf
<3c> Tj
ET
@@ -71928,7 +72111,7 @@ ET
0.000 0.467 0.533 SCN
BT
-141.74 434.0850000000004 Td
+141.74 350.9650000000004 Td
/F3.0 11 Tf
<537472696e67> Tj
ET
@@ -71939,7 +72122,7 @@ ET
0.200 0.200 0.200 SCN
BT
-174.74 434.0850000000004 Td
+174.74 350.9650000000004 Td
/F3.0 11 Tf
<2c> Tj
ET
@@ -71950,7 +72133,7 @@ ET
0.000 0.467 0.533 SCN
BT
-180.24 434.0850000000004 Td
+180.24 350.9650000000004 Td
/F3.0 11 Tf
<537472696e67> Tj
ET
@@ -71961,7 +72144,7 @@ ET
0.200 0.200 0.200 SCN
BT
-213.24 434.0850000000004 Td
+213.24 350.9650000000004 Td
/F3.0 11 Tf
<3e> Tj
ET
@@ -71972,7 +72155,7 @@ ET
0.200 0.200 0.200 SCN
BT
-218.74 434.0850000000004 Td
+218.74 350.9650000000004 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -71983,7 +72166,7 @@ ET
0.200 0.200 0.200 SCN
BT
-224.24 434.0850000000004 Td
+224.24 350.9650000000004 Td
/F3.0 11 Tf
<676574436f6e66696775726174696f6e50726f70657274696573> Tj
ET
@@ -71994,7 +72177,7 @@ ET
0.200 0.200 0.200 SCN
BT
-367.24 434.0850000000004 Td
+367.24 350.9650000000004 Td
/F3.0 11 Tf
<28> Tj
ET
@@ -72005,7 +72188,7 @@ ET
0.200 0.200 0.200 SCN
BT
-372.74 434.0850000000004 Td
+372.74 350.9650000000004 Td
/F3.0 11 Tf
<29> Tj
ET
@@ -72016,7 +72199,7 @@ ET
0.200 0.200 0.200 SCN
BT
-378.24 434.0850000000004 Td
+378.24 350.9650000000004 Td
/F3.0 11 Tf
<3b> Tj
ET
@@ -72027,7 +72210,7 @@ ET
0.200 0.200 0.200 SCN
BT
-383.74 434.0850000000004 Td
+383.74 350.9650000000004 Td
/F3.0 11 Tf
<2020202020> Tj
ET
@@ -72038,7 +72221,7 @@ ET
0.694 0.129 0.275 SCN
BT
-411.24 434.0850000000004 Td
+411.24 350.9650000000004 Td
/F3.1 11 Tf
<26> Tj
ET
@@ -72049,7 +72232,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 419.34500000000037 Td
+59.24000000000001 336.22500000000036 Td
/F3.0 11 Tf
<7d> Tj
ET
@@ -72060,7 +72243,7 @@ ET
0.694 0.129 0.275 SCN
BT
-51.2745 387.7050000000004 Td
+51.27450000000001 304.5850000000004 Td
/F3.1 10.5 Tf
<21> Tj
ET
@@ -72073,7 +72256,7 @@ ET
0.354 Tw
BT
-64.809 387.46600000000035 Td
+64.80900000000001 304.34600000000034 Td
/F1.0 10.5 Tf
<4d7573742072657475726e2061206e6f6e2d6e756c6c206c697374206f6620636c61737365732c2065616368206f6620776869636820726570726573656e74696e672074686520726f6f74206f66206f6e65206f6620746865206d6f64756c6573> Tj
ET
@@ -72086,7 +72269,7 @@ ET
0.200 0.200 0.200 SCN
BT
-64.809 371.6860000000004 Td
+64.80900000000001 288.5660000000004 Td
/F1.0 10.5 Tf
[<636f6e7461696e696e6720736572766963657320616e6420706f737369626c7920656e7469746965732c20776869636820746f676574686572206d616b> 20.01953125 <6573207570207468652072756e6e696e67206170706c69636174696f6e2e>] TJ
ET
@@ -72097,7 +72280,7 @@ ET
0.694 0.129 0.275 SCN
BT
-51.274499999999996 350.1450000000004 Td
+51.27450000000001 267.0250000000004 Td
/F3.1 10.5 Tf
<22> Tj
ET
@@ -72110,7 +72293,7 @@ ET
2.723 Tw
BT
-64.809 349.90600000000035 Td
+64.80900000000001 266.78600000000034 Td
/F1.0 10.5 Tf
<4966206e6f6e2d> Tj
ET
@@ -72125,7 +72308,7 @@ ET
2.723 Tw
BT
-100.83755423677884 349.90600000000035 Td
+100.83755423677886 266.78600000000034 Td
/F3.0 10.5 Tf
<6e756c6c> Tj
ET
@@ -72140,7 +72323,7 @@ ET
2.723 Tw
BT
-121.83755423677884 349.90600000000035 Td
+121.83755423677886 266.78600000000034 Td
/F1.0 10.5 Tf
<2c206f7665727269646573207468652076616c7565206f6620> Tj
ET
@@ -72155,7 +72338,7 @@ ET
2.723 Tw
BT
-252.87182542067305 349.90600000000035 Td
+252.87182542067308 266.78600000000034 Td
/F3.0 10.5 Tf
<697369732e7365727669636573> Tj
ET
@@ -72170,7 +72353,7 @@ ET
2.723 Tw
BT
-321.1218254206731 349.90600000000035 Td
+321.1218254206731 266.78600000000034 Td
/F1.0 10.5 Tf
[<20636f6e6669677572> 20.01953125 <6174696f6e2070726f706572747920746f20737065636966792061206c697374206f66>] TJ
ET
@@ -72185,7 +72368,7 @@ ET
1.565 Tw
BT
-64.809 334.1260000000003 Td
+64.80900000000001 251.00600000000034 Td
/F1.0 10.5 Tf
<6164646974696f6e616c20636c617373657320746f20626520696e7374616e74696174656420617320646f6d61696e20736572766963657320286f76657220616e642061626f76652074686520646f6d61696e207365727669636573> Tj
ET
@@ -72198,7 +72381,7 @@ ET
0.200 0.200 0.200 SCN
BT
-64.809 318.34600000000034 Td
+64.80900000000001 235.22600000000034 Td
/F1.0 10.5 Tf
<646566696e65642076696120> Tj
ET
@@ -72209,7 +72392,7 @@ ET
0.694 0.129 0.275 SCN
BT
-123.6825 318.34600000000034 Td
+123.68250000000002 235.22600000000034 Td
/F3.0 10.5 Tf
<6765744d6f64756c65732829> Tj
ET
@@ -72220,7 +72403,7 @@ ET
0.200 0.200 0.200 SCN
BT
-186.6825 318.34600000000034 Td
+186.6825 235.22600000000034 Td
/F1.0 10.5 Tf
<206d6574686f642e> Tj
ET
@@ -72231,7 +72414,7 @@ ET
0.694 0.129 0.275 SCN
BT
-51.274499999999996 296.80500000000035 Td
+51.27450000000001 213.68500000000034 Td
/F3.1 10.5 Tf
<23> Tj
ET
@@ -72244,7 +72427,7 @@ ET
2.203 Tw
BT
-64.809 296.5660000000003 Td
+64.80900000000001 213.44600000000034 Td
/F1.0 10.5 Tf
<4966206e6f6e2d> Tj
ET
@@ -72259,7 +72442,7 @@ ET
2.203 Tw
BT
-100.31788227982955 296.5660000000003 Td
+100.31788227982955 213.44600000000034 Td
/F3.0 10.5 Tf
<6e756c6c> Tj
ET
@@ -72274,7 +72457,7 @@ ET
2.203 Tw
BT
-121.31788227982955 296.5660000000003 Td
+121.31788227982955 213.44600000000034 Td
/F1.0 10.5 Tf
<2c206f7665727269646573207468652076616c7565206f6620> Tj
ET
@@ -72289,7 +72472,7 @@ ET
2.203 Tw
BT
-249.75379367897725 296.5660000000003 Td
+249.75379367897727 213.44600000000034 Td
/F3.0 10.5 Tf
<697369732e61757468656e7469636174696f6e> Tj
ET
@@ -72304,7 +72487,7 @@ ET
2.203 Tw
BT
-349.5037936789772 296.5660000000003 Td
+349.5037936789773 213.44600000000034 Td
/F1.0 10.5 Tf
[<20636f6e6669677572> 20.01953125 <6174696f6e2070726f706572747920746f207370656369667920746865>] TJ
ET
@@ -72317,7 +72500,7 @@ ET
0.200 0.200 0.200 SCN
BT
-64.809 280.7860000000003 Td
+64.80900000000001 197.66600000000034 Td
/F1.0 10.5 Tf
<61757468656e7469636174696f6e206d656368616e69736d2e> Tj
ET
@@ -72328,7 +72511,7 @@ ET
0.694 0.129 0.275 SCN
BT
-51.274499999999996 259.24500000000035 Td
+51.27450000000001 176.12500000000034 Td
/F3.1 10.5 Tf
<24> Tj
ET
@@ -72341,7 +72524,7 @@ ET
2.680 Tw
BT
-64.809 259.0060000000003 Td
+64.80900000000001 175.88600000000034 Td
/F1.0 10.5 Tf
<4966206e6f6e2d> Tj
ET
@@ -72356,7 +72539,7 @@ ET
2.680 Tw
BT
-100.79515500710227 259.0060000000003 Td
+100.79515500710228 175.88600000000034 Td
/F3.0 10.5 Tf
<6e756c6c> Tj
ET
@@ -72371,7 +72554,7 @@ ET
2.680 Tw
BT
-121.79515500710227 259.0060000000003 Td
+121.79515500710228 175.88600000000034 Td
/F1.0 10.5 Tf
<2c206f7665727269646573207468652076616c7565206f6620> Tj
ET
@@ -72386,7 +72569,7 @@ ET
2.680 Tw
BT
-252.6174300426136 259.0060000000003 Td
+252.6174300426136 175.88600000000034 Td
/F3.0 10.5 Tf
<697369732e617574686f72697a6174696f6e> Tj
ET
@@ -72401,7 +72584,7 @@ ET
2.680 Tw
BT
-347.1174300426136 259.0060000000003 Td
+347.11743004261365 175.88600000000034 Td
/F1.0 10.5 Tf
[<20636f6e6669677572> 20.01953125 <6174696f6e2070726f706572747920746f207370656369667920746865>] TJ
ET
@@ -72414,7 +72597,7 @@ ET
0.200 0.200 0.200 SCN
BT
-64.809 243.2260000000003 Td
+64.80900000000001 160.10600000000034 Td
/F1.0 10.5 Tf
<617574686f72697a6174696f6e206d656368616e69736d2e> Tj
ET
@@ -72425,7 +72608,7 @@ ET
0.694 0.129 0.275 SCN
BT
-51.274499999999996 221.68500000000031 Td
+51.27450000000001 138.56500000000034 Td
/F3.1 10.5 Tf
<25> Tj
ET
@@ -72438,7 +72621,7 @@ ET
2.406 Tw
BT
-64.809 221.4460000000003 Td
+64.80900000000001 138.32600000000033 Td
/F1.0 10.5 Tf
<4966206e6f6e2d> Tj
ET
@@ -72453,7 +72636,7 @@ ET
2.406 Tw
BT
-100.52105875651041 221.4460000000003 Td
+100.52105875651043 138.32600000000033 Td
/F3.0 10.5 Tf
<6e756c6c> Tj
ET
@@ -72468,7 +72651,7 @@ ET
2.406 Tw
BT
-121.52105875651041 221.4460000000003 Td
+121.52105875651043 138.32600000000033 Td
/F1.0 10.5 Tf
<2c206f7665727269646573207468652076616c7565206f6620> Tj
ET
@@ -72483,7 +72666,7 @@ ET
2.406 Tw
BT
-250.97285253906247 221.4460000000003 Td
+250.9728525390625 138.32600000000033 Td
/F3.0 10.5 Tf
<697369732e6669787475726573> Tj
ET
@@ -72498,7 +72681,7 @@ ET
2.406 Tw
BT
-319.2228525390625 221.4460000000003 Td
+319.2228525390625 138.32600000000033 Td
/F1.0 10.5 Tf
[<20636f6e6669677572> 20.01953125 <6174696f6e2070726f706572747920746f207370656369667920612066697874757265>] TJ
ET
@@ -72511,7 +72694,7 @@ ET
0.200 0.200 0.200 SCN
BT
-64.809 205.6660000000003 Td
+64.80900000000001 122.54600000000033 Td
/F1.0 10.5 Tf
<73637269707420746f20626520696e7374616c6c65642e> Tj
ET
@@ -72522,7 +72705,7 @@ ET
0.694 0.129 0.275 SCN
BT
-51.274499999999996 184.1250000000003 Td
+51.27450000000001 101.00500000000034 Td
/F3.1 10.5 Tf
<26> Tj
ET
@@ -72533,7 +72716,7 @@ ET
0.200 0.200 0.200 SCN
BT
-64.809 183.8860000000003 Td
+64.80900000000001 100.76600000000033 Td
/F1.0 10.5 Tf
[<4f766572726964657320666f7220616e> 20.01953125 <79206f7468657220636f6e6669677572> 20.01953125 <6174696f6e2070726f706572746965732e>] TJ
ET
@@ -72544,18 +72727,114 @@ ET
0.200 0.200 0.200 SCN
BT
-48.239999999999995 156.1060000000003 Td
+48.24000000000001 72.98600000000033 Td
/F1.0 10.5 Tf
<54686520666f6c6c6f77696e672073656374696f6e732064657363726962652065616368206f66207468657365206d6574686f647320696e2061206c6974746c65206d6f72652064657461696c2e> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
+q
+0.000 0.000 0.000 scn
+0.000 0.000 0.000 SCN
+1 w
+0 J
+0 j
+[ ] 0 d
+/Stamp1 Do
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+535.978 14.388 Td
+/F1.0 9 Tf
+<3333> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+Q
+Q
+
+endstream
+endobj
+423 0 obj
+<< /Type /Page
+/Parent 3 0 R
+/MediaBox [0 0 595.28 841.89]
+/Contents 422 0 R
+/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
+/Font << /F2.0 16 0 R
+/F1.0 8 0 R
+/F3.0 18 0 R
+/F5.1 43 0 R
+/F3.1 141 0 R
+>>
+/XObject << /Stamp1 1033 0 R
+>>
+>>
+/Annots [426 0 R 427 0 R 428 0 R]
+>>
+endobj
+424 0 obj
+[423 0 R /XYZ 0 841.89 null]
+endobj
+425 0 obj
+<< /Limits [(_rgcms_methods_lifecycle_removing) (_rgcms_methods_prefixes_get)]
+/Names [(_rgcms_methods_lifecycle_removing) 399 0 R (_rgcms_methods_lifecycle_updated) 406 0 R (_rgcms_methods_lifecycle_updating) 411 0 R (_rgcms_methods_prefixes) 42 0 R (_rgcms_methods_prefixes_addTo) 139 0 R (_rgcms_methods_prefixes_autoComplete) 145 0 R (_rgcms_methods_prefixes_choices) 157 0 R (_rgcms_methods_prefixes_clear) 174 0 R (_rgcms_methods_prefixes_default) 181 0 R (_rgcms_methods_prefixes_disable) 200 0 R (_rgcms_methods_prefixes_get) 207 0 R]
+>>
+endobj
+426 0 obj
+<< /Border [0 0 0]
+/A << /Type /Action
+/S /URI
+/URI (../rgsvc/rgsvc.pdf)
+>>
+/Subtype /Link
+/Rect [73.7025 734.36 155.0985 748.6400000000001]
+/Type /Annot
+>>
+endobj
+427 0 obj
+<< /Border [0 0 0]
+/A << /Type /Action
+/S /URI
+/URI (../ugvw/ugvw.pdf#_ugvw_layout)
+>>
+/Subtype /Link
+/Rect [160.443 734.36 224.55579492187502 748.6400000000001]
+/Type /Annot
+>>
+endobj
+428 0 obj
+<< /Border [0 0 0]
+/A << /Type /Action
+/S /URI
+/URI (../rgcfg/rgcfg.pdf#_rgcfg)
+>>
+/Subtype /Link
+/Rect [240.99879492187503 734.36 309.03858984375006 748.6400000000001]
+/Type /Annot
+>>
+endobj
+429 0 obj
+[423 0 R /XYZ 0 721.6100000000001 null]
+endobj
+430 0 obj
+[423 0 R /XYZ 0 554.8500000000003 null]
+endobj
+431 0 obj
+<< /Length 37997
+>>
+stream
+q
+/DeviceRGB cs
0.694 0.129 0.275 scn
+/DeviceRGB CS
0.694 0.129 0.275 SCN
BT
-48.239999999999995 126.46000000000029 Td
+48.24 796.86 Td
/F3.0 10.5 Tf
<6765744d6f64756c65732829> Tj
ET
@@ -72568,7 +72847,7 @@ ET
0.493 Tw
BT
-48.239999999999995 102.2260000000003 Td
+48.24 772.626 Td
/F1.0 10.5 Tf
<546865206d6f7374207369676e69666963616e74206d6574686f642028746865206f6e6c79206f6e65207768696368206d7573742072657475726e2061206e6f6e2d> Tj
ET
@@ -72583,7 +72862,7 @@ ET
0.493 Tw
BT
-394.99296666666663 102.2260000000003 Td
+394.99296666666663 772.626 Td
/F3.0 10.5 Tf
<6e756c6c> Tj
ET
@@ -72598,7 +72877,7 @@ ET
0.493 Tw
BT
-415.99296666666663 102.2260000000003 Td
+415.99296666666663 772.626 Td
/F1.0 10.5 Tf
<2076616c7565292069732074686520> Tj
ET
@@ -72613,7 +72892,7 @@ ET
0.493 Tw
BT
-484.03999999999996 102.2260000000003 Td
+484.03999999999996 772.626 Td
/F3.0 10.5 Tf
<6765744d6f64756c65732829> Tj
ET
@@ -72628,7 +72907,7 @@ ET
0.493 Tw
BT
-547.04 102.2260000000003 Td
+547.04 772.626 Td
ET
@@ -72641,7 +72920,7 @@ ET
0.603 Tw
BT
-48.239999999999995 86.4460000000003 Td
+48.24 756.846 Td
/F1.0 10.5 Tf
[<6d6574686f642e2045616368206d6f64756c65206973206964656e7469666965642062> 20.01953125 <79206120636c6173733b20746865206672> 20.01953125 <616d65776f726b2073696d706c792075736573207468617420636c61737327207061636b61676520617320746865>] TJ
ET
@@ -72656,7 +72935,7 @@ ET
1.795 Tw
BT
-48.239999999999995 70.6660000000003 Td
+48.24 741.066 Td
/F1.0 10.5 Tf
<726f6f7420746f2073656172636820666f7220646f6d61696e2073657276696365732028616e6e6f7461746564207769746820> Tj
ET
@@ -72671,7 +72950,7 @@ ET
1.795 Tw
BT
-318.67633333333333 70.6660000000003 Td
+318.67633333333333 741.066 Td
/F3.0 10.5 Tf
<40446f6d61696e53657276696365> Tj
ET
@@ -72686,7 +72965,7 @@ ET
1.795 Tw
BT
-392.17633333333333 70.6660000000003 Td
+392.17633333333333 741.066 Td
/F1.0 10.5 Tf
<2920616e6420656e7469746965732028616e6e6f74617465642077697468> Tj
ET
@@ -72699,7 +72978,7 @@ ET
0.694 0.129 0.275 SCN
BT
-48.239999999999995 54.886000000000294 Td
+48.24 725.2860000000001 Td
/F3.0 10.5 Tf
<4050657273697374656e636543617061626c65> Tj
ET
@@ -72710,138 +72989,18 @@ ET
0.200 0.200 0.200 SCN
BT
-147.99 54.886000000000294 Td
+147.99 725.2860000000001 Td
/F1.0 10.5 Tf
[<292e2047656e6572> 20.01953125 <616c6c79207468657265206973206f6e652073756368206d6f64756c6520636c61737320706572204d6176656e206d6f64756c652e>] TJ
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-q
-0.000 0.000 0.000 scn
-0.000 0.000 0.000 SCN
-1 w
-0 J
-0 j
-[ ] 0 d
-/Stamp1 Do
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
BT
-535.978 14.388 Td
-/F1.0 9 Tf
-<3333> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-Q
-Q
-
-endstream
-endobj
-423 0 obj
-<< /Type /Page
-/Parent 3 0 R
-/MediaBox [0 0 595.28 841.89]
-/Contents 422 0 R
-/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F2.0 16 0 R
-/F1.0 8 0 R
-/F3.0 18 0 R
-/F3.1 141 0 R
->>
-/XObject << /Stamp1 1031 0 R
->>
->>
-/Annots [426 0 R 427 0 R 428 0 R 432 0 R 433 0 R]
->>
-endobj
-424 0 obj
-[423 0 R /XYZ 0 841.89 null]
-endobj
-425 0 obj
-<< /Limits [(_rgcms_methods_lifecycle_removing) (_rgcms_methods_prefixes_get)]
-/Names [(_rgcms_methods_lifecycle_removing) 399 0 R (_rgcms_methods_lifecycle_updated) 406 0 R (_rgcms_methods_lifecycle_updating) 411 0 R (_rgcms_methods_prefixes) 42 0 R (_rgcms_methods_prefixes_addTo) 139 0 R (_rgcms_methods_prefixes_autoComplete) 145 0 R (_rgcms_methods_prefixes_choices) 157 0 R (_rgcms_methods_prefixes_clear) 174 0 R (_rgcms_methods_prefixes_default) 181 0 R (_rgcms_methods_prefixes_disable) 200 0 R (_rgcms_methods_prefixes_get) 207 0 R]
->>
-endobj
-426 0 obj
-<< /Border [0 0 0]
-/A << /Type /Action
-/S /URI
-/URI (../rgsvc/rgsvc.pdf)
->>
-/Subtype /Link
-/Rect [73.7025 734.36 155.0985 748.6400000000001]
-/Type /Annot
->>
-endobj
-427 0 obj
-<< /Border [0 0 0]
-/A << /Type /Action
-/S /URI
-/URI (../ugvw/ugvw.pdf#_ugvw_layout)
->>
-/Subtype /Link
-/Rect [160.443 734.36 224.55579492187502 748.6400000000001]
-/Type /Annot
->>
-endobj
-428 0 obj
-<< /Border [0 0 0]
-/A << /Type /Action
-/S /URI
-/URI (../rgcfg/rgcfg.pdf#_rgcfg)
->>
-/Subtype /Link
-/Rect [240.99879492187503 734.36 309.03858984375006 748.6400000000001]
-/Type /Annot
->>
-endobj
-429 0 obj
-[423 0 R /XYZ 0 721.6100000000001 null]
-endobj
-430 0 obj
-[423 0 R /XYZ 0 637.9700000000003 null]
-endobj
-431 0 obj
-[423 0 R /XYZ 0 140.2900000000003 null]
-endobj
-432 0 obj
-<< /Border [0 0 0]
-/A << /Type /Action
-/S /URI
-/URI (../rgant/rgant.pdf#_rgant-DomainService)
->>
-/Subtype /Link
-/Rect [318.67633333333333 69.1960000000003 392.17633333333333 79.6960000000003]
-/Type /Annot
->>
-endobj
-433 0 obj
-<< /Border [0 0 0]
-/A << /Type /Action
-/S /URI
-/URI (../rgant/rgant.pdf#_rgant-PersistenceCapable)
->>
-/Subtype /Link
-/Rect [48.239999999999995 53.416000000000295 147.99 63.916000000000295]
-/Type /Annot
->>
-endobj
-434 0 obj
-<< /Length 36952
->>
-stream
-q
-/DeviceRGB cs
-0.200 0.200 0.200 scn
-/DeviceRGB CS
-0.200 0.200 0.200 SCN
-
-BT
-48.24 793.9259999999999 Td
+48.24 697.506 Td
/F1.0 10.5 Tf
<41206d6f64756c6520636c61737320666f72206120646f6d61696e206d6f64756c65206d6967687420666f72206578616d706c6520626520646566696e65642061733a> Tj
ET
@@ -72850,28 +73009,28 @@ ET
0.000 0.000 0.000 scn
q
0.961 0.961 0.961 scn
-52.240 778.110 m
-543.040 778.110 l
-545.249 778.110 547.040 776.319 547.040 774.110 c
-547.040 701.150 l
-547.040 698.941 545.249 697.150 543.040 697.150 c
-52.240 697.150 l
-50.031 697.150 48.240 698.941 48.240 701.150 c
-48.240 774.110 l
-48.240 776.319 50.031 778.110 52.240 778.110 c
+52.240 681.690 m
+543.040 681.690 l
+545.249 681.690 547.040 679.899 547.040 677.690 c
+547.040 604.730 l
+547.040 602.521 545.249 600.730 543.040 600.730 c
+52.240 600.730 l
+50.031 600.730 48.240 602.521 48.240 604.730 c
+48.240 677.690 l
+48.240 679.899 50.031 681.690 52.240 681.690 c
h
f
0.800 0.800 0.800 SCN
0.75 w
-52.240 778.110 m
-543.040 778.110 l
-545.249 778.110 547.040 776.319 547.040 774.110 c
-547.040 701.150 l
-547.040 698.941 545.249 697.150 543.040 697.150 c
-52.240 697.150 l
-50.031 697.150 48.240 698.941 48.240 701.150 c
-48.240 774.110 l
-48.240 776.319 50.031 778.110 52.240 778.110 c
+52.240 681.690 m
+543.040 681.690 l
+545.249 681.690 547.040 679.899 547.040 677.690 c
+547.040 604.730 l
+547.040 602.521 545.249 600.730 543.040 600.730 c
+52.240 600.730 l
+50.031 600.730 48.240 602.521 48.240 604.730 c
+48.240 677.690 l
+48.240 679.899 50.031 681.690 52.240 681.690 c
h
S
Q
@@ -72879,7 +73038,7 @@ Q
0.000 0.400 0.600 SCN
BT
-59.24 755.285 Td
+59.24 658.865 Td
/F3.0 11 Tf
<7061636b616765> Tj
ET
@@ -72890,7 +73049,7 @@ ET
0.200 0.200 0.200 SCN
BT
-97.74000000000001 755.285 Td
+97.74000000000001 658.865 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -72901,7 +73060,7 @@ ET
0.000 0.800 1.000 SCN
BT
-103.24000000000001 755.285 Td
+103.24000000000001 658.865 Td
/F3.0 11 Tf
<636f6d2e6d79636f6d70616e792e6d796170702e646f6d> Tj
ET
@@ -72912,7 +73071,7 @@ ET
0.200 0.200 0.200 SCN
BT
-229.74 755.285 Td
+229.74 658.865 Td
/F3.0 11 Tf
<3b> Tj
ET
@@ -72923,7 +73082,7 @@ ET
0.000 0.400 0.600 SCN
BT
-59.24 740.545 Td
+59.24 644.125 Td
/F3.0 11 Tf
<7075626c6963> Tj
ET
@@ -72934,7 +73093,7 @@ ET
0.200 0.200 0.200 SCN
BT
-92.24000000000001 740.545 Td
+92.24000000000001 644.125 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -72945,7 +73104,7 @@ ET
0.000 0.400 0.600 SCN
BT
-97.74000000000001 740.545 Td
+97.74000000000001 644.125 Td
/F3.0 11 Tf
<66696e616c> Tj
ET
@@ -72956,7 +73115,7 @@ ET
0.200 0.200 0.200 SCN
BT
-125.24000000000001 740.545 Td
+125.24000000000001 644.125 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -72967,7 +73126,7 @@ ET
0.000 0.467 0.533 SCN
BT
-130.74 740.545 Td
+130.74 644.125 Td
/F3.0 11 Tf
<636c617373> Tj
ET
@@ -72978,7 +73137,7 @@ ET
0.200 0.200 0.200 SCN
BT
-158.24 740.545 Td
+158.24 644.125 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -72989,7 +73148,7 @@ ET
0.000 0.667 0.533 SCN
BT
-163.74 740.545 Td
+163.74 644.125 Td
/F3.0 11 Tf
<4d79417070446f6d61696e4d6f64756c65> Tj
ET
@@ -73000,7 +73159,7 @@ ET
0.200 0.200 0.200 SCN
BT
-257.24 740.545 Td
+257.24 644.125 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -73011,7 +73170,7 @@ ET
0.200 0.200 0.200 SCN
BT
-262.74 740.545 Td
+262.74 644.125 Td
/F3.0 11 Tf
<7b> Tj
ET
@@ -73022,7 +73181,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 725.8050000000001 Td
+59.24 629.385 Td
/F3.0 11 Tf
<ca202020> Tj
ET
@@ -73033,7 +73192,7 @@ ET
0.000 0.400 0.600 SCN
BT
-81.24000000000001 725.8050000000001 Td
+81.24000000000001 629.385 Td
/F3.0 11 Tf
<70726976617465> Tj
ET
@@ -73044,7 +73203,7 @@ ET
0.200 0.200 0.200 SCN
BT
-119.74000000000001 725.8050000000001 Td
+119.74000000000001 629.385 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -73055,7 +73214,7 @@ ET
0.200 0.200 0.200 SCN
BT
-125.24000000000001 725.8050000000001 Td
+125.24000000000001 629.385 Td
/F3.0 11 Tf
<4d79417070446f6d61696e4d6f64756c65> Tj
ET
@@ -73066,7 +73225,7 @@ ET
0.200 0.200 0.200 SCN
BT
-218.74 725.8050000000001 Td
+218.74 629.385 Td
/F3.0 11 Tf
<28> Tj
ET
@@ -73077,7 +73236,7 @@ ET
0.200 0.200 0.200 SCN
BT
-224.24 725.8050000000001 Td
+224.24 629.385 Td
/F3.0 11 Tf
<29> Tj
ET
@@ -73088,7 +73247,7 @@ ET
0.200 0.200 0.200 SCN
BT
-229.74 725.8050000000001 Td
+229.74 629.385 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -73099,7 +73258,7 @@ ET
0.200 0.200 0.200 SCN
BT
-235.24 725.8050000000001 Td
+235.24 629.385 Td
/F3.0 11 Tf
<7b> Tj
ET
@@ -73110,7 +73269,7 @@ ET
0.200 0.200 0.200 SCN
BT
-240.74 725.8050000000001 Td
+240.74 629.385 Td
/F3.0 11 Tf
<7d> Tj
ET
@@ -73121,7 +73280,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 711.065 Td
+59.24 614.6450000000001 Td
/F3.0 11 Tf
<7d> Tj
ET
@@ -73134,7 +73293,7 @@ ET
0.981 Tw
BT
-48.24 673.1859999999999 Td
+48.24 576.766 Td
/F1.0 10.5 Tf
[<546869732074656c6c7320746865206672> 20.01953125 <616d65776f726b207468617420746865207061636b61676520616e64207375627061636b6167657320756e64657220>] TJ
ET
@@ -73149,7 +73308,7 @@ ET
0.981 Tw
BT
-388.7899359019886 673.1859999999999 Td
+388.7899359019886 576.766 Td
/F3.0 10.5 Tf
<636f6d2e6d79636f6d70616e792e6d796170702e646f6d> Tj
ET
@@ -73164,7 +73323,7 @@ ET
0.981 Tw
BT
-509.5399359019886 673.1859999999999 Td
+509.5399359019886 576.766 Td
/F1.0 10.5 Tf
<2073686f756c64> Tj
ET
@@ -73179,7 +73338,7 @@ ET
2.938 Tw
BT
-48.24 657.406 Td
+48.24 560.986 Td
/F1.0 10.5 Tf
<626520736561726368656420666f7220646f6d61696e2073657276696365732028616e6e6f7461746564207769746820> Tj
ET
@@ -73194,7 +73353,7 @@ ET
2.938 Tw
BT
-315.7545454545454 657.406 Td
+315.7545454545454 560.986 Td
/F3.0 10.5 Tf
<40446f6d61696e53657276696365> Tj
ET
@@ -73209,7 +73368,7 @@ ET
2.938 Tw
BT
-389.2545454545454 657.406 Td
+389.2545454545454 560.986 Td
/F1.0 10.5 Tf
<292c206d6978696e732028> Tj
ET
@@ -73224,7 +73383,7 @@ ET
2.938 Tw
BT
-444.6482727272726 657.406 Td
+444.6482727272726 560.986 Td
/F3.0 10.5 Tf
<404d6978696e> Tj
ET
@@ -73239,7 +73398,7 @@ ET
2.938 Tw
BT
-476.1482727272726 657.406 Td
+476.1482727272726 560.986 Td
/F1.0 10.5 Tf
<2920616e6420656e746974696573> Tj
ET
@@ -73252,7 +73411,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24 641.626 Td
+48.24 545.206 Td
/F1.0 10.5 Tf
<28> Tj
ET
@@ -73263,7 +73422,7 @@ ET
0.694 0.129 0.275 SCN
BT
-51.873000000000005 641.626 Td
+51.873000000000005 545.206 Td
/F3.0 10.5 Tf
<4050657273697374656e6365436170616261626c65> Tj
ET
@@ -73274,7 +73433,7 @@ ET
0.200 0.200 0.200 SCN
BT
-162.123 641.626 Td
+162.123 545.206 Td
/F1.0 10.5 Tf
<292e> Tj
ET
@@ -73287,7 +73446,7 @@ ET
8.624 Tw
BT
-48.24 613.8459999999999 Td
+48.24 517.4259999999999 Td
/F1.0 10.5 Tf
<41732069732070657268617073206170706172656e742c2074686520> Tj
ET
@@ -73302,7 +73461,7 @@ ET
8.624 Tw
BT
-230.21245454545453 613.8459999999999 Td
+230.21245454545453 517.4259999999999 Td
/F3.0 10.5 Tf
<6765744d6f64756c65732829> Tj
ET
@@ -73317,7 +73476,7 @@ ET
8.624 Tw
BT
-293.21245454545453 613.8459999999999 Td
+293.21245454545453 517.4259999999999 Td
/F1.0 10.5 Tf
<206d6574686f64207265706c6163657320616e64206f766572726964657320626f746820746865> Tj
ET
@@ -73332,7 +73491,7 @@ ET
12.417 Tw
BT
-48.24 598.0659999999999 Td
+48.24 501.64599999999996 Td
/F3.0 10.5 Tf
<697369732e73657276696365732e5365727669636573496e7374616c6c657246726f6d416e6e6f746174696f6e2e7061636b616765507265666978> Tj
ET
@@ -73347,7 +73506,7 @@ ET
12.417 Tw
BT
-357.99 598.0659999999999 Td
+357.99 501.64599999999996 Td
/F1.0 10.5 Tf
[<206b> 20.01953125 <65792028757375616c6c7920666f756e6420696e20746865>] TJ
ET
@@ -73362,7 +73521,7 @@ ET
3.027 Tw
BT
-48.24 582.286 Td
+48.24 485.866 Td
/F3.0 10.5 Tf
<697369732e70726f70657274696573> Tj
ET
@@ -73377,7 +73536,7 @@ ET
3.027 Tw
BT
-126.99000000000001 582.286 Td
+126.99000000000001 485.866 Td
/F1.0 10.5 Tf
[<202066696c652920616e6420616c736f2074686560697369732e706572736973746f722e646174616e75636c6575732e5265676973746572456e7469746965732e7061636b61676550726566697860206b> 20.01953125 <6579>] TJ
ET
@@ -73392,7 +73551,7 @@ ET
3.973 Tw
BT
-48.24 566.506 Td
+48.24 470.086 Td
/F1.0 10.5 Tf
<28757375616c6c7920666f756e6420696e2074686520> Tj
ET
@@ -73407,7 +73566,7 @@ ET
3.973 Tw
BT
-170.91679999999997 566.506 Td
+170.91679999999997 470.086 Td
/F3.0 10.5 Tf
<706572736973746f725f646174616e75636c6575732e70726f70657274696573> Tj
ET
@@ -73422,7 +73581,7 @@ ET
3.973 Tw
BT
-338.91679999999997 566.506 Td
+338.91679999999997 470.086 Td
/F1.0 10.5 Tf
<2066696c65292e205468652076616c7565206f662074686520> Tj
ET
@@ -73437,7 +73596,7 @@ ET
3.973 Tw
BT
-473.53999999999996 566.506 Td
+473.53999999999996 470.086 Td
/F3.0 10.5 Tf
<697369732e73657276696365732d> Tj
ET
@@ -73450,7 +73609,7 @@ ET
0.694 0.129 0.275 SCN
BT
-48.24 550.7259999999999 Td
+48.24 454.306 Td
/F3.0 10.5 Tf
<696e7374616c6c6572> Tj
ET
@@ -73461,7 +73620,7 @@ ET
0.200 0.200 0.200 SCN
BT
-95.49000000000001 550.7259999999999 Td
+95.49000000000001 454.306 Td
/F1.0 10.5 Tf
[<20636f6e6669677572> 20.01953125 <6174696f6e2070726f706572747920697320616c736f2069676e6f7265642e>] TJ
ET
@@ -73472,7 +73631,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24 522.9459999999999 Td
+48.24 426.526 Td
/F1.0 10.5 Tf
[<46> 40.0390625 <6f72206578616d706c652c2074686520286e6f6e2d4153462920>] TJ
ET
@@ -73483,7 +73642,7 @@ ET
0.259 0.545 0.792 SCN
BT
-186.70308984375 522.9459999999999 Td
+186.70308984375 426.526 Td
/F1.0 10.5 Tf
<49736973206164646f6e732720746f646f617070> Tj
ET
@@ -73494,7 +73653,7 @@ ET
0.200 0.200 0.200 SCN
BT
-288.49008984375 522.9459999999999 Td
+288.49008984375 426.526 Td
/F1.0 10.5 Tf
<20646566696e65732074686520666f6c6c6f77696e673a> Tj
ET
@@ -73503,28 +73662,28 @@ ET
0.000 0.000 0.000 scn
q
0.961 0.961 0.961 scn
-52.240 507.130 m
-543.040 507.130 l
-545.249 507.130 547.040 505.339 547.040 503.130 c
-547.040 253.290 l
-547.040 251.081 545.249 249.290 543.040 249.290 c
-52.240 249.290 l
-50.031 249.290 48.240 251.081 48.240 253.290 c
-48.240 503.130 l
-48.240 505.339 50.031 507.130 52.240 507.130 c
+52.240 410.710 m
+543.040 410.710 l
+545.249 410.710 547.040 408.919 547.040 406.710 c
+547.040 156.870 l
+547.040 154.661 545.249 152.870 543.040 152.870 c
+52.240 152.870 l
+50.031 152.870 48.240 154.661 48.240 156.870 c
+48.240 406.710 l
+48.240 408.919 50.031 410.710 52.240 410.710 c
h
f
0.800 0.800 0.800 SCN
0.75 w
-52.240 507.130 m
-543.040 507.130 l
-545.249 507.130 547.040 505.339 547.040 503.130 c
-547.040 253.290 l
-547.040 251.081 545.249 249.290 543.040 249.290 c
-52.240 249.290 l
-50.031 249.290 48.240 251.081 48.240 253.290 c
-48.240 503.130 l
-48.240 505.339 50.031 507.130 52.240 507.130 c
+52.240 410.710 m
+543.040 410.710 l
+545.249 410.710 547.040 408.919 547.040 406.710 c
+547.040 156.870 l
+547.040 154.661 545.249 152.870 543.040 152.870 c
+52.240 152.870 l
+50.031 152.870 48.240 154.661 48.240 156.870 c
+48.240 406.710 l
+48.240 408.919 50.031 410.710 52.240 410.710 c
h
S
Q
@@ -73532,7 +73691,7 @@ Q
0.600 0.600 1.000 SCN
BT
-59.24 484.305 Td
+59.24 387.88500000000005 Td
/F3.0 11 Tf
<404f76657272696465> Tj
ET
@@ -73543,7 +73702,7 @@ ET
0.000 0.400 0.600 SCN
BT
-59.24 469.565 Td
+59.24 373.14500000000004 Td
/F3.0 11 Tf
<7075626c6963> Tj
ET
@@ -73554,7 +73713,7 @@ ET
0.200 0.200 0.200 SCN
BT
-92.24000000000001 469.565 Td
+92.24000000000001 373.14500000000004 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -73565,7 +73724,7 @@ ET
0.000 0.467 0.533 SCN
BT
-97.74000000000001 469.565 Td
+97.74000000000001 373.14500000000004 Td
/F3.0 11 Tf
<4c697374> Tj
ET
@@ -73576,7 +73735,7 @@ ET
0.200 0.200 0.200 SCN
BT
-119.74000000000001 469.565 Td
+119.74000000000001 373.14500000000004 Td
/F3.0 11 Tf
<3c> Tj
ET
@@ -73587,7 +73746,7 @@ ET
0.000 0.467 0.533 SCN
BT
-125.24000000000001 469.565 Td
+125.24000000000001 373.14500000000004 Td
/F3.0 11 Tf
<436c617373> Tj
ET
@@ -73598,7 +73757,7 @@ ET
0.200 0.200 0.200 SCN
BT
-152.74 469.565 Td
+152.74 373.14500000000004 Td
/F3.0 11 Tf
<3c> Tj
ET
@@ -73609,7 +73768,7 @@ ET
0.200 0.200 0.200 SCN
BT
-158.24 469.565 Td
+158.24 373.14500000000004 Td
/F3.0 11 Tf
<3f> Tj
ET
@@ -73620,7 +73779,7 @@ ET
0.200 0.200 0.200 SCN
BT
-163.74 469.565 Td
+163.74 373.14500000000004 Td
/F3.0 11 Tf
<3e> Tj
ET
@@ -73631,7 +73790,7 @@ ET
0.200 0.200 0.200 SCN
BT
-169.24 469.565 Td
+169.24 373.14500000000004 Td
/F3.0 11 Tf
<3e> Tj
ET
@@ -73642,7 +73801,7 @@ ET
0.200 0.200 0.200 SCN
BT
-174.74 469.565 Td
+174.74 373.14500000000004 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -73653,7 +73812,7 @@ ET
0.200 0.200 0.200 SCN
BT
-180.24 469.565 Td
+180.24 373.14500000000004 Td
/F3.0 11 Tf
<6765744d6f64756c6573> Tj
ET
@@ -73664,7 +73823,7 @@ ET
0.200 0.200 0.200 SCN
BT
-235.24 469.565 Td
+235.24 373.14500000000004 Td
/F3.0 11 Tf
<28> Tj
ET
@@ -73675,7 +73834,7 @@ ET
0.200 0.200 0.200 SCN
BT
-240.74 469.565 Td
+240.74 373.14500000000004 Td
/F3.0 11 Tf
<29> Tj
ET
@@ -73686,7 +73845,7 @@ ET
0.200 0.200 0.200 SCN
BT
-246.24 469.565 Td
+246.24 373.14500000000004 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -73697,7 +73856,7 @@ ET
0.200 0.200 0.200 SCN
BT
-251.74 469.565 Td
+251.74 373.14500000000004 Td
/F3.0 11 Tf
<7b> Tj
ET
@@ -73708,7 +73867,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 454.825 Td
+59.24 358.40500000000003 Td
/F3.0 11 Tf
<ca202020> Tj
ET
@@ -73719,7 +73878,7 @@ ET
0.000 0.400 0.600 SCN
BT
-81.24000000000001 454.825 Td
+81.24000000000001 358.40500000000003 Td
/F3.0 11 Tf
<72657475726e> Tj
ET
@@ -73730,7 +73889,7 @@ ET
0.200 0.200 0.200 SCN
BT
-114.24000000000001 454.825 Td
+114.24000000000001 358.40500000000003 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -73741,7 +73900,7 @@ ET
0.000 0.467 0.533 SCN
BT
-119.74000000000001 454.825 Td
+119.74000000000001 358.40500000000003 Td
/F3.0 11 Tf
<417272617973> Tj
ET
@@ -73752,7 +73911,7 @@ ET
0.200 0.200 0.200 SCN
BT
-152.74 454.825 Td
+152.74 358.40500000000003 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -73763,7 +73922,7 @@ ET
0.200 0.200 0.200 SCN
BT
-158.24 454.825 Td
+158.24 358.40500000000003 Td
/F3.0 11 Tf
<61734c697374> Tj
ET
@@ -73774,7 +73933,7 @@ ET
0.200 0.200 0.200 SCN
BT
-191.24 454.825 Td
+191.24 358.40500000000003 Td
/F3.0 11 Tf
<28> Tj
ET
@@ -73785,7 +73944,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 440.085 Td
+59.24 343.665 Td
/F3.0 11 Tf
<ca2020202020202020202020> Tj
ET
@@ -73796,7 +73955,7 @@ ET
0.200 0.200 0.200 SCN
BT
-125.24000000000001 440.085 Td
+125.24000000000001 343.665 Td
/F3.0 11 Tf
<546f446f417070446f6d61696e4d6f64756c65> Tj
ET
@@ -73807,7 +73966,7 @@ ET
0.200 0.200 0.200 SCN
BT
-229.74 440.085 Td
+229.74 343.665 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -73818,7 +73977,7 @@ ET
0.200 0.200 0.200 SCN
BT
-235.24 440.085 Td
+235.24 343.665 Td
/F3.0 11 Tf
<636c617373> Tj
ET
@@ -73829,7 +73988,7 @@ ET
0.200 0.200 0.200 SCN
BT
-262.74 440.085 Td
+262.74 343.665 Td
/F3.0 11 Tf
<2c> Tj
ET
@@ -73840,7 +73999,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 425.34499999999997 Td
+59.24 328.925 Td
/F3.0 11 Tf
<ca2020202020202020202020> Tj
ET
@@ -73851,7 +74010,7 @@ ET
0.200 0.200 0.200 SCN
BT
-125.24000000000001 425.34499999999997 Td
+125.24000000000001 328.925 Td
/F3.0 11 Tf
<546f446f417070466978747572654d6f64756c65> Tj
ET
@@ -73862,7 +74021,7 @@ ET
0.200 0.200 0.200 SCN
BT
-235.24 425.34499999999997 Td
+235.24 328.925 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -73873,7 +74032,7 @@ ET
0.200 0.200 0.200 SCN
BT
-240.74 425.34499999999997 Td
+240.74 328.925 Td
/F3.0 11 Tf
<636c617373> Tj
ET
@@ -73884,7 +74043,7 @@ ET
0.200 0.200 0.200 SCN
BT
-268.24 425.34499999999997 Td
+268.24 328.925 Td
/F3.0 11 Tf
<2c> Tj
ET
@@ -73895,7 +74054,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 410.605 Td
+59.24 314.18500000000006 Td
/F3.0 11 Tf
<ca2020202020202020202020> Tj
ET
@@ -73906,7 +74065,7 @@ ET
0.200 0.200 0.200 SCN
BT
-125.24000000000001 410.605 Td
+125.24000000000001 314.18500000000006 Td
/F3.0 11 Tf
<546f446f4170704170704d6f64756c65> Tj
ET
@@ -73917,7 +74076,7 @@ ET
0.200 0.200 0.200 SCN
BT
-213.24 410.605 Td
+213.24 314.18500000000006 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -73928,7 +74087,7 @@ ET
0.200 0.200 0.200 SCN
BT
-218.74 410.605 Td
+218.74 314.18500000000006 Td
/F3.0 11 Tf
<636c617373> Tj
ET
@@ -73939,7 +74098,7 @@ ET
0.200 0.200 0.200 SCN
BT
-246.24 410.605 Td
+246.24 314.18500000000006 Td
/F3.0 11 Tf
<2c> Tj
ET
@@ -73950,7 +74109,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 395.865 Td
+59.24 299.44500000000005 Td
/F3.0 11 Tf
<ca2020202020202020202020> Tj
ET
@@ -73961,7 +74120,7 @@ ET
0.200 0.200 0.200 SCN
BT
-125.24000000000001 395.865 Td
+125.24000000000001 299.44500000000005 Td
/F3.0 11 Tf
<6f7267> Tj
ET
@@ -73972,7 +74131,7 @@ ET
0.200 0.200 0.200 SCN
BT
-141.74 395.865 Td
+141.74 299.44500000000005 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -73983,7 +74142,7 @@ ET
0.200 0.200 0.200 SCN
BT
-147.24 395.865 Td
+147.24 299.44500000000005 Td
/F3.0 11 Tf
<697369736164646f6e73> Tj
ET
@@ -73994,7 +74153,7 @@ ET
0.200 0.200 0.200 SCN
BT
-202.24 395.865 Td
+202.24 299.44500000000005 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -74005,7 +74164,7 @@ ET
0.200 0.200 0.200 SCN
BT
-207.74 395.865 Td
+207.74 299.44500000000005 Td
/F3.0 11 Tf
<6d6f64756c65> Tj
ET
@@ -74016,7 +74175,7 @@ ET
0.200 0.200 0.200 SCN
BT
-240.74 395.865 Td
+240.74 299.44500000000005 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -74027,7 +74186,7 @@ ET
0.200 0.200 0.200 SCN
BT
-246.24 395.865 Td
+246.24 299.44500000000005 Td
/F3.0 11 Tf
<6175646974> Tj
ET
@@ -74038,7 +74197,7 @@ ET
0.200 0.200 0.200 SCN
BT
-273.74 395.865 Td
+273.74 299.44500000000005 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -74049,7 +74208,7 @@ ET
0.200 0.200 0.200 SCN
BT
-279.24 395.865 Td
+279.24 299.44500000000005 Td
/F3.0 11 Tf
<41756469744d6f64756c65> Tj
ET
@@ -74060,7 +74219,7 @@ ET
0.200 0.200 0.200 SCN
BT
-339.74 395.865 Td
+339.74 299.44500000000005 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -74071,7 +74230,7 @@ ET
0.200 0.200 0.200 SCN
BT
-345.24 395.865 Td
+345.24 299.44500000000005 Td
/F3.0 11 Tf
<636c617373> Tj
ET
@@ -74082,7 +74241,7 @@ ET
0.200 0.200 0.200 SCN
BT
-372.74 395.865 Td
+372.74 299.44500000000005 Td
/F3.0 11 Tf
<2c> Tj
ET
@@ -74093,7 +74252,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 381.125 Td
+59.24 284.70500000000004 Td
/F3.0 11 Tf
<ca2020202020202020202020> Tj
ET
@@ -74104,7 +74263,7 @@ ET
0.200 0.200 0.200 SCN
BT
-125.24000000000001 381.125 Td
+125.24000000000001 284.70500000000004 Td
/F3.0 11 Tf
<6f7267> Tj
ET
@@ -74115,7 +74274,7 @@ ET
0.200 0.200 0.200 SCN
BT
-141.74 381.125 Td
+141.74 284.70500000000004 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -74126,7 +74285,7 @@ ET
0.200 0.200 0.200 SCN
BT
-147.24 381.125 Td
+147.24 284.70500000000004 Td
/F3.0 11 Tf
<697369736164646f6e73> Tj
ET
@@ -74137,7 +74296,7 @@ ET
0.200 0.200 0.200 SCN
BT
-202.24 381.125 Td
+202.24 284.70500000000004 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -74148,7 +74307,7 @@ ET
0.200 0.200 0.200 SCN
BT
-207.74 381.125 Td
+207.74 284.70500000000004 Td
/F3.0 11 Tf
<6d6f64756c65> Tj
ET
@@ -74159,7 +74318,7 @@ ET
0.200 0.200 0.200 SCN
BT
-240.74 381.125 Td
+240.74 284.70500000000004 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -74170,7 +74329,7 @@ ET
0.200 0.200 0.200 SCN
BT
-246.24 381.125 Td
+246.24 284.70500000000004 Td
/F3.0 11 Tf
<636f6d6d616e64> Tj
ET
@@ -74181,7 +74340,7 @@ ET
0.200 0.200 0.200 SCN
BT
-284.74 381.125 Td
+284.74 284.70500000000004 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -74192,7 +74351,7 @@ ET
0.200 0.200 0.200 SCN
BT
-290.24 381.125 Td
+290.24 284.70500000000004 Td
/F3.0 11 Tf
<436f6d6d616e644d6f64756c65> Tj
ET
@@ -74203,7 +74362,7 @@ ET
0.200 0.200 0.200 SCN
BT
-361.74 381.125 Td
+361.74 284.70500000000004 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -74214,7 +74373,7 @@ ET
0.200 0.200 0.200 SCN
BT
-367.24 381.125 Td
+367.24 284.70500000000004 Td
/F3.0 11 Tf
<636c617373> Tj
ET
@@ -74225,7 +74384,7 @@ ET
0.200 0.200 0.200 SCN
BT
-394.74 381.125 Td
+394.74 284.70500000000004 Td
/F3.0 11 Tf
<2c> Tj
ET
@@ -74236,7 +74395,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 366.385 Td
+59.24 269.96500000000003 Td
/F3.0 11 Tf
<ca2020202020202020202020> Tj
ET
@@ -74247,7 +74406,7 @@ ET
0.200 0.200 0.200 SCN
BT
-125.24000000000001 366.385 Td
+125.24000000000001 269.96500000000003 Td
/F3.0 11 Tf
<6f7267> Tj
ET
@@ -74258,7 +74417,7 @@ ET
0.200 0.200 0.200 SCN
BT
-141.74 366.385 Td
+141.74 269.96500000000003 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -74269,7 +74428,7 @@ ET
0.200 0.200 0.200 SCN
BT
-147.24 366.385 Td
+147.24 269.96500000000003 Td
/F3.0 11 Tf
<697369736164646f6e73> Tj
ET
@@ -74280,7 +74439,7 @@ ET
0.200 0.200 0.200 SCN
BT
-202.24 366.385 Td
+202.24 269.96500000000003 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -74291,7 +74450,7 @@ ET
0.200 0.200 0.200 SCN
BT
-207.74 366.385 Td
+207.74 269.96500000000003 Td
/F3.0 11 Tf
<6d6f64756c65> Tj
ET
@@ -74302,7 +74461,7 @@ ET
0.200 0.200 0.200 SCN
BT
-240.74 366.385 Td
+240.74 269.96500000000003 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -74313,7 +74472,7 @@ ET
0.200 0.200 0.200 SCN
BT
-246.24 366.385 Td
+246.24 269.96500000000003 Td
/F3.0 11 Tf
<6465767574696c73> Tj
ET
@@ -74324,7 +74483,7 @@ ET
0.200 0.200 0.200 SCN
BT
-290.24 366.385 Td
+290.24 269.96500000000003 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -74335,7 +74494,7 @@ ET
0.200 0.200 0.200 SCN
BT
-295.74 366.385 Td
+295.74 269.96500000000003 Td
/F3.0 11 Tf
<4465765574696c734d6f64756c65> Tj
ET
@@ -74346,7 +74505,7 @@ ET
0.200 0.200 0.200 SCN
BT
-372.74 366.385 Td
+372.74 269.96500000000003 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -74357,7 +74516,7 @@ ET
0.200 0.200 0.200 SCN
BT
-378.24 366.385 Td
+378.24 269.96500000000003 Td
/F3.0 11 Tf
<636c617373> Tj
ET
@@ -74368,7 +74527,7 @@ ET
0.200 0.200 0.200 SCN
BT
-405.74 366.385 Td
+405.74 269.96500000000003 Td
/F3.0 11 Tf
<2c> Tj
ET
@@ -74379,7 +74538,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 351.645 Td
+59.24 255.22500000000005 Td
/F3.0 11 Tf
<ca2020202020202020202020> Tj
ET
@@ -74390,7 +74549,7 @@ ET
0.200 0.200 0.200 SCN
BT
-125.24000000000001 351.645 Td
+125.24000000000001 255.22500000000005 Td
/F3.0 11 Tf
<6f7267> Tj
ET
@@ -74401,7 +74560,7 @@ ET
0.200 0.200 0.200 SCN
BT
-141.74 351.645 Td
+141.74 255.22500000000005 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -74412,7 +74571,7 @@ ET
0.200 0.200 0.200 SCN
BT
-147.24 351.645 Td
+147.24 255.22500000000005 Td
/F3.0 11 Tf
<697369736164646f6e73> Tj
ET
@@ -74423,7 +74582,7 @@ ET
0.200 0.200 0.200 SCN
BT
-202.24 351.645 Td
+202.24 255.22500000000005 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -74434,7 +74593,7 @@ ET
0.200 0.200 0.200 SCN
BT
-207.74 351.645 Td
+207.74 255.22500000000005 Td
/F3.0 11 Tf
<6d6f64756c65> Tj
ET
@@ -74445,7 +74604,7 @@ ET
0.200 0.200 0.200 SCN
BT
-240.74 351.645 Td
+240.74 255.22500000000005 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -74456,7 +74615,7 @@ ET
0.200 0.200 0.200 SCN
BT
-246.24 351.645 Td
+246.24 255.22500000000005 Td
/F3.0 11 Tf
<646f6378> Tj
ET
@@ -74467,7 +74626,7 @@ ET
0.200 0.200 0.200 SCN
BT
-268.24 351.645 Td
+268.24 255.22500000000005 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -74478,7 +74637,7 @@ ET
0.200 0.200 0.200 SCN
BT
-273.74 351.645 Td
+273.74 255.22500000000005 Td
/F3.0 11 Tf
<446f63784d6f64756c65> Tj
ET
@@ -74489,7 +74648,7 @@ ET
0.200 0.200 0.200 SCN
BT
-328.74 351.645 Td
+328.74 255.22500000000005 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -74500,7 +74659,7 @@ ET
0.200 0.200 0.200 SCN
BT
-334.24 351.645 Td
+334.24 255.22500000000005 Td
/F3.0 11 Tf
<636c617373> Tj
ET
@@ -74511,7 +74670,7 @@ ET
0.200 0.200 0.200 SCN
BT
-361.74 351.645 Td
+361.74 255.22500000000005 Td
/F3.0 11 Tf
<2c> Tj
ET
@@ -74522,7 +74681,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 336.905 Td
+59.24 240.48500000000004 Td
/F3.0 11 Tf
<ca2020202020202020202020> Tj
ET
@@ -74533,7 +74692,7 @@ ET
0.200 0.200 0.200 SCN
BT
-125.24000000000001 336.905 Td
+125.24000000000001 240.48500000000004 Td
/F3.0 11 Tf
<6f7267> Tj
ET
@@ -74544,7 +74703,7 @@ ET
0.200 0.200 0.200 SCN
BT
-141.74 336.905 Td
+141.74 240.48500000000004 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -74555,7 +74714,7 @@ ET
0.200 0.200 0.200 SCN
BT
-147.24 336.905 Td
+147.24 240.48500000000004 Td
/F3.0 11 Tf
<697369736164646f6e73> Tj
ET
@@ -74566,7 +74725,7 @@ ET
0.200 0.200 0.200 SCN
BT
-202.24 336.905 Td
+202.24 240.48500000000004 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -74577,7 +74736,7 @@ ET
0.200 0.200 0.200 SCN
BT
-207.74 336.905 Td
+207.74 240.48500000000004 Td
/F3.0 11 Tf
<6d6f64756c65> Tj
ET
@@ -74588,7 +74747,7 @@ ET
0.200 0.200 0.200 SCN
BT
-240.74 336.905 Td
+240.74 240.48500000000004 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -74599,7 +74758,7 @@ ET
0.200 0.200 0.200 SCN
BT
-246.24 336.905 Td
+246.24 240.48500000000004 Td
/F3.0 11 Tf
<7075626c697368696e67> Tj
ET
@@ -74610,7 +74769,7 @@ ET
0.200 0.200 0.200 SCN
BT
-301.24 336.905 Td
+301.24 240.48500000000004 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -74621,7 +74780,7 @@ ET
0.200 0.200 0.200 SCN
BT
-306.74 336.905 Td
+306.74 240.48500000000004 Td
/F3.0 11 Tf
<5075626c697368696e674d6f64756c65> Tj
ET
@@ -74632,7 +74791,7 @@ ET
0.200 0.200 0.200 SCN
BT
-394.74 336.905 Td
+394.74 240.48500000000004 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -74643,7 +74802,7 @@ ET
0.200 0.200 0.200 SCN
BT
-400.24 336.905 Td
+400.24 240.48500000000004 Td
/F3.0 11 Tf
<636c617373> Tj
ET
@@ -74654,7 +74813,7 @@ ET
0.200 0.200 0.200 SCN
BT
-427.74 336.905 Td
+427.74 240.48500000000004 Td
/F3.0 11 Tf
<2c> Tj
ET
@@ -74665,7 +74824,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 322.16499999999996 Td
+59.24 225.74500000000003 Td
/F3.0 11 Tf
<ca2020202020202020202020> Tj
ET
@@ -74676,7 +74835,7 @@ ET
0.200 0.200 0.200 SCN
BT
-125.24000000000001 322.16499999999996 Td
+125.24000000000001 225.74500000000003 Td
/F3.0 11 Tf
<6f7267> Tj
ET
@@ -74687,7 +74846,7 @@ ET
0.200 0.200 0.200 SCN
BT
-141.74 322.16499999999996 Td
+141.74 225.74500000000003 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -74698,7 +74857,7 @@ ET
0.200 0.200 0.200 SCN
BT
-147.24 322.16499999999996 Td
+147.24 225.74500000000003 Td
/F3.0 11 Tf
<697369736164646f6e73> Tj
ET
@@ -74709,7 +74868,7 @@ ET
0.200 0.200 0.200 SCN
BT
-202.24 322.16499999999996 Td
+202.24 225.74500000000003 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -74720,7 +74879,7 @@ ET
0.200 0.200 0.200 SCN
BT
-207.74 322.16499999999996 Td
+207.74 225.74500000000003 Td
/F3.0 11 Tf
<6d6f64756c65> Tj
ET
@@ -74731,7 +74890,7 @@ ET
0.200 0.200 0.200 SCN
BT
-240.74 322.16499999999996 Td
+240.74 225.74500000000003 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -74742,7 +74901,7 @@ ET
0.200 0.200 0.200 SCN
BT
-246.24 322.16499999999996 Td
+246.24 225.74500000000003 Td
/F3.0 11 Tf
<73657373696f6e6c6f67676572> Tj
ET
@@ -74753,7 +74912,7 @@ ET
0.200 0.200 0.200 SCN
BT
-317.74 322.16499999999996 Td
+317.74 225.74500000000003 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -74764,7 +74923,7 @@ ET
0.200 0.200 0.200 SCN
BT
-323.24 322.16499999999996 Td
+323.24 225.74500000000003 Td
/F3.0 11 Tf
<53657373696f6e4c6f676765724d6f64756c65> Tj
ET
@@ -74775,7 +74934,7 @@ ET
0.200 0.200 0.200 SCN
BT
-427.74 322.16499999999996 Td
+427.74 225.74500000000003 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -74786,7 +74945,7 @@ ET
0.200 0.200 0.200 SCN
BT
-433.24 322.16499999999996 Td
+433.24 225.74500000000003 Td
/F3.0 11 Tf
<636c617373> Tj
ET
@@ -74797,7 +74956,7 @@ ET
0.200 0.200 0.200 SCN
BT
-460.74 322.16499999999996 Td
+460.74 225.74500000000003 Td
/F3.0 11 Tf
<2c> Tj
ET
@@ -74808,7 +74967,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 307.42499999999995 Td
+59.24 211.00500000000002 Td
/F3.0 11 Tf
<ca2020202020202020202020> Tj
ET
@@ -74819,7 +74978,7 @@ ET
0.200 0.200 0.200 SCN
BT
-125.24000000000001 307.42499999999995 Td
+125.24000000000001 211.00500000000002 Td
/F3.0 11 Tf
<6f7267> Tj
ET
@@ -74830,7 +74989,7 @@ ET
0.200 0.200 0.200 SCN
BT
-141.74 307.42499999999995 Td
+141.74 211.00500000000002 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -74841,7 +75000,7 @@ ET
0.200 0.200 0.200 SCN
BT
-147.24 307.42499999999995 Td
+147.24 211.00500000000002 Td
/F3.0 11 Tf
<697369736164646f6e73> Tj
ET
@@ -74852,7 +75011,7 @@ ET
0.200 0.200 0.200 SCN
BT
-202.24 307.42499999999995 Td
+202.24 211.00500000000002 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -74863,7 +75022,7 @@ ET
0.200 0.200 0.200 SCN
BT
-207.74 307.42499999999995 Td
+207.74 211.00500000000002 Td
/F3.0 11 Tf
<6d6f64756c65> Tj
ET
@@ -74874,7 +75033,7 @@ ET
0.200 0.200 0.200 SCN
BT
-240.74 307.42499999999995 Td
+240.74 211.00500000000002 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -74885,7 +75044,7 @@ ET
0.200 0.200 0.200 SCN
BT
-246.24 307.42499999999995 Td
+246.24 211.00500000000002 Td
/F3.0 11 Tf
<73657474696e6773> Tj
ET
@@ -74896,7 +75055,7 @@ ET
0.200 0.200 0.200 SCN
BT
-290.24 307.42499999999995 Td
+290.24 211.00500000000002 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -74907,7 +75066,7 @@ ET
0.200 0.200 0.200 SCN
BT
-295.74 307.42499999999995 Td
+295.74 211.00500000000002 Td
/F3.0 11 Tf
<53657474696e67734d6f64756c65> Tj
ET
@@ -74918,7 +75077,7 @@ ET
0.200 0.200 0.200 SCN
BT
-372.74 307.42499999999995 Td
+372.74 211.00500000000002 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -74929,7 +75088,7 @@ ET
0.200 0.200 0.200 SCN
BT
-378.24 307.42499999999995 Td
+378.24 211.00500000000002 Td
/F3.0 11 Tf
<636c617373> Tj
ET
@@ -74940,7 +75099,7 @@ ET
0.200 0.200 0.200 SCN
BT
-405.74 307.42499999999995 Td
+405.74 211.00500000000002 Td
/F3.0 11 Tf
<2c> Tj
ET
@@ -74951,7 +75110,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 292.68499999999995 Td
+59.24 196.26500000000001 Td
/F3.0 11 Tf
<ca2020202020202020202020> Tj
ET
@@ -74962,7 +75121,7 @@ ET
0.200 0.200 0.200 SCN
BT
-125.24000000000001 292.68499999999995 Td
+125.24000000000001 196.26500000000001 Td
/F3.0 11 Tf
<6f7267> Tj
ET
@@ -74973,7 +75132,7 @@ ET
0.200 0.200 0.200 SCN
BT
-141.74 292.68499999999995 Td
+141.74 196.26500000000001 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -74984,7 +75143,7 @@ ET
0.200 0.200 0.200 SCN
BT
-147.24 292.68499999999995 Td
+147.24 196.26500000000001 Td
/F3.0 11 Tf
<697369736164646f6e73> Tj
ET
@@ -74995,7 +75154,7 @@ ET
0.200 0.200 0.200 SCN
BT
-202.24 292.68499999999995 Td
+202.24 196.26500000000001 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -75006,7 +75165,7 @@ ET
0.200 0.200 0.200 SCN
BT
-207.74 292.68499999999995 Td
+207.74 196.26500000000001 Td
/F3.0 11 Tf
<7769636b6574> Tj
ET
@@ -75017,7 +75176,7 @@ ET
0.200 0.200 0.200 SCN
BT
-240.74 292.68499999999995 Td
+240.74 196.26500000000001 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -75028,7 +75187,7 @@ ET
0.200 0.200 0.200 SCN
BT
-246.24 292.68499999999995 Td
+246.24 196.26500000000001 Td
/F3.0 11 Tf
<676d617033> Tj
ET
@@ -75039,7 +75198,7 @@ ET
0.200 0.200 0.200 SCN
BT
-273.74 292.68499999999995 Td
+273.74 196.26500000000001 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -75050,7 +75209,7 @@ ET
0.200 0.200 0.200 SCN
BT
-279.24 292.68499999999995 Td
+279.24 196.26500000000001 Td
/F3.0 11 Tf
<637074> Tj
ET
@@ -75061,7 +75220,7 @@ ET
0.200 0.200 0.200 SCN
BT
-295.74 292.68499999999995 Td
+295.74 196.26500000000001 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -75072,7 +75231,7 @@ ET
0.200 0.200 0.200 SCN
BT
-301.24 292.68499999999995 Td
+301.24 196.26500000000001 Td
/F3.0 11 Tf
<73657276696365> Tj
ET
@@ -75083,7 +75242,7 @@ ET
0.200 0.200 0.200 SCN
BT
-339.74 292.68499999999995 Td
+339.74 196.26500000000001 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -75094,7 +75253,7 @@ ET
0.200 0.200 0.200 SCN
BT
-345.24 292.68499999999995 Td
+345.24 196.26500000000001 Td
/F3.0 11 Tf
<476d617033536572766963654d6f64756c65> Tj
ET
@@ -75105,7 +75264,7 @@ ET
0.200 0.200 0.200 SCN
BT
-444.24 292.68499999999995 Td
+444.24 196.26500000000001 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -75116,7 +75275,7 @@ ET
0.200 0.200 0.200 SCN
BT
-449.74 292.68499999999995 Td
+449.74 196.26500000000001 Td
/F3.0 11 Tf
<636c617373> Tj
ET
@@ -75127,7 +75286,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 277.94499999999994 Td
+59.24 181.525 Td
/F3.0 11 Tf
<ca202020> Tj
ET
@@ -75138,7 +75297,7 @@ ET
0.200 0.200 0.200 SCN
BT
-81.24000000000001 277.94499999999994 Td
+81.24000000000001 181.525 Td
/F3.0 11 Tf
<29> Tj
ET
@@ -75149,7 +75308,7 @@ ET
0.200 0.200 0.200 SCN
BT
-86.74000000000001 277.94499999999994 Td
+86.74000000000001 181.525 Td
/F3.0 11 Tf
<3b> Tj
ET
@@ -75160,7 +75319,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 263.2049999999999 Td
+59.24 166.785 Td
/F3.0 11 Tf
<7d> Tj
ET
@@ -75173,7 +75332,7 @@ ET
1.125 Tw
BT
-48.24 225.32599999999996 Td
+48.24 128.906 Td
/F1.0 10.5 Tf
<41732063616e206265207365656e2c2074686520766172696f757320286e6f6e2d4153462920> Tj
ET
@@ -75188,7 +75347,7 @@ ET
1.125 Tw
BT
-245.6632772216797 225.32599999999996 Td
+245.6632772216797 128.906 Td
/F1.0 10.5 Tf
[<497369732041> 20.01953125 <64646f6e73>] TJ
ET
@@ -75203,7 +75362,7 @@ ET
1.125 Tw
BT
-303.8138974609375 225.32599999999996 Td
+303.8138974609375 128.906 Td
/F1.0 10.5 Tf
<206d6f64756c657320616c736f20656163682070726f766964652061206d6f64756c6520636c6173732074686174> Tj
ET
@@ -75216,7 +75375,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24 209.54599999999996 Td
+48.24 113.126 Td
/F1.0 10.5 Tf
<63616e20626520656173696c79207265666572656e6365642e> Tj
ET
@@ -75227,7 +75386,7 @@ ET
0.694 0.129 0.275 SCN
BT
-48.24 179.89999999999995 Td
+48.24 83.48 Td
/F3.0 10.5 Tf
<6765744164646974696f6e616c53657276696365732829> Tj
ET
@@ -75240,7 +75399,7 @@ ET
1.132 Tw
BT
-48.24 155.66599999999994 Td
+48.24 59.24600000000001 Td
/F1.0 10.5 Tf
[<57> 60.05859375 <65206e6f726d616c6c79207765207265636f6d6d656e6420746861742073657276696365732061726520646566696e6564206578636c75736976656c79207468726f75676820>] TJ
ET
@@ -75255,7 +75414,7 @@ ET
1.132 Tw
BT
-434.6518141276041 155.66599999999994 Td
+434.6518141276041 59.24600000000001 Td
/F3.0 10.5 Tf
<6765744d6f64756c65732829> Tj
ET
@@ -75270,7 +75429,7 @@ ET
1.132 Tw
BT
-497.6518141276041 155.66599999999994 Td
+497.6518141276041 59.24600000000001 Td
/F1.0 10.5 Tf
<2c20616e642074686174> Tj
ET
@@ -75279,129 +75438,6 @@ 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.537 Tw
-
-BT
-48.24 139.88599999999994 Td
-/F1.0 10.5 Tf
-<74686973206d6574686f642073686f756c64207468657265666f72652072657475726e20616e20656d707479206c6973742e20486f77657665722c20746865726520617265206365727461696e2075736520636173657320776865726520746865> 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.473 Tw
-
-BT
-48.24 124.10599999999994 Td
-/F1.0 10.5 Tf
-<612073657276696365206d757374206265206578706c696369746c792073706563696669656420656974686572206265636175736520746865207365727669636520726571756972656420646f6573206e6f742028666f72207768617465766572> Tj
-ET
-
-
-0.000 Tw
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-BT
-48.24 108.32599999999994 Td
-/F1.0 10.5 Tf
-<726561736f6e292068617665206120> 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
-124.21800000000002 108.32599999999994 Td
-/F3.0 10.5 Tf
-<40446f6d61696e53657276696365> 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
-197.71800000000002 108.32599999999994 Td
-/F1.0 10.5 Tf
-<20616e6e6f746174696f6e2e> 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
-
-2.725 Tw
-
-BT
-48.24 80.54599999999994 Td
-/F1.0 10.5 Tf
-[<46> 40.0390625 <6f72206578616d706c652c2074686520286e6f6e2d4153462920>] 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
-
-2.725 Tw
-
-BT
-197.60306219951923 80.54599999999994 Td
-/F1.0 10.5 Tf
-<49736973206164646f6e7327207365637572697479> Tj
-ET
-
-
-0.000 Tw
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-2.725 Tw
-
-BT
-303.9055483774038 80.54599999999994 Td
-/F1.0 10.5 Tf
-<206d6f64756c65202876312e392e302920616c6c6f77732074686520706f6c69637920746f206576616c75617465> 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
-
-15.081 Tw
-
-BT
-48.24 64.76599999999993 Td
-/F1.0 10.5 Tf
-[<636f6e666c696374696e67207065726d697373696f6e7320746f206265207370656369666965642062> 20.01953125 <79206578706c696369746c79207265676973746572696e672065697468657220746865>] TJ
-ET
-
-
-0.000 Tw
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
q
0.000 0.000 0.000 scn
0.000 0.000 0.000 SCN
@@ -75426,19 +75462,44 @@ Q
endstream
endobj
-435 0 obj
+432 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0
<TRUNCATED>
[08/10] isis-site git commit: ISIS-1521: docs
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/8b42f65e/content/guides/rgcms/rgcms.html
----------------------------------------------------------------------
diff --git a/content/guides/rgcms/rgcms.html b/content/guides/rgcms/rgcms.html
index e9e7d7e..13fb099 100644
--- a/content/guides/rgcms/rgcms.html
+++ b/content/guides/rgcms/rgcms.html
@@ -3112,8 +3112,21 @@ table.CodeRay td.code>pre{padding:0}
<div class="paragraph">
<p>This section describes how to implement the <code>AppManifest</code> interface to bootstrap both an Apache Isis web application, and also its integration tests.</p>
</div>
+ <div class="admonitionblock tip">
+ <table>
+ <tbody>
+ <tr>
+ <td class="icon"> <i class="fa icon-tip" title="Tip"></i> </td>
+ <td class="content">
+ <div class="paragraph">
+ <p>(As of <code>1.15.0-SNAPSHOT</code>), the framework-provided <code>AppManifestAbstract</code> and <code>AppManifestAbstract.Builder</code> make it easy to write <code>AppManifest</code> that can be used both to bootstrap the application "proper", and to be tweaked for use within integration tests.</p>
+ </div> </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
<div class="sect3">
- <h4 id="_api">3.1.1. API</h4>
+ <h4 id="__rgcms_classes_AppManifest-bootstrapping_api">3.1.1. API</h4>
<div class="paragraph">
<p>The <code>AppManifest</code> interface allows the constituent parts of an application to be defined programmatically, most specifically the packages that contain domain services and/or persistent entities. Its API is defined as:</p>
</div>
@@ -3163,7 +3176,7 @@ table.CodeRay td.code>pre{padding:0}
<p>The following sections describe each of these methods in a little more detail.</p>
</div>
<div class="sect4">
- <h5 id="__code_getmodules_code"><code>getModules()</code></h5>
+ <h5 id="__rgcms_classes_AppManifest-bootstrapping_api_getModules"><code>getModules()</code></h5>
<div class="paragraph">
<p>The most significant method (the only one which must return a non-<code>null</code> value) is the <code>getModules()</code> method. Each module is identified by a class; the framework simply uses that class' package as the root to search for domain services (annotated with <a href="../rgant/rgant.html#_rgant-DomainService"><code>@DomainService</code></a>) and entities (annotated with <a href="../rgant/rgant.html#_rgant-PersistenceCapable"><code>@PersistenceCapable</code></a>). Generally there is one such module class per Maven module.</p>
</div>
@@ -3212,7 +3225,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect4">
- <h5 id="__code_getadditionalservices_code"><code>getAdditionalServices()</code></h5>
+ <h5 id="__rgcms_classes_AppManifest-bootstrapping_api_getAdditionalServices"><code>getAdditionalServices()</code></h5>
<div class="paragraph">
<p>We normally we recommend that services are defined exclusively through <code>getModules()</code>, and that this method should therefore return an empty list. However, there are certain use cases where the a service must be explicitly specified either because the service required does not (for whatever reason) have a <a href="../rgant/rgant.html#_rgant-DomainService"><code>@DomainService</code></a> annotation.</p>
</div>
@@ -3234,7 +3247,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect4">
- <h5 id="__code_getauthenticationmechanism_code"><code>getAuthenticationMechanism()</code></h5>
+ <h5 id="__rgcms_classes_AppManifest-bootstrapping_api_getAuthenticationMechanism"><code>getAuthenticationMechanism()</code></h5>
<div class="paragraph">
<p>If non-<code>null</code>, this method specifies the authentication mechanism to use. The valid values are currently <code>"shiro"</code> or <code>"bypass"</code>. If null is returned then the value of the <code>isis.authentication</code> configuration property (in <code>isis.properties</code> file) is used instead.</p>
</div>
@@ -3256,7 +3269,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect4">
- <h5 id="__code_getauthorizationmechanism_code"><code>getAuthorizationMechanism()</code></h5>
+ <h5 id="__rgcms_classes_AppManifest-bootstrapping_api_getAuthorizationMechanism"><code>getAuthorizationMechanism()</code></h5>
<div class="paragraph">
<p>If non-<code>null</code>, this method specifies the authorization mechanism to use. The valid values are currently <code>"shiro"</code> or <code>"bypass"</code>. If null is returned then the value of the <code>isis.authorization</code> configuration property (in <code>isis.properties</code> file) is used instead.</p>
</div>
@@ -3278,7 +3291,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect4">
- <h5 id="__code_getfixtures_code"><code>getFixtures()</code></h5>
+ <h5 id="__rgcms_classes_AppManifest-bootstrapping_api_getFixtures"><code>getFixtures()</code></h5>
<div class="paragraph">
<p>If non-<code>null</code>, this method specifies the fixture script(s) to be run on startup. This is particularly useful when developing or demoing while using an in-memory database.</p>
</div>
@@ -3298,7 +3311,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect4">
- <h5 id="__code_getconfigurationproperties_code"><code>getConfigurationProperties()</code></h5>
+ <h5 id="__rgcms_classes_AppManifest-bootstrapping_api_getConfigurationProperties"><code>getConfigurationProperties()</code></h5>
<div class="paragraph">
<p>This method allow arbitrary other configuration properties to be overridden. One common use case is in conjunction with the <code>getFixtures()</code> method, discussed above:</p>
</div>
@@ -3315,7 +3328,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect3">
- <h4 id="_bootstrapping">3.1.2. Bootstrapping</h4>
+ <h4 id="__rgcms_classes_AppManifest-bootstrapping_bootstrapping">3.1.2. Bootstrapping</h4>
<div class="paragraph">
<p>One of the primary goals of the <code>AppManifest</code> is to unify the bootstrapping of both integration tests and the webapp. This requires that the integration tests and webapp can both reference the implementation.</p>
</div>
@@ -3328,26 +3341,90 @@ table.CodeRay td.code>pre{padding:0}
<div class="paragraph">
<p>What then remains is to update the bootstrapping code itself.</p>
</div>
+ <div class="paragraph">
+ <p>There are several different contexts in which the framework needs to be bootstrapped:</p>
+ </div>
+ <div class="ulist">
+ <ul>
+ <li> <p>the first is as a "regular" webapp (using the <a href="../ugvw/ugvw.html">Wicket viewer</a>). Here the <code>AppManifest</code> just needs to be specified as a configuration property, usually done using the <code>WEB-INF/isis.properties</code> configuration file:<br></p>
+ <div class="listingblock">
+ <div class="content">
+ <pre class="CodeRay highlight"><code data-lang="ini">isis.appManifest=domainapp.app.MyAppAppManifest</code></pre>
+ </div>
+ </div> </li>
+ <li> <p>the second is also as a webapp, but from within the context of the IDE.<br></p>
+ <div class="paragraph">
+ <p>Here, it’s common to use the <code>org.apache.isis.WebServer</code> class to launch your application from the <a href="../ugbtb/ugbtb.html#_ugbtb_deployment_cmd-line">command line</a>. This allows the <code>AppManifest</code> to be specified using the <code>-m</code> (or <code>--manifest</code>) flag:<br></p>
+ </div>
+ <div class="listingblock">
+ <div class="content">
+ <pre class="CodeRay highlight"><code data-lang="ini">java org.apache.isis.WebServer -m com.mycompany.myapp.MyAppAppManifestWithFixtures</code></pre>
+ </div>
+ </div> </li>
+ <li> <p>the third case is within an integration test.<br></p>
+ <div class="paragraph">
+ <p>The code to boostrap an integration test is shown in the <a href="../ugtst/ugtst.html#_ugtst_integ-test-support_bootstrapping">testing guide</a>, but once again an <code>AppManifest</code> is required.</p>
+ </div> </li>
+ </ul>
+ </div>
+ <div class="paragraph">
+ <p>In some cases an integration test uses the exact same <code>AppManifest</code> as the regular webapp. Sometimes though it is necessary to "tweak" the <code>AppManifest</code>:</p>
+ </div>
+ <div class="ulist">
+ <ul>
+ <li> <p>it might use additional services, such as services to mock out external dependencies, or to provide fake data</p> </li>
+ <li> <p>it might override certain configuration properties, eg to run against an in-memory HSQLDB database.</p> </li>
+ </ul>
+ </div>
+ <div class="paragraph">
+ <p>The next section describes some helper classes that (as of <code>1.15.0-SNAPSHOT</code>) the framework provides to help achieve this.</p>
+ </div>
<div class="sect4">
- <h5 id="_integration_tests">Integration Tests</h5>
+ <h5 id="__rgcms_classes_AppManifest-bootstrapping_bootstrapping_AppManifestAbstract">AppManifestAbstract (<code>1.15.0-SNAPSHOT</code>)</h5>
+ <div class="paragraph">
+ <p>(As of <code>1.15.0-SNAPSHOT</code>), the <code>AppManifestAbstract</code> and its associated builder (<code>AppManifestAbstract.Builder</code>) make it easy to bootstrap the application both as a webapp and also as an integration test.</p>
+ </div>
<div class="paragraph">
- <p>A <code>AppManifest.Util</code> helper class provides a number of static methods that can be used to set up configuration properties appropriate for integration testing (eg run using an in-memory database). This allows the responsibility of returning the configuration properties to belong exlusively to the <code>AppManifest</code>.</p>
+ <p>Rather than implement <code>AppManifest</code> interface directly, instead your application subclasses from <code>AppManifestAbstract</code>. This takes an instance of a <code>AppManifestAbstract.Builder</code> in its constructor; the builder is what allows for variation between environments.</p>
</div>
<div class="paragraph">
- <p>There are three such static methods:</p>
+ <p>Moreover, these classes recognise that configuration properties fall into two broad classes:</p>
+ </div>
+ <div class="ulist">
+ <ul>
+ <li> <p>those that are fixed and do not change between environments.<br></p>
+ <div class="paragraph">
+ <p>In other words these describe how the application chooses to configure the framework itself, eg global disable of editing of properties, or enabling of auditing.</p>
+ </div> </li>
+ <li> <p>those that change between environments.<br></p>
+ <div class="paragraph">
+ <p>The classic example here is the JDBC URL.</p>
+ </div> </li>
+ </ul>
+ </div>
+ <div class="paragraph">
+ <p>For example, the <a href="../ugfun/ugfun.html#_ugfun_getting-started_simpleapp-archetype">SimpleApp archetype</a>'s <code>AppManifest</code> is defined as:</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">AppManifest</span> {
- ...
- public <span class="directive">static</span> <span class="type">class</span> <span class="class">Util</span> {
- <span class="directive">public</span> <span class="directive">static</span> <span class="predefined-type">Map</span><<span class="predefined-type">String</span>,<span class="predefined-type">String</span>>
- withJavaxJdoRunInMemoryProperties(<span class="predefined-type">Map</span><<span class="predefined-type">String</span>, <span class="predefined-type">String</span>> map) { ... } <i class="conum" data-value="1"></i><b>(1)</b>
- <span class="directive">public</span> <span class="directive">static</span> <span class="predefined-type">Map</span><<span class="predefined-type">String</span>,<span class="predefined-type">String</span>>
- withDataNucleusProperties(<span class="predefined-type">Map</span><<span class="predefined-type">String</span>, <span class="predefined-type">String</span>> map) { ... } <i class="conum" data-value="2"></i><b>(2)</b>
- <span class="directive">public</span> <span class="directive">static</span> <span class="predefined-type">Map</span><<span class="predefined-type">String</span>,<span class="predefined-type">String</span>>
- withIsisIntegTestProperties(<span class="predefined-type">Map</span><<span class="predefined-type">String</span>, <span class="predefined-type">String</span>> map) { ... } <i class="conum" data-value="3"></i><b>(3)</b>
- }
+ <pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">class</span> <span class="class">DomainAppAppManifest</span> <span class="directive">extends</span> AppManifestAbstract {
+
+ <span class="directive">public</span> <span class="directive">static</span> <span class="directive">final</span> Builder BUILDER = Builder.forModules(
+ SimpleModuleDomSubmodule.class, <i class="conum" data-value="1"></i><b>(1)</b>
+ DomainAppApplicationModuleFixtureSubmodule.class,
+ DomainAppApplicationModuleServicesSubmodule.class
+ )
+ .withConfigurationPropertiesFile(DomainAppAppManifest.class, <i class="conum" data-value="2"></i><b>(2)</b>
+ <span class="string"><span class="delimiter">"</span><span class="content">isis.properties</span><span class="delimiter">"</span></span>,
+ <span class="string"><span class="delimiter">"</span><span class="content">authentication_shiro.properties</span><span class="delimiter">"</span></span>,
+ <span class="string"><span class="delimiter">"</span><span class="content">persistor_datanucleus.properties</span><span class="delimiter">"</span></span>,
+ <span class="string"><span class="delimiter">"</span><span class="content">viewer_restfulobjects.properties</span><span class="delimiter">"</span></span>,
+ <span class="string"><span class="delimiter">"</span><span class="content">viewer_wicket.properties</span><span class="delimiter">"</span></span>
+ ).withAuthMechanism(<span class="string"><span class="delimiter">"</span><span class="content">shiro</span><span class="delimiter">"</span></span>); <i class="conum" data-value="3"></i><b>(3)</b>
+
+ <span class="directive">public</span> DomainAppAppManifest() {
+ <span class="local-variable">super</span>(BUILDER); <i class="conum" data-value="4"></i><b>(4)</b>
+ }
}</code></pre>
</div>
</div>
@@ -3356,110 +3433,59 @@ table.CodeRay td.code>pre{padding:0}
<tbody>
<tr>
<td><i class="conum" data-value="1"></i><b>1</b></td>
- <td>sets up the <code>javax.jdo.option.Connection*</code> properties so as to run against an in-memory instance of HSQLDB</td>
+ <td>the modules that make up the application; corresponds to <code>AppManifest#getModules()</code></td>
</tr>
<tr>
<td><i class="conum" data-value="2"></i><b>2</b></td>
- <td>sets up DataNucleus to automatically create the databse schema, as well as a number of other standard properties (disable persistence by reachability, support mixed case identifiers, disable level 2 cache)</td>
+ <td>the (non-changing with environment) set of configuration properties, loaded relative to the manifest itself; corresponds to <code>AppManifest#getConfigurationProperties()</code></td>
</tr>
<tr>
<td><i class="conum" data-value="3"></i><b>3</b></td>
- <td>sets up standard properties for the Apache Isis framework, most specifically to enable fixtures to be installed.</td>
+ <td>override of components; correponds to both <code>AppManifest#getAuthenticationMechanism()</code> and <code>AppManifest#getAuthorizationMechanism()</code></td>
+ </tr>
+ <tr>
+ <td><i class="conum" data-value="4"></i><b>4</b></td>
+ <td>Pass the builder up to the superclass.</td>
</tr>
</tbody>
</table>
</div>
<div class="paragraph">
- <p>For example, the bootstrapping code for the <a href="../ugfun/ugfun.html#_ugfun_getting-started_simpleapp-archetype">SimpleApp archetype</a> looks something like:</p>
+ <p>If the integration tests requires no tweaking, then the <code>AppManifest</code> can be used directly, for example:</p>
</div>
<div class="listingblock">
<div class="content">
- <pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">class</span> <span class="class">DomainAppSystemInitializer</span> {
- <span class="directive">public</span> <span class="directive">static</span> <span class="type">void</span> initIsft() {
- IsisSystemForTest isft = IsisSystemForTest.getElseNull();
- <span class="keyword">if</span>(isft == <span class="predefined-constant">null</span>) {
- isft = <span class="keyword">new</span> IsisSystemForTest.Builder()
- .withLoggingAt(org.apache.log4j.Level.INFO)
- .with(<span class="keyword">new</span> DomainAppAppManifest() {
- <span class="annotation">@Override</span>
- <span class="directive">public</span> <span class="predefined-type">Map</span><<span class="predefined-type">String</span>, <span class="predefined-type">String</span>> getConfigurationProperties() {
- <span class="directive">final</span> <span class="predefined-type">Map</span><<span class="predefined-type">String</span>, <span class="predefined-type">String</span>> map = Maps.newHashMap();
- <span class="predefined-type">Util</span>.withJavaxJdoRunInMemoryProperties(map);
- <span class="predefined-type">Util</span>.withDataNucleusProperties(map);
- <span class="predefined-type">Util</span>.withIsisIntegTestProperties(map);
- <span class="keyword">return</span> map;
- }
- })
- .build();
- isft.setUpSystem();
- IsisSystemForTest.set(isft);
- }
+ <pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="directive">abstract</span> <span class="type">class</span> <span class="class">DomainAppIntegTestAbstract</span> <span class="directive">extends</span> IntegrationTestAbstract2 {
+ <span class="annotation">@BeforeClass</span>
+ <span class="directive">public</span> <span class="directive">static</span> <span class="type">void</span> initSystem() {
+ bootstrapUsing(<span class="keyword">new</span> DomainAppAppManifest());
}
}</code></pre>
</div>
</div>
<div class="paragraph">
- <p>Previously the <code>IsisConfigurationJdoIntegTests</code> (subclass of <code>IsisConfiguration</code>) was provided to set up these configuration properties. This class is still supported, but is deprecated.</p>
+ <p>On the other hand, if tweaking is required then exposing the builder as a <code>public static</code> field makes this easy to do:</p>
</div>
- </div>
- <div class="sect4">
- <h5 id="_webapps">Webapps</h5>
- <div class="paragraph">
- <p>To bootstrap an Apache Isis webapp (using the <a href="../ugvw/ugvw.html">Wicket viewer</a>), there are two choices:</p>
- </div>
- <div class="ulist">
- <ul>
- <li> <p>either specify the <code>AppManifest</code> by overriding the <code>IsisWicketApplication#newWicketModule()</code>, eg:<br></p>
- <div class="listingblock">
- <div class="content">
- <pre class="CodeRay highlight"><code data-lang="java"><span class="annotation">@Override</span>
-<span class="directive">protected</span> Module newIsisWicketModule() {
- <span class="directive">final</span> Module isisDefaults = <span class="local-variable">super</span>.newIsisWicketModule();
- ...
- final Module overrides = <span class="keyword">new</span> AbstractModule() {
- <span class="annotation">@Override</span>
- <span class="directive">protected</span> <span class="type">void</span> configure() {
- ...
- bind(AppManifest.class).toInstance(<span class="keyword">new</span> MyAppAppManifest());
- }
- };
- <span class="keyword">return</span> Modules.override(isisDefaults).with(overrides);
+ <div class="listingblock">
+ <div class="content">
+ <pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="directive">abstract</span> <span class="type">class</span> <span class="class">DomainAppIntegTestAbstract</span> <span class="directive">extends</span> IntegrationTestAbstract2 {
+ <span class="annotation">@BeforeClass</span>
+ <span class="directive">public</span> <span class="directive">static</span> <span class="type">void</span> initSystem() {
+ bootstrapUsing(DomainAppAppManifest.BUILDER
+ .withAdditionalModules(...)
+ .withAdditionalServices(...)
+ .withConfigurationPropertiesFile(<span class="string"><span class="delimiter">"</span><span class="content">...</span><span class="delimiter">"</span></span>)
+ .withConfigurationProperty(<span class="string"><span class="delimiter">"</span><span class="content">...</span><span class="delimiter">"</span></span>,<span class="string"><span class="delimiter">"</span><span class="content">...</span><span class="delimiter">"</span></span>)
+ .build()
+ );
+ }
}</code></pre>
- </div>
- </div> </li>
- <li> <p>alternatively update <code>isis.properties</code>, using the <code>isis.appManifest</code> key to specify the <code>AppManifest</code> implementation, eg:<br></p>
- <div class="listingblock">
- <div class="content">
- <pre class="CodeRay highlight"><code data-lang="ini">isis.appManifest=domainapp.app.MyAppAppManifest</code></pre>
- </div>
- </div> </li>
- </ul>
- </div>
- <div class="paragraph">
- <p>The first (programmatic) approach takes precedence over the second approach (configuration properties).</p>
- </div>
- <div class="admonitionblock tip">
- <table>
- <tbody>
- <tr>
- <td class="icon"> <i class="fa icon-tip" title="Tip"></i> </td>
- <td class="content">
- <div class="paragraph">
- <p>If you use the <code>org.apache.isis.WebServer</code> class to launch your application from the <a href="../ugbtb/ugbtb.html#_ugbtb_deployment_cmd-line">command line</a>, then note that you can specify the <code>AppManifest</code> using the <code>-m</code> (or <code>--manifest</code>) flag:</p>
- </div>
- <div class="listingblock">
- <div class="content">
- <pre class="CodeRay highlight"><code data-lang="ini">java org.apache.isis.WebServer -m com.mycompany.myapp.MyAppAppManifestWithFixtures</code></pre>
- </div>
- </div> </td>
- </tr>
- </tbody>
- </table>
+ </div>
</div>
</div>
</div>
<div class="sect3">
- <h4 id="_subsidiary_goals">3.1.3. Subsidiary Goals</h4>
+ <h4 id="__rgcms_classes_AppManifest-bootstrapping_subsidiary-goals">3.1.3. Subsidiary Goals</h4>
<div class="paragraph">
<p>There are a number of subsidiary goals of the <code>AppManifest</code> class (though not all of these are fully implemented):</p>
</div>
@@ -3931,7 +3957,7 @@ table.CodeRay td.code>pre{padding:0}
<p>The main purpose of the class is to define the protocol by which subscribers can influence an interaction (eg hide a collection, disable a property, validate action arguments). It class also provides a simple mechanism to allow adhoc sharing of user data between different phases.</p>
</div>
<div class="sect4">
- <h5 id="_api_2">API</h5>
+ <h5 id="_api">API</h5>
<div class="paragraph">
<p>The API of the class is:</p>
</div>
@@ -4073,7 +4099,7 @@ table.CodeRay td.code>pre{padding:0}
<p>The class itself is instantiated automatically by the framework whenever interacting with a rendered object’s action.</p>
</div>
<div class="sect4">
- <h5 id="_api_3">API</h5>
+ <h5 id="_api_2">API</h5>
<div class="paragraph">
<p>The API of the class is:</p>
</div>
@@ -4164,7 +4190,7 @@ table.CodeRay td.code>pre{padding:0}
<p>The class itself is instantiated automatically by the framework whenever interacting with a rendered object’s collection.</p>
</div>
<div class="sect4">
- <h5 id="_api_4">API</h5>
+ <h5 id="_api_3">API</h5>
<div class="paragraph">
<p>The API of the class is:</p>
</div>
@@ -4270,7 +4296,7 @@ table.CodeRay td.code>pre{padding:0}
<p>The class itself is instantiated automatically by the framework whenever interacting with a rendered object’s property.</p>
</div>
<div class="sect4">
- <h5 id="_api_5">API</h5>
+ <h5 id="_api_4">API</h5>
<div class="paragraph">
<p>The API of the class is:</p>
</div>
[05/10] isis-site git commit: ISIS-1521: docs
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/8b42f65e/content/guides/rgsvc/rgsvc.pdf
----------------------------------------------------------------------
diff --git a/content/guides/rgsvc/rgsvc.pdf b/content/guides/rgsvc/rgsvc.pdf
index b765599..fc07c5b 100644
--- a/content/guides/rgsvc/rgsvc.pdf
+++ b/content/guides/rgsvc/rgsvc.pdf
@@ -4,16 +4,16 @@
<< /Title (Domain Services)
/Creator (Asciidoctor PDF 1.5.0.alpha.11, based on Prawn 1.3.0)
/Producer (Asciidoctor PDF 1.5.0.alpha.11, based on Prawn 1.3.0)
-/CreationDate (D:20170801163812+01'00')
-/ModDate (D:20170801163812+01'00')
+/CreationDate (D:20170806194551+01'00')
+/ModDate (D:20170806194551+01'00')
>>
endobj
2 0 obj
<< /Type /Catalog
/Pages 3 0 R
/Names 18 0 R
-/Outlines 2204 0 R
-/PageLabels 2288 0 R
+/Outlines 2222 0 R
+/PageLabels 2308 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 176
-/Kids [7 0 R 10 0 R 12 0 R 14 0 R 16 0 R 38 0 R 50 0 R 61 0 R 70 0 R 76 0 R 105 0 R 110 0 R 131 0 R 166 0 R 197 0 R 215 0 R 221 0 R 231 0 R 237 0 R 252 0 R 256 0 R 262 0 R 266 0 R 272 0 R 280 0 R 297 0 R 312 0 R 326 0 R 340 0 R 351 0 R 358 0 R 377 0 R 388 0 R 401 0 R 410 0 R 426 0 R 441 0 R 451 0 R 457 0 R 484 0 R 522 0 R 543 0 R 551 0 R 563 0 R 573 0 R 583 0 R 595 0 R 608 0 R 620 0 R 622 0 R 624 0 R 634 0 R 647 0 R 649 0 R 660 0 R 667 0 R 688 0 R 695 0 R 702 0 R 718 0 R 729 0 R 738 0 R 749 0 R 759 0 R 763 0 R 772 0 R 779 0 R 796 0 R 800 0 R 806 0 R 829 0 R 837 0 R 851 0 R 870 0 R 880 0 R 898 0 R 903 0 R 932 0 R 957 0 R 963 0 R 969 0 R 976 0 R 987 0 R 1003 0 R 1014 0 R 1016 0 R 1027 0 R 1037 0 R 1041 0 R 1049 0 R 1057 0 R 1064 0 R 1080 0 R 1092 0 R 1099 0 R 1103 0 R 1106 0 R 1112 0 R 1121 0 R 1133 0 R 1147 0 R 1159 0 R 1165 0 R 1178 0 R 1187 0 R 1191 0 R 1220 0 R 1237 0 R 1242 0 R 1257 0 R 1275 0 R 1281 0 R 1288 0 R 1303 0 R 1308 0 R 1317 0 R 1329 0 R 1336 0 R 1347 0 R 1351 0 R 1354
0 R 1358 0 R 1370 0 R 1398 0 R 1414 0 R 1425 0 R 1435 0 R 1446 0 R 1454 0 R 1464 0 R 1485 0 R 1494 0 R 1538 0 R 1550 0 R 1561 0 R 1570 0 R 1578 0 R 1589 0 R 1600 0 R 1630 0 R 1641 0 R 1647 0 R 1654 0 R 1658 0 R 1668 0 R 1679 0 R 1683 0 R 1689 0 R 1700 0 R 1703 0 R 1709 0 R 1712 0 R 1716 0 R 1721 0 R 1729 0 R 1756 0 R 1774 0 R 1777 0 R 1789 0 R 1798 0 R 1815 0 R 1823 0 R 1828 0 R 1841 0 R 1853 0 R 1863 0 R 1881 0 R 1890 0 R 1896 0 R 1903 0 R 1920 0 R 1925 0 R 1933 0 R 1939 0 R 1955 0 R 1963 0 R]
+/Count 178
+/Kids [7 0 R 10 0 R 12 0 R 14 0 R 16 0 R 38 0 R 50 0 R 61 0 R 70 0 R 76 0 R 105 0 R 110 0 R 131 0 R 166 0 R 197 0 R 215 0 R 221 0 R 231 0 R 237 0 R 252 0 R 256 0 R 262 0 R 266 0 R 272 0 R 280 0 R 297 0 R 312 0 R 326 0 R 340 0 R 351 0 R 358 0 R 377 0 R 388 0 R 402 0 R 411 0 R 418 0 R 437 0 R 449 0 R 457 0 R 463 0 R 490 0 R 528 0 R 549 0 R 557 0 R 569 0 R 579 0 R 589 0 R 602 0 R 615 0 R 627 0 R 629 0 R 631 0 R 641 0 R 653 0 R 655 0 R 666 0 R 673 0 R 694 0 R 701 0 R 708 0 R 724 0 R 735 0 R 744 0 R 755 0 R 765 0 R 769 0 R 778 0 R 785 0 R 802 0 R 806 0 R 812 0 R 835 0 R 844 0 R 857 0 R 876 0 R 886 0 R 904 0 R 909 0 R 938 0 R 963 0 R 970 0 R 975 0 R 982 0 R 993 0 R 1009 0 R 1020 0 R 1022 0 R 1033 0 R 1043 0 R 1047 0 R 1055 0 R 1063 0 R 1070 0 R 1086 0 R 1098 0 R 1105 0 R 1109 0 R 1112 0 R 1118 0 R 1127 0 R 1139 0 R 1153 0 R 1165 0 R 1171 0 R 1184 0 R 1193 0 R 1197 0 R 1226 0 R 1243 0 R 1248 0 R 1263 0 R 1282 0 R 1288 0 R 1295 0 R 1309 0 R 1314 0 R 1323 0 R 1335 0 R 1342 0 R 1353 0 R 1357
0 R 1360 0 R 1364 0 R 1376 0 R 1404 0 R 1420 0 R 1431 0 R 1441 0 R 1453 0 R 1461 0 R 1470 0 R 1491 0 R 1500 0 R 1544 0 R 1556 0 R 1567 0 R 1576 0 R 1584 0 R 1595 0 R 1607 0 R 1637 0 R 1644 0 R 1654 0 R 1659 0 R 1666 0 R 1670 0 R 1680 0 R 1691 0 R 1695 0 R 1701 0 R 1712 0 R 1715 0 R 1721 0 R 1724 0 R 1728 0 R 1733 0 R 1741 0 R 1768 0 R 1786 0 R 1789 0 R 1801 0 R 1810 0 R 1828 0 R 1836 0 R 1841 0 R 1853 0 R 1865 0 R 1875 0 R 1893 0 R 1902 0 R 1909 0 R 1916 0 R 1933 0 R 1938 0 R 1946 0 R 1952 0 R 1968 0 R 1975 0 R]
>>
endobj
4 0 obj
@@ -80,15 +80,15 @@ endobj
<< /Type /Font
/BaseFont /AAAABZ+NotoSerif
/Subtype /TrueType
-/FontDescriptor 2290 0 R
+/FontDescriptor 2310 0 R
/FirstChar 32
/LastChar 255
-/Widths 2292 0 R
-/ToUnicode 2291 0 R
+/Widths 2312 0 R
+/ToUnicode 2311 0 R
>>
endobj
9 0 obj
-<< /Length 36265
+<< /Length 36260
>>
stream
q
@@ -992,7 +992,7 @@ ET
BT
85.81800000000001 400.7359999999997 Td
/F3.0 10.5 Tf
-<5461626c65436f6c756d6e4f7264657253657276696365> Tj
+<53657373696f6e4c6f6767696e6753657276696365> Tj
ET
0.000 0.000 0.000 SCN
@@ -1001,9 +1001,9 @@ ET
0.200 0.200 0.200 SCN
BT
-207.92674999999997 400.7359999999997 Td
+197.23774999999995 400.7359999999997 Td
/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -1043,7 +1043,7 @@ ET
BT
85.81800000000001 382.2559999999997 Td
/F3.0 10.5 Tf
-<5472616e736c6174696f6e53657276696365> Tj
+<5461626c65436f6c756d6e4f7264657253657276696365> Tj
ET
0.000 0.000 0.000 SCN
@@ -1052,9 +1052,9 @@ ET
0.200 0.200 0.200 SCN
BT
-181.20424999999994 382.2559999999997 Td
+207.92674999999997 382.2559999999997 Td
/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -1094,7 +1094,7 @@ ET
BT
85.81800000000001 363.77599999999967 Td
/F3.0 10.5 Tf
-<5472616e736c6174696f6e735265736f6c766572> Tj
+<5472616e736c6174696f6e53657276696365> Tj
ET
0.000 0.000 0.000 SCN
@@ -1103,9 +1103,9 @@ ET
0.200 0.200 0.200 SCN
BT
-191.89324999999997 363.77599999999967 Td
+181.20424999999994 363.77599999999967 Td
/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -1145,7 +1145,7 @@ ET
BT
85.81800000000001 345.29599999999965 Td
/F3.0 10.5 Tf
-<55726c456e636f64696e6753657276696365> Tj
+<5472616e736c6174696f6e735265736f6c766572> Tj
ET
0.000 0.000 0.000 SCN
@@ -1154,9 +1154,9 @@ ET
0.200 0.200 0.200 SCN
BT
-181.20424999999994 345.29599999999965 Td
+191.89324999999997 345.29599999999965 Td
/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -1196,7 +1196,7 @@ ET
BT
85.81800000000001 326.81599999999963 Td
/F3.0 10.5 Tf
-<5573657250726f66696c6553657276696365> Tj
+<55726c456e636f64696e6753657276696365> Tj
ET
0.000 0.000 0.000 SCN
@@ -1234,9 +1234,20 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24 308.3359999999996 Td
+60.24 308.3359999999996 Td
/F1.0 10.5 Tf
-[<342e204170706c69636174696f6e204c61> 20.01953125 <79657220415049>] TJ
+<332e31362e20> 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
+85.81800000000001 308.3359999999996 Td
+/F3.0 10.5 Tf
+<5573657250726f66696c6553657276696365> Tj
ET
0.000 0.000 0.000 SCN
@@ -1245,9 +1256,9 @@ ET
0.200 0.200 0.200 SCN
BT
-170.51524999999992 308.3359999999996 Td
+181.20424999999994 308.3359999999996 Td
/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -1265,7 +1276,7 @@ ET
BT
535.3009999999999 308.3359999999996 Td
/F1.0 10.5 Tf
-<3335> Tj
+<3334> Tj
ET
0.000 0.000 0.000 SCN
@@ -1274,20 +1285,9 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 289.8559999999996 Td
+48.24 289.8559999999996 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 289.8559999999996 Td
-/F3.0 10.5 Tf
-<41636365707448656164657253657276696365> Tj
+[<342e204170706c69636174696f6e204c61> 20.01953125 <79657220415049>] TJ
ET
0.000 0.000 0.000 SCN
@@ -1296,9 +1296,9 @@ ET
0.200 0.200 0.200 SCN
BT
-181.20424999999994 289.8559999999996 Td
+170.51524999999992 289.8559999999996 Td
/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -1316,7 +1316,7 @@ ET
BT
535.3009999999999 289.8559999999996 Td
/F1.0 10.5 Tf
-<3337> Tj
+<3336> Tj
ET
0.000 0.000 0.000 SCN
@@ -1327,7 +1327,7 @@ ET
BT
60.24 271.3759999999996 Td
/F1.0 10.5 Tf
-<342e322e20> Tj
+<342e312e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -1338,7 +1338,7 @@ ET
BT
79.9485 271.3759999999996 Td
/F3.0 10.5 Tf
-<416374696f6e496e766f636174696f6e436f6e74657874> Tj
+<41636365707448656164657253657276696365> Tj
ET
0.000 0.000 0.000 SCN
@@ -1347,9 +1347,9 @@ ET
0.200 0.200 0.200 SCN
BT
-202.58224999999993 271.3759999999996 Td
+181.20424999999994 271.3759999999996 Td
/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -1367,7 +1367,7 @@ ET
BT
535.3009999999999 271.3759999999996 Td
/F1.0 10.5 Tf
-<3339> Tj
+<3338> Tj
ET
0.000 0.000 0.000 SCN
@@ -1378,7 +1378,7 @@ ET
BT
60.24 252.89599999999956 Td
/F1.0 10.5 Tf
-<342e332e20> Tj
+<342e322e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -1389,7 +1389,7 @@ ET
BT
79.9485 252.89599999999956 Td
/F3.0 10.5 Tf
-<4261636b67726f756e645365727669636532> Tj
+<416374696f6e496e766f636174696f6e436f6e74657874> Tj
ET
0.000 0.000 0.000 SCN
@@ -1398,9 +1398,9 @@ ET
0.200 0.200 0.200 SCN
BT
-175.85974999999996 252.89599999999956 Td
+202.58224999999993 252.89599999999956 Td
/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -1418,7 +1418,7 @@ ET
BT
535.3009999999999 252.89599999999956 Td
/F1.0 10.5 Tf
-<3431> Tj
+<3430> Tj
ET
0.000 0.000 0.000 SCN
@@ -1429,7 +1429,7 @@ ET
BT
60.24 234.41599999999957 Td
/F1.0 10.5 Tf
-<342e342e20> Tj
+<342e332e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -1440,7 +1440,7 @@ ET
BT
79.9485 234.41599999999957 Td
/F3.0 10.5 Tf
-<436f6d6d616e64436f6e74657874> Tj
+<4261636b67726f756e645365727669636532> Tj
ET
0.000 0.000 0.000 SCN
@@ -1449,9 +1449,9 @@ ET
0.200 0.200 0.200 SCN
BT
-154.48174999999992 234.41599999999957 Td
+175.85974999999996 234.41599999999957 Td
/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -1469,7 +1469,7 @@ ET
BT
535.3009999999999 234.41599999999957 Td
/F1.0 10.5 Tf
-<3437> Tj
+<3432> Tj
ET
0.000 0.000 0.000 SCN
@@ -1480,7 +1480,7 @@ ET
BT
60.24 215.93599999999958 Td
/F1.0 10.5 Tf
-<342e352e20> Tj
+<342e342e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -1491,7 +1491,7 @@ ET
BT
79.9485 215.93599999999958 Td
/F3.0 10.5 Tf
-<496e746572616374696f6e436f6e74657874> Tj
+<436f6d6d616e64436f6e74657874> Tj
ET
0.000 0.000 0.000 SCN
@@ -1500,9 +1500,9 @@ ET
0.200 0.200 0.200 SCN
BT
-175.85974999999996 215.93599999999958 Td
+154.48174999999992 215.93599999999958 Td
/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -1520,7 +1520,7 @@ ET
BT
535.3009999999999 215.93599999999958 Td
/F1.0 10.5 Tf
-<3532> Tj
+<3438> Tj
ET
0.000 0.000 0.000 SCN
@@ -1531,7 +1531,7 @@ ET
BT
60.24 197.4559999999996 Td
/F1.0 10.5 Tf
-<342e362e20> Tj
+<342e352e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -1542,7 +1542,7 @@ ET
BT
79.9485 197.4559999999996 Td
/F3.0 10.5 Tf
-<4d65737361676553657276696365> Tj
+<496e746572616374696f6e436f6e74657874> Tj
ET
0.000 0.000 0.000 SCN
@@ -1551,9 +1551,9 @@ ET
0.200 0.200 0.200 SCN
BT
-154.48174999999992 197.4559999999996 Td
+175.85974999999996 197.4559999999996 Td
/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -1571,7 +1571,7 @@ ET
BT
535.3009999999999 197.4559999999996 Td
/F1.0 10.5 Tf
-<3536> Tj
+<3533> Tj
ET
0.000 0.000 0.000 SCN
@@ -1582,7 +1582,7 @@ ET
BT
60.24 178.9759999999996 Td
/F1.0 10.5 Tf
-<342e372e20> Tj
+<342e362e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -1593,7 +1593,7 @@ ET
BT
79.9485 178.9759999999996 Td
/F3.0 10.5 Tf
-<53657373696f6e4d616e6167656d656e7453657276696365> Tj
+<4d65737361676553657276696365> Tj
ET
0.000 0.000 0.000 SCN
@@ -1602,9 +1602,9 @@ ET
0.200 0.200 0.200 SCN
BT
-207.92674999999997 178.9759999999996 Td
+154.48174999999992 178.9759999999996 Td
/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -1633,7 +1633,7 @@ ET
BT
60.24 160.4959999999996 Td
/F1.0 10.5 Tf
-<342e382e20> Tj
+<342e372e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -1644,7 +1644,7 @@ ET
BT
79.9485 160.4959999999996 Td
/F3.0 10.5 Tf
-<5469746c6553657276696365> Tj
+<53657373696f6e4d616e6167656d656e7453657276696365> Tj
ET
0.000 0.000 0.000 SCN
@@ -1653,9 +1653,9 @@ ET
0.200 0.200 0.200 SCN
BT
-143.79274999999996 160.4959999999996 Td
+207.92674999999997 160.4959999999996 Td
/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -1684,7 +1684,7 @@ ET
BT
60.24 142.01599999999962 Td
/F1.0 10.5 Tf
-<342e392e20> Tj
+<342e382e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -1695,7 +1695,7 @@ ET
BT
79.9485 142.01599999999962 Td
/F3.0 10.5 Tf
-<5472616e73616374696f6e5365727669636532> Tj
+<5469746c6553657276696365> Tj
ET
0.000 0.000 0.000 SCN
@@ -1704,31 +1704,27 @@ ET
0.200 0.200 0.200 SCN
BT
-179.6985 142.01599999999962 Td
+143.79274999999996 142.01599999999962 Td
/F1.0 10.5 Tf
-<2028> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> 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
-186.05100000000002 142.01599999999962 Td
-/F3.0 10.5 Tf
-<312e31352e302d534e415053484f54> Tj
+533.94125 142.01599999999962 Td
+/F1.0 5.25 Tf
+<ca> 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
-264.801 142.01599999999962 Td
+535.3009999999999 142.01599999999962 Td
/F1.0 10.5 Tf
-<29> Tj
+<3539> Tj
ET
0.000 0.000 0.000 SCN
@@ -1737,49 +1733,53 @@ ET
0.200 0.200 0.200 SCN
BT
-272.0607499999999 142.01599999999962 Td
+60.24 123.53599999999963 Td
/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<342e392e20> 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
-533.94125 142.01599999999962 Td
-/F1.0 5.25 Tf
-<ca> Tj
+79.9485 123.53599999999963 Td
+/F3.0 10.5 Tf
+<5472616e73616374696f6e5365727669636532> 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
-535.3009999999999 142.01599999999962 Td
+179.6985 123.53599999999963 Td
/F1.0 10.5 Tf
-<3539> Tj
+<2028> 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
-60.24 123.53599999999963 Td
-/F1.0 10.5 Tf
-<342e31302e20> Tj
+186.05100000000002 123.53599999999963 Td
+/F3.0 10.5 Tf
+<312e31352e302d534e415053484f54> 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
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
-85.81800000000001 123.53599999999963 Td
-/F3.0 10.5 Tf
-<57726170706572466163746f7279> Tj
+264.801 123.53599999999963 Td
+/F1.0 10.5 Tf
+<29> Tj
ET
0.000 0.000 0.000 SCN
@@ -1788,9 +1788,9 @@ ET
0.200 0.200 0.200 SCN
BT
-165.17074999999994 123.53599999999963 Td
+272.0607499999999 123.53599999999963 Td
/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -1808,7 +1808,7 @@ ET
BT
535.3009999999999 123.53599999999963 Td
/F1.0 10.5 Tf
-<3632> Tj
+<3630> Tj
ET
0.000 0.000 0.000 SCN
@@ -1817,9 +1817,20 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24 105.05599999999964 Td
+60.24 105.05599999999964 Td
/F1.0 10.5 Tf
-[<352e204170706c69636174696f6e204c61> 20.01953125 <79657220535049>] TJ
+<342e31302e20> 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
+85.81800000000001 105.05599999999964 Td
+/F3.0 10.5 Tf
+<57726170706572466163746f7279> Tj
ET
0.000 0.000 0.000 SCN
@@ -1828,9 +1839,9 @@ ET
0.200 0.200 0.200 SCN
BT
-170.51524999999992 105.05599999999964 Td
+165.17074999999994 105.05599999999964 Td
/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -1848,7 +1859,7 @@ ET
BT
535.3009999999999 105.05599999999964 Td
/F1.0 10.5 Tf
-<3636> Tj
+<3633> Tj
ET
0.000 0.000 0.000 SCN
@@ -1857,20 +1868,9 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 86.57599999999965 Td
+48.24 86.57599999999965 Td
/F1.0 10.5 Tf
-<352e312e20> 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 86.57599999999965 Td
-/F3.0 10.5 Tf
-<4261636b67726f756e64436f6d6d616e6453657276696365> Tj
+[<352e204170706c69636174696f6e204c61> 20.01953125 <79657220535049>] TJ
ET
0.000 0.000 0.000 SCN
@@ -1879,9 +1879,9 @@ ET
0.200 0.200 0.200 SCN
BT
-207.92674999999997 86.57599999999965 Td
+170.51524999999992 86.57599999999965 Td
/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -1910,7 +1910,7 @@ ET
BT
60.24 68.09599999999966 Td
/F1.0 10.5 Tf
-<352e322e20> Tj
+<352e312e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -1921,7 +1921,7 @@ ET
BT
79.9485 68.09599999999966 Td
/F3.0 10.5 Tf
-<436f6d6d616e6453657276696365> Tj
+<4261636b67726f756e64436f6d6d616e6453657276696365> Tj
ET
0.000 0.000 0.000 SCN
@@ -1930,9 +1930,9 @@ ET
0.200 0.200 0.200 SCN
BT
-154.48174999999992 68.09599999999966 Td
+207.92674999999997 68.09599999999966 Td
/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -1950,7 +1950,7 @@ ET
BT
535.3009999999999 68.09599999999966 Td
/F1.0 10.5 Tf
-<3639> Tj
+<3638> Tj
ET
0.000 0.000 0.000 SCN
@@ -1970,11 +1970,11 @@ endobj
/F3.0 43 0 R
>>
>>
-/Annots [1968 0 R 1969 0 R 1970 0 R 1971 0 R 1972 0 R 1973 0 R 1974 0 R 1975 0 R 1976 0 R 1977 0 R 1978 0 R 1979 0 R 1980 0 R 1981 0 R 1982 0 R 1983 0 R 1984 0 R 1985 0 R 1986 0 R 1987 0 R 1988 0 R 1989 0 R 1990 0 R 1991 0 R 1992 0 R 1993 0 R 1994 0 R 1995 0 R 1996 0 R 1997 0 R 1998 0 R 1999 0 R 2000 0 R 2001 0 R 2002 0 R 2003 0 R 2004 0 R 2005 0 R 2006 0 R 2007 0 R 2008 0 R 2009 0 R 2010 0 R 2011 0 R 2012 0 R 2013 0 R 2014 0 R 2015 0 R 2016 0 R 2017 0 R 2018 0 R 2019 0 R 2020 0 R 2021 0 R 2022 0 R 2023 0 R 2024 0 R 2025 0 R 2026 0 R 2027 0 R 2028 0 R 2029 0 R 2030 0 R 2031 0 R 2032 0 R 2033 0 R 2034 0 R 2035 0 R 2036 0 R 2037 0 R 2038 0 R 2039 0 R 2040 0 R 2041 0 R 2042 0 R 2043 0 R 2044 0 R 2045 0 R 2046 0 R 2047 0 R 2048 0 R 2049 0 R 2050 0 R 2051 0 R 2052 0 R 2053 0 R 2054 0 R 2055 0 R 2056 0 R 2057 0 R 2058 0 R 2059 0 R 2060 0 R 2061 0 R 2062 0 R 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]
+/Annots [1980 0 R 1981 0 R 1982 0 R 1983 0 R 1984 0 R 1985 0 R 1986 0 R 1987 0 R 1988 0 R 1989 0 R 1990 0 R 1991 0 R 1992 0 R 1993 0 R 1994 0 R 1995 0 R 1996 0 R 1997 0 R 1998 0 R 1999 0 R 2000 0 R 2001 0 R 2002 0 R 2003 0 R 2004 0 R 2005 0 R 2006 0 R 2007 0 R 2008 0 R 2009 0 R 2010 0 R 2011 0 R 2012 0 R 2013 0 R 2014 0 R 2015 0 R 2016 0 R 2017 0 R 2018 0 R 2019 0 R 2020 0 R 2021 0 R 2022 0 R 2023 0 R 2024 0 R 2025 0 R 2026 0 R 2027 0 R 2028 0 R 2029 0 R 2030 0 R 2031 0 R 2032 0 R 2033 0 R 2034 0 R 2035 0 R 2036 0 R 2037 0 R 2038 0 R 2039 0 R 2040 0 R 2041 0 R 2042 0 R 2043 0 R 2044 0 R 2045 0 R 2046 0 R 2047 0 R 2048 0 R 2049 0 R 2050 0 R 2051 0 R 2052 0 R 2053 0 R 2054 0 R 2055 0 R 2056 0 R 2057 0 R 2058 0 R 2059 0 R 2060 0 R 2061 0 R 2062 0 R 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]
>>
endobj
11 0 obj
-<< /Length 40398
+<< /Length 40277
>>
stream
q
@@ -1986,7 +1986,7 @@ q
BT
60.24 794.6759999999999 Td
/F1.0 10.5 Tf
-<352e332e20> Tj
+<352e322e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -1997,7 +1997,7 @@ ET
BT
79.9485 794.6759999999999 Td
/F3.0 10.5 Tf
-<486f6d655061676550726f766964657253657276696365> Tj
+<436f6d6d616e6453657276696365> Tj
ET
0.000 0.000 0.000 SCN
@@ -2006,9 +2006,9 @@ ET
0.200 0.200 0.200 SCN
BT
-202.58224999999993 794.6759999999999 Td
+154.48174999999992 794.6759999999999 Td
/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -2026,7 +2026,7 @@ ET
BT
535.3009999999999 794.6759999999999 Td
/F1.0 10.5 Tf
-<3731> Tj
+<3730> Tj
ET
0.000 0.000 0.000 SCN
@@ -2035,9 +2035,20 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24 776.1959999999999 Td
+60.24 776.1959999999999 Td
/F1.0 10.5 Tf
-<362e20436f72652f446f6d61696e20415049> Tj
+<352e332e20> 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 776.1959999999999 Td
+/F3.0 10.5 Tf
+<486f6d655061676550726f766964657253657276696365> Tj
ET
0.000 0.000 0.000 SCN
@@ -2046,9 +2057,9 @@ ET
0.200 0.200 0.200 SCN
BT
-149.13724999999994 776.1959999999999 Td
+202.58224999999993 776.1959999999999 Td
/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -2066,7 +2077,7 @@ ET
BT
535.3009999999999 776.1959999999999 Td
/F1.0 10.5 Tf
-<3733> Tj
+<3732> Tj
ET
0.000 0.000 0.000 SCN
@@ -2075,20 +2086,9 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 757.7159999999999 Td
+48.24 757.7159999999999 Td
/F1.0 10.5 Tf
-<362e312e20> 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 757.7159999999999 Td
-/F3.0 10.5 Tf
-<436c6f636b53657276696365> Tj
+<362e20436f72652f446f6d61696e20415049> Tj
ET
0.000 0.000 0.000 SCN
@@ -2097,9 +2097,9 @@ ET
0.200 0.200 0.200 SCN
BT
-143.79274999999996 757.7159999999999 Td
+149.13724999999994 757.7159999999999 Td
/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -2117,7 +2117,7 @@ ET
BT
535.3009999999999 757.7159999999999 Td
/F1.0 10.5 Tf
-<3735> Tj
+<3734> Tj
ET
0.000 0.000 0.000 SCN
@@ -2128,7 +2128,7 @@ ET
BT
60.24 739.2359999999999 Td
/F1.0 10.5 Tf
-<362e322e20> Tj
+<362e312e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -2139,7 +2139,7 @@ ET
BT
79.9485 739.2359999999999 Td
/F3.0 10.5 Tf
-<436f6e66696775726174696f6e53657276696365> Tj
+<436c6f636b53657276696365> Tj
ET
0.000 0.000 0.000 SCN
@@ -2148,9 +2148,9 @@ ET
0.200 0.200 0.200 SCN
BT
-186.54874999999993 739.2359999999999 Td
+143.79274999999996 739.2359999999999 Td
/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -2168,7 +2168,7 @@ ET
BT
535.3009999999999 739.2359999999999 Td
/F1.0 10.5 Tf
-<3737> Tj
+<3736> Tj
ET
0.000 0.000 0.000 SCN
@@ -2179,7 +2179,7 @@ ET
BT
60.24 720.7559999999999 Td
/F1.0 10.5 Tf
-<362e332e20> Tj
+<362e322e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -2190,7 +2190,7 @@ ET
BT
79.9485 720.7559999999999 Td
/F3.0 10.5 Tf
-<446f6d61696e4f626a656374436f6e7461696e6572> Tj
+<436f6e66696775726174696f6e53657276696365> Tj
ET
0.000 0.000 0.000 SCN
@@ -2199,9 +2199,9 @@ ET
0.200 0.200 0.200 SCN
BT
-191.89324999999997 720.7559999999999 Td
+186.54874999999993 720.7559999999999 Td
/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -2230,7 +2230,7 @@ ET
BT
60.24 702.2759999999998 Td
/F1.0 10.5 Tf
-<362e342e20> Tj
+<362e332e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -2241,7 +2241,7 @@ ET
BT
79.9485 702.2759999999998 Td
/F3.0 10.5 Tf
-<4576656e7442757353657276696365> Tj
+<446f6d61696e4f626a656374436f6e7461696e6572> Tj
ET
0.000 0.000 0.000 SCN
@@ -2250,9 +2250,9 @@ ET
0.200 0.200 0.200 SCN
BT
-159.82624999999996 702.2759999999998 Td
+191.89324999999997 702.2759999999998 Td
/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -2270,7 +2270,7 @@ ET
BT
535.3009999999999 702.2759999999998 Td
/F1.0 10.5 Tf
-<3838> Tj
+<3739> Tj
ET
0.000 0.000 0.000 SCN
@@ -2281,7 +2281,7 @@ ET
BT
60.24 683.7959999999998 Td
/F1.0 10.5 Tf
-<362e352e20> Tj
+<362e342e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -2292,7 +2292,7 @@ ET
BT
79.9485 683.7959999999998 Td
/F3.0 10.5 Tf
-<466163746f727953657276696365> Tj
+<4576656e7442757353657276696365> Tj
ET
0.000 0.000 0.000 SCN
@@ -2301,9 +2301,9 @@ ET
0.200 0.200 0.200 SCN
BT
-154.48174999999992 683.7959999999998 Td
+159.82624999999996 683.7959999999998 Td
/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -2321,7 +2321,7 @@ ET
BT
535.3009999999999 683.7959999999998 Td
/F1.0 10.5 Tf
-<3936> Tj
+<3839> Tj
ET
0.000 0.000 0.000 SCN
@@ -2332,7 +2332,7 @@ ET
BT
60.24 665.3159999999998 Td
/F1.0 10.5 Tf
-<362e362e20> Tj
+<362e352e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -2343,7 +2343,7 @@ ET
BT
79.9485 665.3159999999998 Td
/F3.0 10.5 Tf
-<53637261746368706164> Tj
+<466163746f727953657276696365> Tj
ET
0.000 0.000 0.000 SCN
@@ -2352,9 +2352,9 @@ ET
0.200 0.200 0.200 SCN
BT
-138.44824999999992 665.3159999999998 Td
+154.48174999999992 665.3159999999998 Td
/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -2383,7 +2383,7 @@ ET
BT
60.24 646.8359999999998 Td
/F1.0 10.5 Tf
-<362e372e20> Tj
+<362e362e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -2394,7 +2394,7 @@ ET
BT
79.9485 646.8359999999998 Td
/F3.0 10.5 Tf
-<5573657253657276696365> Tj
+<53637261746368706164> Tj
ET
0.000 0.000 0.000 SCN
@@ -2423,7 +2423,7 @@ ET
BT
535.3009999999999 646.8359999999998 Td
/F1.0 10.5 Tf
-<3939> Tj
+<3938> Tj
ET
0.000 0.000 0.000 SCN
@@ -2432,9 +2432,20 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24 628.3559999999998 Td
+60.24 628.3559999999998 Td
/F1.0 10.5 Tf
-[<372e20496e74656772> 20.01953125 <6174696f6e20415049>] TJ
+<362e372e20> 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 628.3559999999998 Td
+/F3.0 10.5 Tf
+<5573657253657276696365> Tj
ET
0.000 0.000 0.000 SCN
@@ -2443,9 +2454,9 @@ ET
0.200 0.200 0.200 SCN
BT
-137.92324999999994 628.3559999999998 Td
+143.26774999999992 628.3559999999998 Td
/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -2463,16 +2474,56 @@ ET
BT
529.4314999999999 628.3559999999998 Td
/F1.0 10.5 Tf
-<313032> Tj
+<313030> 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 609.8759999999997 Td
+/F1.0 10.5 Tf
+[<372e20496e74656772> 20.01953125 <6174696f6e20415049>] TJ
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+137.92324999999994 609.8759999999997 Td
+/F1.0 10.5 Tf
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
+
+BT
+528.07175 609.8759999999997 Td
+/F1.0 5.25 Tf
+<ca> Tj
+ET
+
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
BT
-60.24 609.8759999999997 Td
+529.4314999999999 609.8759999999997 Td
+/F1.0 10.5 Tf
+<313033> 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 591.3959999999997 Td
/F1.0 10.5 Tf
<372e312e20> Tj
ET
@@ -2483,7 +2534,7 @@ ET
0.694 0.129 0.275 SCN
BT
-79.9485 609.8759999999997 Td
+79.9485 591.3959999999997 Td
/F3.0 10.5 Tf
<426f6f6b6d61726b5365727669636532> Tj
ET
@@ -2494,7 +2545,7 @@ ET
0.200 0.200 0.200 SCN
BT
-164.6457499999999 609.8759999999997 Td
+164.6457499999999 591.3959999999997 Td
/F1.0 10.5 Tf
<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
@@ -2503,7 +2554,7 @@ ET
0.000 0.000 0.000 scn
BT
-528.07175 609.8759999999997 Td
+528.07175 591.3959999999997 Td
/F1.0 5.25 Tf
<ca> Tj
ET
@@ -2512,9 +2563,9 @@ ET
0.200 0.200 0.200 SCN
BT
-529.4314999999999 609.8759999999997 Td
+529.4314999999999 591.3959999999997 Td
/F1.0 10.5 Tf
-<313033> Tj
+<313034> Tj
ET
0.000 0.000 0.000 SCN
@@ -2523,7 +2574,7 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 591.3959999999997 Td
+60.24 572.9159999999997 Td
/F1.0 10.5 Tf
<372e322e20> Tj
ET
@@ -2534,7 +2585,7 @@ ET
0.694 0.129 0.275 SCN
BT
-79.9485 591.3959999999997 Td
+79.9485 572.9159999999997 Td
/F3.0 10.5 Tf
<446565704c696e6b53657276696365> Tj
ET
@@ -2545,7 +2596,7 @@ ET
0.200 0.200 0.200 SCN
BT
-164.6457499999999 591.3959999999997 Td
+164.6457499999999 572.9159999999997 Td
/F1.0 10.5 Tf
<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
@@ -2554,7 +2605,7 @@ ET
0.000 0.000 0.000 scn
BT
-528.07175 591.3959999999997 Td
+528.07175 572.9159999999997 Td
/F1.0 5.25 Tf
<ca> Tj
ET
@@ -2563,9 +2614,9 @@ ET
0.200 0.200 0.200 SCN
BT
-529.4314999999999 591.3959999999997 Td
+529.4314999999999 572.9159999999997 Td
/F1.0 10.5 Tf
-<313035> Tj
+<313036> Tj
ET
0.000 0.000 0.000 SCN
@@ -2574,7 +2625,7 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 572.9159999999997 Td
+60.24 554.4359999999997 Td
/F1.0 10.5 Tf
<372e332e20> Tj
ET
@@ -2585,7 +2636,7 @@ ET
0.694 0.129 0.275 SCN
BT
-79.9485 572.9159999999997 Td
+79.9485 554.4359999999997 Td
/F3.0 10.5 Tf
<456d61696c53657276696365> Tj
ET
@@ -2596,7 +2647,7 @@ ET
0.200 0.200 0.200 SCN
BT
-148.6122499999999 572.9159999999997 Td
+148.6122499999999 554.4359999999997 Td
/F1.0 10.5 Tf
<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
@@ -2605,7 +2656,7 @@ ET
0.000 0.000 0.000 scn
BT
-528.07175 572.9159999999997 Td
+528.07175 554.4359999999997 Td
/F1.0 5.25 Tf
<ca> Tj
ET
@@ -2614,9 +2665,9 @@ ET
0.200 0.200 0.200 SCN
BT
-529.4314999999999 572.9159999999997 Td
+529.4314999999999 554.4359999999997 Td
/F1.0 10.5 Tf
-<313036> Tj
+<313037> Tj
ET
0.000 0.000 0.000 SCN
@@ -2625,7 +2676,7 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 554.4359999999997 Td
+60.24 535.9559999999997 Td
/F1.0 10.5 Tf
<372e342e20> Tj
ET
@@ -2636,7 +2687,7 @@ ET
0.694 0.129 0.275 SCN
BT
-79.9485 554.4359999999997 Td
+79.9485 535.9559999999997 Td
/F3.0 10.5 Tf
<47756963654265616e50726f7669646572> Tj
ET
@@ -2647,7 +2698,7 @@ ET
0.200 0.200 0.200 SCN
BT
-169.99024999999995 554.4359999999997 Td
+169.99024999999995 535.9559999999997 Td
/F1.0 10.5 Tf
<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
@@ -2656,7 +2707,7 @@ ET
0.000 0.000 0.000 scn
BT
-528.07175 554.4359999999997 Td
+528.07175 535.9559999999997 Td
/F1.0 5.25 Tf
<ca> Tj
ET
@@ -2665,9 +2716,9 @@ ET
0.200 0.200 0.200 SCN
BT
-529.4314999999999 554.4359999999997 Td
+529.4314999999999 535.9559999999997 Td
/F1.0 10.5 Tf
-<313039> Tj
+<313130> Tj
ET
0.000 0.000 0.000 SCN
@@ -2676,7 +2727,7 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 535.9559999999997 Td
+60.24 517.4759999999997 Td
/F1.0 10.5 Tf
<372e352e20> Tj
ET
@@ -2687,7 +2738,7 @@ ET
0.694 0.129 0.275 SCN
BT
-79.9485 535.9559999999997 Td
+79.9485 517.4759999999997 Td
/F3.0 10.5 Tf
<4a61786253657276696365> Tj
ET
@@ -2698,7 +2749,7 @@ ET
0.200 0.200 0.200 SCN
BT
-143.26774999999992 535.9559999999997 Td
+143.26774999999992 517.4759999999997 Td
/F1.0 10.5 Tf
<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
@@ -2707,7 +2758,7 @@ ET
0.000 0.000 0.000 scn
BT
-528.07175 535.9559999999997 Td
+528.07175 517.4759999999997 Td
/F1.0 5.25 Tf
<ca> Tj
ET
@@ -2716,9 +2767,9 @@ ET
0.200 0.200 0.200 SCN
BT
-529.4314999999999 535.9559999999997 Td
+529.4314999999999 517.4759999999997 Td
/F1.0 10.5 Tf
-<313131> Tj
+<313132> Tj
ET
0.000 0.000 0.000 SCN
@@ -2727,7 +2778,7 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 517.4759999999997 Td
+60.24 498.9959999999997 Td
/F1.0 10.5 Tf
<372e362e20> Tj
ET
@@ -2738,7 +2789,7 @@ ET
0.694 0.129 0.275 SCN
BT
-79.9485 517.4759999999997 Td
+79.9485 498.9959999999997 Td
/F3.0 10.5 Tf
<4d656d656e746f53657276696365> Tj
ET
@@ -2749,7 +2800,7 @@ ET
0.200 0.200 0.200 SCN
BT
-153.4485 517.4759999999997 Td
+153.4485 498.9959999999997 Td
/F1.0 10.5 Tf
<20286465707265636174656429> Tj
ET
@@ -2760,7 +2811,7 @@ ET
0.200 0.200 0.200 SCN
BT
-223.43524999999994 517.4759999999997 Td
+223.43524999999994 498.9959999999997 Td
/F1.0 10.5 Tf
<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
@@ -2769,7 +2820,7 @@ ET
0.000 0.000 0.000 scn
BT
-528.07175 517.4759999999997 Td
+528.07175 498.9959999999997 Td
/F1.0 5.25 Tf
<ca> Tj
ET
@@ -2778,9 +2829,9 @@ ET
0.200 0.200 0.200 SCN
BT
-529.4314999999999 517.4759999999997 Td
+529.4314999999999 498.9959999999997 Td
/F1.0 10.5 Tf
-<313132> Tj
+<313133> Tj
ET
0.000 0.000 0.000 SCN
@@ -2789,7 +2840,7 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 498.9959999999997 Td
+60.24 480.5159999999997 Td
/F1.0 10.5 Tf
<372e372e20> Tj
ET
@@ -2800,7 +2851,7 @@ ET
0.694 0.129 0.275 SCN
BT
-79.9485 498.9959999999997 Td
+79.9485 480.5159999999997 Td
/F3.0 10.5 Tf
<586d6c536e617073686f7453657276696365> Tj
ET
@@ -2811,7 +2862,7 @@ ET
0.200 0.200 0.200 SCN
BT
-175.33474999999993 498.9959999999997 Td
+175.33474999999993 480.5159999999997 Td
/F1.0 10.5 Tf
<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
@@ -2820,7 +2871,7 @@ ET
0.000 0.000 0.000 scn
BT
-528.07175 498.9959999999997 Td
+528.07175 480.5159999999997 Td
/F1.0 5.25 Tf
<ca> Tj
ET
@@ -2829,9 +2880,9 @@ ET
0.200 0.200 0.200 SCN
BT
-529.4314999999999 498.9959999999997 Td
+529.4314999999999 480.5159999999997 Td
/F1.0 10.5 Tf
-<313134> Tj
+<313135> Tj
ET
0.000 0.000 0.000 SCN
@@ -2840,7 +2891,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24 480.5159999999997 Td
+48.24 462.03599999999966 Td
/F1.0 10.5 Tf
<382e204d6574616461746120415049> Tj
ET
@@ -2851,7 +2902,7 @@ ET
0.200 0.200 0.200 SCN
BT
-132.5787499999999 480.5159999999997 Td
+132.5787499999999 462.03599999999966 Td
/F1.0 10.5 Tf
<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
@@ -2860,7 +2911,7 @@ ET
0.000 0.000 0.000 scn
BT
-528.07175 480.5159999999997 Td
+528.07175 462.03599999999966 Td
/F1.0 5.25 Tf
<ca> Tj
ET
@@ -2869,9 +2920,9 @@ ET
0.200 0.200 0.200 SCN
BT
-529.4314999999999 480.5159999999997 Td
+529.4314999999999 462.03599999999966 Td
/F1.0 10.5 Tf
-<313139> Tj
+<313230> Tj
ET
0.000 0.000 0.000 SCN
@@ -2880,7 +2931,7 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 462.03599999999966 Td
+60.24 443.55599999999964 Td
/F1.0 10.5 Tf
<382e312e20> Tj
ET
@@ -2891,7 +2942,7 @@ ET
0.694 0.129 0.275 SCN
BT
-79.9485 462.03599999999966 Td
+79.9485 443.55599999999964 Td
/F3.0 10.5 Tf
<4170706c69636174696f6e466561747572655265706f7369746f7279> Tj
ET
@@ -2902,7 +2953,7 @@ ET
0.200 0.200 0.200 SCN
BT
-228.77974999999992 462.03599999999966 Td
+228.77974999999992 443.55599999999964 Td
/F1.0 10.5 Tf
<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
@@ -2911,7 +2962,7 @@ ET
0.000 0.000 0.000 scn
BT
-528.07175 462.03599999999966 Td
+528.07175 443.55599999999964 Td
/F1.0 5.25 Tf
<ca> Tj
ET
@@ -2920,9 +2971,9 @@ ET
0.200 0.200 0.200 SCN
BT
-529.4314999999999 462.03599999999966 Td
+529.4314999999999 443.55599999999964 Td
/F1.0 10.5 Tf
-<313230> Tj
+<313231> Tj
ET
0.000 0.000 0.000 SCN
@@ -2931,7 +2982,7 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 443.55599999999964 Td
+60.24 425.0759999999996 Td
/F1.0 10.5 Tf
<382e322e20> Tj
ET
@@ -2942,7 +2993,7 @@ ET
0.694 0.129 0.275 SCN
BT
-79.9485 443.55599999999964 Td
+79.9485 425.0759999999996 Td
/F3.0 10.5 Tf
<4c61796f757453657276696365> Tj
ET
@@ -2953,7 +3004,7 @@ ET
0.200 0.200 0.200 SCN
BT
-153.95674999999994 443.55599999999964 Td
+153.95674999999994 425.0759999999996 Td
/F1.0 10.5 Tf
<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
@@ -2962,7 +3013,7 @@ ET
0.000 0.000 0.000 scn
BT
-528.07175 443.55599999999964 Td
+528.07175 425.0759999999996 Td
/F1.0 5.25 Tf
<ca> Tj
ET
@@ -2971,9 +3022,9 @@ ET
0.200 0.200 0.200 SCN
BT
-529.4314999999999 443.55599999999964 Td
+529.4314999999999 425.0759999999996 Td
/F1.0 10.5 Tf
-<313231> Tj
+<313232> Tj
ET
0.000 0.000 0.000 SCN
@@ -2982,7 +3033,7 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 425.0759999999996 Td
+60.24 406.5959999999996 Td
/F1.0 10.5 Tf
<382e332e20> Tj
ET
@@ -2993,7 +3044,7 @@ ET
0.694 0.129 0.275 SCN
BT
-79.9485 425.0759999999996 Td
+79.9485 406.5959999999996 Td
/F3.0 10.5 Tf
<4d6574614d6f64656c5365727669636533> Tj
ET
@@ -3004,7 +3055,7 @@ ET
0.200 0.200 0.200 SCN
BT
-169.99024999999995 425.0759999999996 Td
+169.99024999999995 406.5959999999996 Td
/F1.0 10.5 Tf
<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
@@ -3013,7 +3064,7 @@ ET
0.000 0.000 0.000 scn
BT
-528.07175 425.0759999999996 Td
+528.07175 406.5959999999996 Td
/F1.0 5.25 Tf
<ca> Tj
ET
@@ -3022,9 +3073,9 @@ ET
0.200 0.200 0.200 SCN
BT
-529.4314999999999 425.0759999999996 Td
+529.4314999999999 406.5959999999996 Td
/F1.0 10.5 Tf
-<313233> Tj
+<313234> Tj
ET
0.000 0.000 0.000 SCN
@@ -3033,7 +3084,7 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 406.5959999999996 Td
+60.24 388.1159999999996 Td
/F1.0 10.5 Tf
<382e342e20> Tj
ET
@@ -3044,7 +3095,7 @@ ET
0.694 0.129 0.275 SCN
BT
-79.9485 406.5959999999996 Td
+79.9485 388.1159999999996 Td
/F3.0 10.5 Tf
<53657276696365526567697374727932> Tj
ET
@@ -3055,7 +3106,7 @@ ET
0.200 0.200 0.200 SCN
BT
-164.6457499999999 406.5959999999996 Td
+164.6457499999999 388.1159999999996 Td
/F1.0 10.5 Tf
<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
@@ -3064,7 +3115,7 @@ ET
0.000 0.000 0.000 scn
BT
-528.07175 406.5959999999996 Td
+528.07175 388.1159999999996 Td
/F1.0 5.25 Tf
<ca> Tj
ET
@@ -3073,9 +3124,9 @@ ET
0.200 0.200 0.200 SCN
BT
-529.4314999999999 406.5959999999996 Td
+529.4314999999999 388.1159999999996 Td
/F1.0 10.5 Tf
-<313235> Tj
+<313236> Tj
ET
0.000 0.000 0.000 SCN
@@ -3084,7 +3135,7 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 388.1159999999996 Td
+60.24 369.63599999999957 Td
/F1.0 10.5 Tf
<382e352e20> Tj
ET
@@ -3095,7 +3146,7 @@ ET
0.694 0.129 0.275 SCN
BT
-79.9485 388.1159999999996 Td
+79.9485 369.63599999999957 Td
/F3.0 10.5 Tf
<5377616767657253657276696365> Tj
ET
@@ -3106,7 +3157,7 @@ ET
0.200 0.200 0.200 SCN
BT
-159.30124999999992 388.1159999999996 Td
+159.30124999999992 369.63599999999957 Td
/F1.0 10.5 Tf
<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
@@ -3115,7 +3166,7 @@ ET
0.000 0.000 0.000 scn
BT
-528.07175 388.1159999999996 Td
+528.07175 369.63599999999957 Td
/F1.0 5.25 Tf
<ca> Tj
ET
@@ -3124,9 +3175,9 @@ ET
0.200 0.200 0.200 SCN
BT
-529.4314999999999 388.1159999999996 Td
+529.4314999999999 369.63599999999957 Td
/F1.0 10.5 Tf
-<313236> Tj
+<313237> Tj
ET
0.000 0.000 0.000 SCN
@@ -3135,7 +3186,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24 369.63599999999957 Td
+48.24 351.15599999999955 Td
/F1.0 10.5 Tf
[<392e2054> 29.78515625 <657374696e67>] TJ
ET
@@ -3146,7 +3197,7 @@ ET
0.200 0.200 0.200 SCN
BT
-100.51174999999995 369.63599999999957 Td
+100.51174999999995 351.15599999999955 Td
/F1.0 10.5 Tf
<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
@@ -3155,7 +3206,7 @@ ET
0.000 0.000 0.000 scn
BT
-528.07175 369.63599999999957 Td
+528.07175 351.15599999999955 Td
/F1.0 5.25 Tf
<ca> Tj
ET
@@ -3164,9 +3215,9 @@ ET
0.200 0.200 0.200 SCN
BT
-529.4314999999999 369.63599999999957 Td
+529.4314999999999 351.15599999999955 Td
/F1.0 10.5 Tf
-<313238> Tj
+<313239> Tj
ET
0.000 0.000 0.000 SCN
@@ -3175,7 +3226,7 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 351.15599999999955 Td
+60.24 332.67599999999953 Td
/F1.0 10.5 Tf
<392e312e20> Tj
ET
@@ -3186,7 +3237,7 @@ ET
0.694 0.129 0.275 SCN
BT
-79.9485 351.15599999999955 Td
+79.9485 332.67599999999953 Td
/F3.0 10.5 Tf
<457865637574696f6e506172616d657465727353657276696365> Tj
ET
@@ -3197,7 +3248,7 @@ ET
0.200 0.200 0.200 SCN
BT
-218.09074999999996 351.15599999999955 Td
+218.09074999999996 332.67599999999953 Td
/F1.0 10.5 Tf
<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
@@ -3206,7 +3257,7 @@ ET
0.000 0.000 0.000 scn
BT
-528.07175 351.15599999999955 Td
+528.07175 332.67599999999953 Td
/F1.0 5.25 Tf
<ca> Tj
ET
@@ -3215,9 +3266,9 @@ ET
0.200 0.200 0.200 SCN
BT
-529.4314999999999 351.15599999999955 Td
+529.4314999999999 332.67599999999953 Td
/F1.0 10.5 Tf
-<313239> Tj
+<313330> Tj
ET
0.000 0.000 0.000 SCN
@@ -3226,7 +3277,7 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 332.67599999999953 Td
+60.24 314.1959999999995 Td
/F1.0 10.5 Tf
<392e322e20> Tj
ET
@@ -3237,7 +3288,7 @@ ET
0.694 0.129 0.275 SCN
BT
-79.9485 332.67599999999953 Td
+79.9485 314.1959999999995 Td
/F3.0 10.5 Tf
<466978747572655363726970747344656661756c74> Tj
ET
@@ -3248,7 +3299,7 @@ ET
0.200 0.200 0.200 SCN
BT
-191.36824999999993 332.67599999999953 Td
+191.36824999999993 314.1959999999995 Td
/F1.0 10.5 Tf
<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
@@ -3257,7 +3308,7 @@ ET
0.000 0.000 0.000 scn
BT
-528.07175 332.67599999999953 Td
+528.07175 314.1959999999995 Td
/F1.0 5.25 Tf
<ca> Tj
ET
@@ -3266,9 +3317,9 @@ ET
0.200 0.200 0.200 SCN
BT
-529.4314999999999 332.67599999999953 Td
+529.4314999999999 314.1959999999995 Td
/F1.0 10.5 Tf
-<313239> Tj
+<313330> Tj
ET
0.000 0.000 0.000 SCN
@@ -3277,7 +3328,7 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 314.1959999999995 Td
+60.24 295.7159999999995 Td
/F1.0 10.5 Tf
<392e332e20> Tj
ET
@@ -3288,7 +3339,7 @@ ET
0.694 0.129 0.275 SCN
BT
-79.9485 314.1959999999995 Td
+79.9485 295.7159999999995 Td
/F3.0 10.5 Tf
<466978747572655363726970747353706563> Tj
ET
@@ -3299,7 +3350,7 @@ ET
0.694 0.129 0.275 SCN
BT
-174.4485 314.1959999999995 Td
+174.4485 295.7159999999995 Td
/F4.0 10.5 Tf
<d5> Tj
ET
@@ -3310,7 +3361,7 @@ ET
0.694 0.129 0.275 SCN
BT
-177.4725 314.1959999999995 Td
+177.4725 295.7159999999995 Td
/F3.0 10.5 Tf
<6e50726f7669646572> Tj
ET
@@ -3321,7 +3372,7 @@ ET
0.200 0.200 0.200 SCN
BT
-234.12424999999996 314.1959999999995 Td
+234.12424999999996 295.7159999999995 Td
/F1.0 10.5 Tf
<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
@@ -3330,7 +3381,7 @@ ET
0.000 0.000 0.000 scn
BT
-528.07175 314.1959999999995 Td
+528.07175 295.7159999999995 Td
/F1.0 5.25 Tf
<ca> Tj
ET
@@ -3339,9 +3390,9 @@ ET
0.200 0.200 0.200 SCN
BT
-529.4314999999999 314.1959999999995 Td
+529.4314999999999 295.7159999999995 Td
/F1.0 10.5 Tf
-<313330> Tj
+<313331> Tj
ET
0.000 0.000 0.000 SCN
@@ -3350,7 +3401,7 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 295.7159999999995 Td
+60.24 277.2359999999995 Td
/F1.0 10.5 Tf
<392e342e20> Tj
ET
@@ -3361,7 +3412,7 @@ ET
0.694 0.129 0.275 SCN
BT
-79.9485 295.7159999999995 Td
+79.9485 277.2359999999995 Td
/F3.0 10.5 Tf
<5375646f53657276696365> Tj
ET
@@ -3372,7 +3423,7 @@ ET
0.200 0.200 0.200 SCN
BT
-143.26774999999992 295.7159999999995 Td
+143.26774999999992 277.2359999999995 Td
/F1.0 10.5 Tf
<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
@@ -3381,7 +3432,7 @@ ET
0.000 0.000 0.000 scn
BT
-528.07175 295.7159999999995 Td
+528.07175 277.2359999999995 Td
/F1.0 5.25 Tf
<ca> Tj
ET
@@ -3390,9 +3441,9 @@ ET
0.200 0.200 0.200 SCN
BT
-529.4314999999999 295.7159999999995 Td
+529.4314999999999 277.2359999999995 Td
/F1.0 10.5 Tf
-<313331> Tj
+<313332> Tj
ET
0.000 0.000 0.000 SCN
@@ -3401,7 +3452,7 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 277.2359999999995 Td
+60.24 258.75599999999946 Td
/F1.0 10.5 Tf
<392e352e20> Tj
ET
@@ -3412,7 +3463,7 @@ ET
0.694 0.129 0.275 SCN
BT
-79.9485 277.2359999999995 Td
+79.9485 258.75599999999946 Td
/F3.0 10.5 Tf
<5377697463685573657253657276696365> Tj
ET
@@ -3423,7 +3474,7 @@ ET
0.200 0.200 0.200 SCN
BT
-169.1985 277.2359999999995 Td
+169.1985 258.75599999999946 Td
/F1.0 10.5 Tf
<20286465707265636174656429> Tj
ET
@@ -3434,7 +3485,7 @@ ET
0.200 0.200 0.200 SCN
BT
-239.46874999999994 277.2359999999995 Td
+239.46874999999994 258.75599999999946 Td
/F1.0 10.5 Tf
<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
@@ -3443,46 +3494,6 @@ ET
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
-<313334> 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 258.75599999999946 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 258.75599999999946 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 258.75599999999946 Td
/F1.0 5.25 Tf
<ca> Tj
@@ -3503,7 +3514,47 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 240.27599999999947 Td
+48.24 240.27599999999947 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 240.27599999999947 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 240.27599999999947 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 240.27599999999947 Td
+/F1.0 10.5 Tf
+<313336> 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 221.79599999999948 Td
/F1.0 10.5 Tf
<31302e312e20> Tj
ET
@@ -3514,7 +3565,58 @@ ET
0.694 0.129 0.275 SCN
BT
-85.81800000000001 240.27599999999947 Td
+85.81800000000001 221.79599999999948 Td
+/F3.0 10.5 Tf
+<4873716c44624d616e616765724d656e75> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+180.6792499999999 221.79599999999948 Td
+/F1.0 10.5 Tf
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+
+BT
+528.07175 221.79599999999948 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 221.79599999999948 Td
+/F1.0 10.5 Tf
+<313336> 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 203.3159999999995 Td
+/F1.0 10.5 Tf
+<31302e322e20> 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
+85.81800000000001 203.3159999999995 Td
/F3.0 10.5 Tf
<497369734a646f537570706f7274> Tj
ET
@@ -3525,7 +3627,7 @@ ET
0.200 0.200 0.200 SCN
BT
-164.6457499999999 240.27599999999947 Td
+164.6457499999999 203.3159999999995 Td
/F1.0 10.5 Tf
<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
@@ -3534,7 +3636,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
@@ -3543,9 +3645,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
-<313335> Tj
+<313337> Tj
ET
0.000 0.000 0.000 SCN
@@ -3554,9 +3656,9 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 221.79599999999948 Td
+60.24 184.8359999999995 Td
/F1.0 10.5 Tf
-<31302e322e20> Tj
+<31302e332e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -3565,7 +3667,7 @@ ET
0.694 0.129 0.275 SCN
BT
-85.81800000000001 221.79599999999948 Td
+85.81800000000001 184.8359999999995 Td
/F3.0 10.5 Tf
<4d65747269637353657276696365> Tj
ET
@@ -3576,7 +3678,7 @@ ET
0.200 0.200 0.200 SCN
BT
-164.6457499999999 221.79599999999948 Td
+164.6457499999999 184.8359999999995 Td
/F1.0 10.5 Tf
<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
@@ -3585,7 +3687,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
@@ -3594,9 +3696,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
-<313430> Tj
+<313432> Tj
ET
0.000 0.000 0.000 SCN
@@ -3605,9 +3707,9 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 203.3159999999995 Td
+60.24 166.3559999999995 Td
/F1.0 10.5 Tf
-<31302e332e20> Tj
+<31302e342e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -3616,7 +3718,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
<5175657279526573756c74734361636865> Tj
ET
@@ -3627,7 +3729,7 @@ ET
0.200 0.200 0.200 SCN
BT
-180.6792499999999 203.3159999999995 Td
+180.6792499999999 166.3559999999995 Td
/F1.0 10.5 Tf
<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
@@ -3636,7 +3738,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
@@ -3645,9 +3747,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
-<313431> Tj
+<313433> Tj
ET
0.000 0.000 0.000 SCN
@@ -3656,9 +3758,9 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 184.8359999999995 Td
+60.24 147.87599999999952 Td
/F1.0 10.5 Tf
-<31302e342e20> Tj
+<31302e352e20> Tj
ET
0.000 0.000 0.000 SCN
@@ -3667,7 +3769,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
<5265706f7369746f727953657276696365> Tj
ET
@@ -3678,7 +3780,7 @@ ET
0.200 0.200 0.200 SCN
BT
-180.6792499999999 184.8359999999995 Td
+180.6792499999999 147.87599999999952 Td
/F1.0 10.5 Tf
<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
@@ -3687,7 +3789,7 @@ ET
0.000 0.000 0.000 scn
BT
-528.07175 184.8359999999995 Td
+528.07175 147.87599999999952 Td
/F1.0 5.25 Tf
<ca> Tj
ET
@@ -3696,9 +3798,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
-<313434> Tj
+<313436> Tj
ET
0.000 0.000 0.000 SCN
@@ -3707,7 +3809,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24 166.3559999999995 Td
+48.24 129.39599999999953 Td
/F1.0 10.5 Tf
[<31312e2050657273697374656e6365204c61> 20.01953125 <79657220535049>] TJ
ET
@@ -3718,7 +3820,7 @@ ET
0.200 0.200 0.200 SCN
BT
-175.33474999999993 166.3559999999995 Td
+175.33474999999993 129.39599999999953 Td
/F1.0 10.5 Tf
<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
@@ -3727,7 +3829,7 @@ ET
0.000 0.000 0.000 scn
BT
-528.07175 166.3559999999995 Td
+528.07175 129.39599999999953 Td
/F1.0 5.25 Tf
<ca> Tj
ET
@@ -3736,9 +3838,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
-<313531> Tj
+<313533> Tj
ET
0.000 0.000 0.000 SCN
@@ -3747,7 +3849,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
<31312e312e20> Tj
ET
@@ -3758,7 +3860,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
<4175646974657253657276696365> Tj
ET
@@ -3769,7 +3871,7 @@ ET
0.200 0.200 0.200 SCN
BT
-164.6457499999999 147.87599999999952 Td
+164.6457499999999 110.91599999999954 Td
/F1.0 10.5 Tf
<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
@@ -3778,7 +3880,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
@@ -3787,9 +3889,9 @@ ET
0.200 0.200 0.200 SCN
BT
-529.4314999999999 147.87599999999952 Td
+529.4314999999999 110.91599999999954 Td
/F1.0 10.5 Tf
-<313532> Tj
+<313534> Tj
ET
0.000 0.000 0.000 SCN
@@ -3798,7 +3900,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
<31312e322e20> Tj
ET
@@ -3809,7 +3911,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
<4175646974696e675365727669636533> Tj
ET
@@ -3820,7 +3922,7 @@ ET
0.200 0.200 0.200 SCN
BT
-169.818 129.39599999999953 Td
+169.818 92.43599999999955 Td
/F1.0 10.5 Tf
<20286465707265636174656429> Tj
ET
@@ -3831,7 +3933,7 @@ ET
0.200 0.200 0.200 SCN
BT
-239.46874999999994 129.39599999999953 Td
+239.46874999999994 92.43599999999955 Td
/F1.0 10.5 Tf
<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
@@ -3840,7 +3942,7 @@ ET
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
@@ -3849,9 +3951,9 @@ ET
0.200 0.200 0.200 SCN
BT
-529.4314999999999 129.39599999999953 Td
+529.4314999999999 92.43599999999955 Td
/F1.0 10.5 Tf
-<313535> Tj
+<313537> Tj
ET
0.000 0.000 0.000 SCN
@@ -3860,7 +3962,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
<31312e332e20> Tj
ET
@@ -3871,7 +3973,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
<4576656e7453657269616c697a6572> Tj
ET
@@ -3882,7 +3984,7 @@ ET
0.200 0.200 0.200 SCN
BT
-164.568 110.91599999999954 Td
+164.568 73.95599999999956 Td
/F1.0 10.5 Tf
<20286465707265636174656429> Tj
ET
@@ -3893,7 +3995,7 @@ ET
0.200 0.200 0.200 SCN
BT
-234.12424999999996 110.91599999999954 Td
+234.12424999999996 73.95599999999956 Td
/F1.0 10.5 Tf
<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
@@ -3902,7 +4004,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
@@ -3911,9 +4013,9 @@ ET
0.200 0.200 0.200 SCN
BT
-529.4314999999999 110.91599999999954 Td
+529.4314999999999 73.95599999999956 Td
/F1.0 10.5 Tf
-<313536> Tj
+<313538> Tj
ET
0.000 0.000 0.000 SCN
@@ -3922,7 +4024,7 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 92.43599999999955 Td
+60.24 55.47599999999957 Td
/F1.0 10.5 Tf
<31312e342e20> Tj
ET
@@ -3933,7 +4035,7 @@ ET
0.694 0.129 0.275 SCN
BT
-85.81800000000001 92.43599999999955 Td
+85.81800000000001 55.47599999999957 Td
/F3.0 10.5 Tf
<5075626c697368657253657276696365> Tj
ET
@@ -3944,7 +4046,7 @@ ET
0.200 0.200 0.200 SCN
BT
-175.33474999999993 92.43599999999955 Td
+175.33474999999993 55.47599999999957 Td
/F1.0 10.5 Tf
<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
@@ -3953,7 +4055,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
@@ -3962,18 +4064,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
-<313539> Tj
+<313631> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
+Q
+
+endstream
+endobj
+12 0 obj
+<< /Type /Page
+/Parent 3 0 R
+/MediaBox [0 0 595.28 841.89]
+/Contents 11 0 R
+/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
+/Font << /F1.0 8 0 R
+/F3.0 43 0 R
+/F4.0 58 0 R
+>>
+>>
+/Annots [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 2150 0 R 2151 0 R 2152 0 R 2153 0 R 2154 0 R 2155 0 R 2156 0 R 2157 0 R 2158 0 R 2159 0 R 2160 0 R 2161 0 R 2162 0 R 2163 0 R 2164 0 R 2165 0 R 2166 0 R 2167 0 R 2168 0 R 2169 0 R 2170 0 R 2171 0 R 2172 0 R 2173 0 R 2174 0 R 2175 0 R 2176 0 R 2177 0 R 2178 0 R 2179 0 R 2180 0 R 2181 0 R 2182 0 R 2183 0 R 2184 0 R 2185 0 R 2186 0 R 2187 0 R 2188 0 R 2189 0 R 2190 0 R 2191 0 R 2192 0 R 2193 0 R 2194 0 R 2195 0
R 2196 0 R 2197 0 R 2198 0 R 2199 0 R 2200 0 R 2201 0 R 2202 0 R 2203 0 R 2204 0 R 2205 0 R 2206 0 R 2207 0 R 2208 0 R]
+>>
+endobj
+13 0 obj
+<< /Length 3943
+>>
+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
<31312e352e20> Tj
ET
@@ -3984,7 +4111,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
<5075626c697368696e6753657276696365> Tj
ET
@@ -3995,7 +4122,7 @@ ET
0.200 0.200 0.200 SCN
BT
-175.068 73.95599999999956 Td
+175.068 794.6759999999999 Td
/F1.0 10.5 Tf
<20286465707265636174656429> Tj
ET
@@ -4006,7 +4133,7 @@ ET
0.200 0.200 0.200 SCN
BT
-244.81324999999993 73.95599999999956 Td
+244.81324999999993 794.6759999999999 Td
/F1.0 10.5 Tf
<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
@@ -4015,7 +4142,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
@@ -4024,9 +4151,9 @@ ET
0.200 0.200 0.200 SCN
BT
-529.4314999999999 73.95599999999956 Td
+529.4314999999999 794.6759999999999 Td
/F1.0 10.5 Tf
-<313632> Tj
+<313634> Tj
ET
0.000 0.000 0.000 SCN
@@ -4035,7 +4162,7 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 55.47599999999957 Td
+60.24 776.1959999999999 Td
/F1.0 10.5 Tf
<31312e362e20> Tj
ET
@@ -4046,7 +4173,7 @@ ET
0.694 0.129 0.275 SCN
BT
-85.81800000000001 55.47599999999957 Td
+85.81800000000001 776.1959999999999 Td
/F3.0 10.5 Tf
<55736572526567697374726174696f6e53657276696365> Tj
ET
@@ -4057,7 +4184,7 @@ ET
0.200 0.200 0.200 SCN
BT
-207.40174999999994 55.47599999999957 Td
+207.40174999999994 776.1959999999999 Td
/F1.0 10.5 Tf
<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
@@ -4066,7 +4193,7 @@ ET
0.000 0.000 0.000 scn
BT
-528.07175 55.47599999999957 Td
+528.07175 776.1959999999999 Td
/F1.0 5.25 Tf
<ca> Tj
ET
@@ -4075,43 +4202,18 @@ ET
0.200 0.200 0.200 SCN
BT
-529.4314999999999 55.47599999999957 Td
+529.4314999999999 776.1959999999999 Td
/F1.0 10.5 Tf
-<313637> Tj
+<313639> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-Q
-
-endstream
-endobj
-12 0 obj
-<< /Type /Page
-/Parent 3 0 R
-/MediaBox [0 0 595.28 841.89]
-/Contents 11 0 R
-/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F1.0 8 0 R
-/F3.0 43 0 R
-/F4.0 58 0 R
->>
->>
-/Annots [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 2150 0 R 2151 0 R 2152 0 R 2153 0 R 2154 0 R 2155 0 R 2156 0 R 2157 0 R 2158 0 R 2159 0 R 2160 0 R 2161 0 R 2162 0 R 2163 0 R 2164 0 R 2165 0 R 2166 0 R 2167 0 R 2168 0 R 2169 0 R 2170 0 R 2171 0 R 2172 0 R 2173 0 R 2174 0 R 2175 0 R 2176 0 R 2177 0 R 2178 0 R 2179 0 R 2180 0 R 2181 0 R 2182 0 R 2183 0
R 2184 0 R 2185 0 R 2186 0 R 2187 0 R 2188 0 R 2189 0 R 2190 0 R 2191 0 R 2192 0 R 2193 0 R 2194 0 R 2195 0 R 2196 0 R 2197 0 R]
->>
-endobj
-13 0 obj
-<< /Length 1864
->>
-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
+48.24 757.7159999999999 Td
/F1.0 10.5 Tf
[<31322e20426f6f74737472> 20.01953125 <617070696e6720535049>] TJ
ET
@@ -4122,7 +4224,7 @@ ET
0.200 0.200 0.200 SCN
BT
-159.30124999999992 794.6759999999999 Td
+159.30124999999992 757.7159999999999 Td
/F1.0 10.5 Tf
<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
@@ -4131,7 +4233,7 @@ ET
0.000 0.000 0.000 scn
BT
-528.07175 794.6759999999999 Td
+528.07175 757.7159999999999 Td
/F1.0 5.25 Tf
<ca> Tj
ET
@@ -4140,9 +4242,9 @@ ET
0.200 0.200 0.200 SCN
BT
-529.4314999999999 794.6759999999999 Td
+529.4314999999999 757.7159999999999 Td
/F1.0 10.5 Tf
-<313730> Tj
+<313732> Tj
ET
0.000 0.000 0.000 SCN
@@ -4151,7 +4253,7 @@ ET
0.200 0.200 0.200 SCN
BT
-60.24 776.1959999999999 Td
+60.24 739.2359999999999 Td
/F1.0 10.5 Tf
<31322e312e20> Tj
ET
@@ -4162,7 +4264,7 @@ ET
0.694 0.129 0.275 SCN
BT
-85.81800000000001 776.1959999999999 Td
+85.81800000000001 739.2359999999999 Td
/F3.0 10.5 Tf
<436c617373446973636f766572795365727669636532> Tj
ET
@@ -4173,7 +4275,7 @@ ET
0.200 0.200 0.200 SCN
BT
-202.05724999999995 776.1959999999999 Td
+202.05724999999995 739.2359999999999 Td
/F1.0 10.5 Tf
<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
ET
@@ -4182,7 +4284,7 @@ ET
0.000 0.000 0.000 scn
BT
-528.07175 776.1959999999999 Td
+528.07175 739.2359999999999 Td
/F1.0 5.25 Tf
<ca> Tj
ET
@@ -4191,9 +4293,9 @@ ET
0.200 0.200 0.200 SCN
BT
-529.4314999999999 776.1959999999999 Td
+529.4314999999999 739.2359999999999 Td
/F1.0 10.5 Tf
-<313730> Tj
+<313732> Tj
ET
0.000 0.000 0.000 SCN
@@ -4212,7 +4314,7 @@ endobj
/F3.0 43 0 R
>>
>>
-/Annots [2198 0 R 2199 0 R 2200 0 R 2201 0 R 2202 0 R]
+/Annots [2209 0 R 2210 0 R 2211 0 R 2212 0 R 2213 0 R 2214 0 R 2215 0 R 2216 0 R 2217 0 R 2218 0 R 2219 0 R 2220 0 R]
>>
endobj
15 0 obj
@@ -4819,7 +4921,7 @@ endobj
/Font << /F2.0 20 0 R
/F1.0 8 0 R
>>
-/XObject << /Stamp1 2203 0 R
+/XObject << /Stamp1 2221 0 R
>>
>>
/Annots [22 0 R 23 0 R 24 0 R 25 0 R 26 0 R 27 0 R 28 0 R 29 0 R 30 0 R 31 0 R 32 0 R 33 0 R 34 0 R 35 0 R 36 0 R]
@@ -4834,18 +4936,18 @@ endobj
>>
endobj
19 0 obj
-<< /Kids [1472 0 R 1473 0 R]
+<< /Kids [1478 0 R 1479 0 R]
>>
endobj
20 0 obj
<< /Type /Font
/BaseFont /AAAACA+NotoSerif-Bold
/Subtype /TrueType
-/FontDescriptor 2294 0 R
+/FontDescriptor 2314 0 R
/FirstChar 32
/LastChar 255
-/Widths 2296 0 R
-/ToUnicode 2295 0 R
+/Widths 2316 0 R
+/ToUnicode 2315 0 R
>>
endobj
21 0 obj
@@ -5412,7 +5514,7 @@ endobj
/F3.0 43 0 R
>>
/XObject << /I1 41 0 R
-/Stamp1 2203 0 R
+/Stamp1 2221 0 R
>>
>>
/Annots [42 0 R 44 0 R 45 0 R 46 0 R 47 0 R 48 0 R]
@@ -5553,11 +5655,11 @@ endobj
<< /Type /Font
/BaseFont /AAAACB+mplus1mn-regular
/Subtype /TrueType
-/FontDescriptor 2298 0 R
+/FontDescriptor 2318 0 R
/FirstChar 32
/LastChar 255
-/Widths 2300 0 R
-/ToUnicode 2299 0 R
+/Widths 2320 0 R
+/ToUnicode 2319 0 R
>>
endobj
44 0 obj
@@ -7555,7 +7657,7 @@ endobj
/F3.1 54 0 R
/F4.0 58 0 R
>>
-/XObject << /Stamp1 2203 0 R
+/XObject << /Stamp1 2221 0 R
>>
>>
/Annots [52 0 R 55 0 R 56 0 R 57 0 R 59 0 R]
@@ -7582,11 +7684,11 @@ endobj
<< /Type /Font
/BaseFont /AAAACC+mplus1mn-regular
/Subtype /TrueType
-/FontDescriptor 2302 0 R
+/FontDescriptor 2322 0 R
/FirstChar 32
/LastChar 255
-/Widths 2304 0 R
-/ToUnicode 2303 0 R
+/Widths 2324 0 R
+/ToUnicode 2323 0 R
>>
endobj
55 0 obj
@@ -7626,11 +7728,11 @@ endobj
<< /Type /Font
/BaseFont /AAAACD+mplus-1p-regular
/Subtype /TrueType
-/FontDescriptor 2306 0 R
+/FontDescriptor 2326 0 R
/FirstChar 32
/LastChar 255
-/Widths 2308 0 R
-/ToUnicode 2307 0 R
+/Widths 2328 0 R
+/ToUnicode 2327 0 R
>>
endobj
59 0 obj
@@ -8753,7 +8855,7 @@ endobj
/F5.1 64 0 R
/F3.1 54 0 R
>>
-/XObject << /Stamp1 2203 0 R
+/XObject << /Stamp1 2221 0 R
>>
>>
/Annots [63 0 R 65 0 R 66 0 R 67 0 R 68 0 R]
@@ -8777,11 +8879,11 @@ endobj
<< /Type /Font
/BaseFont /AAAACE+FontAwesome
/Subtype /TrueType
-/FontDescriptor 2310 0 R
+/FontDescriptor 2330 0 R
/FirstChar 32
/LastChar 255
-/Widths 2312 0 R
-/ToUnicode 2311 0 R
+/Widths 2332 0 R
+/ToUnicode 2331 0 R
>>
endobj
65 0 obj
@@ -10588,7 +10690,7 @@ endobj
/F6.0 71 0 R
/F2.0 20 0 R
>>
-/XObject << /Stamp1 2203 0 R
+/XObject << /Stamp1 2221 0 R
>>
>>
/Annots [73 0 R 74 0 R]
@@ -10598,11 +10700,11 @@ endobj
<< /Type /Font
/BaseFont /AAAACF+NotoSerif-Italic
/Subtype /TrueType
-/FontDescriptor 2314 0 R
+/FontDescriptor 2334 0 R
/FirstChar 32
/LastChar 255
-/Widths 2316 0 R
-/ToUnicode 2315 0 R
+/Widths 2336 0 R
+/ToUnicode 2335 0 R
>>
endobj
72 0 obj
@@ -12337,7 +12439,7 @@ endobj
/F4.0 58 0 R
/F5.1 64 0 R
>>
-/XObject << /Stamp1 2203 0 R
+/XObject << /Stamp1 2221 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]
@@ -12852,7 +12954,7 @@ endobj
/Font << /F1.0 8 0 R
/F3.0 43 0 R
>>
-/XObject << /Stamp1 2203 0 R
+/XObject << /Stamp1 2221 0 R
>>
>>
/Annots [106 0 R 107 0 R 108 0 R]
@@ -14144,7 +14246,7 @@ endobj
/F6.0 71 0 R
/F3.0 43 0 R
>>
-/XObject << /Stamp1 2203 0 R
+/XObject << /Stamp1 2221 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]
@@ -16422,7 +16524,7 @@ endobj
/F3.0 43 0 R
/F1.0 8 0 R
>>
-/XObject << /Stamp1 2203 0 R
+/XObject << /Stamp1 2221 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]
@@ -18466,7 +18568,7 @@ endobj
/F3.0 43 0 R
/F1.0 8 0 R
>>
-/XObject << /Stamp1 2203 0 R
+/XObject << /Stamp1 2221 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]
@@ -20498,7 +20600,7 @@ endobj
/F6.0 71 0 R
/F3.1 54 0 R
>>
-/XObject << /Stamp1 2203 0 R
+/XObject << /Stamp1 2221 0 R
>>
>>
/Annots [198 0 R 199 0 R 200 0 R 201 0 R 202 0 R 203 0 R 204 0 R 205 0 R 206 0 R 207 0 R 209 0 R 210 0 R 211 0 R 212 0 R]
@@ -21448,7 +21550,7 @@ endobj
/F3.0 43 0 R
/F2.0 20 0 R
>>
-/XObject << /Stamp1 2203 0 R
+/XObject << /Stamp1 2221 0 R
>>
>>
/Annots [216 0 R 217 0 R 219 0 R]
@@ -24374,7 +24476,7 @@ endobj
/F2.0 20 0 R
/F1.0 8 0 R
>>
-/XObject << /Stamp1 2203 0 R
+/XObject << /Stamp1 2221 0 R
>>
>>
/Annots [223 0 R 225 0 R 226 0 R 227 0 R 228 0 R 229 0 R]
@@ -25749,7 +25851,7 @@ endobj
/F6.0 71 0 R
/F4.0 58 0 R
>>
-/XObject << /Stamp1 2203 0 R
+/XObject << /Stamp1 2221 0 R
>>
>>
/Annots [235 0 R]
@@ -27636,7 +27738,7 @@ endobj
/F2.0 20 0 R
/F3.1 54 0 R
>>
-/XObject << /Stamp1 2203 0 R
+/XObject << /Stamp1 2221 0 R
>>
>>
/Annots [239 0 R 240 0 R 241 0 R 243 0 R 244 0 R 249 0 R 250 0 R]
@@ -27711,12 +27813,12 @@ endobj
endobj
247 0 obj
<< /Limits [(__rgsvc) (__rgsvc_intro_public-api)]
-/Names [(__rgsvc) 17 0 R (__rgsvc_application-layer-api_CommandContext_screencast) 641 0 R (__rgsvc_application-layer-api_InteractionContext_Related-Classes) 712 0 R (__rgsvc_core-domain-api_EventBusService_Configuration) 1122 0 R (__rgsvc_core-domain-api_EventBusService_api-and-implementation) 1078 0 R (__rgsvc_core-domain-api_EventBusService_event-hierarchy) 1101 0 R (__rgsvc_integration-api_JaxbService_api-and-implementation) 1310 0 R (__rgsvc_intro_commands-and-events) 72 0 R (__rgsvc_intro_overriding-the-services) 62 0 R (__rgsvc_intro_public-api) 51 0 R]
+/Names [(__rgsvc) 17 0 R (__rgsvc_application-layer-api_CommandContext_screencast) 648 0 R (__rgsvc_application-layer-api_InteractionContext_Related-Classes) 718 0 R (__rgsvc_core-domain-api_EventBusService_Configuration) 1128 0 R (__rgsvc_core-domain-api_EventBusService_api-and-implementation) 1084 0 R (__rgsvc_core-domain-api_EventBusService_event-hierarchy) 1107 0 R (__rgsvc_integration-api_JaxbService_api-and-implementation) 1316 0 R (__rgsvc_intro_commands-and-events) 72 0 R (__rgsvc_intro_overriding-the-services) 62 0 R (__rgsvc_intro_public-api) 51 0 R]
>>
endobj
248 0 obj
-<< /Limits [(_rgsvc_presentation-layer-spi_ErrorReportingService) (alternative-implementations)]
-/Names [(_rgsvc_presentation-layer-spi_ErrorReportingService) 245 0 R (_rgsvc_presentation-layer-spi_ExceptionRecognizer) 263 0 R (_rgsvc_presentation-layer-spi_GridLoaderService) 276 0 R (_rgsvc_presentation-layer-spi_GridService) 292 0 R (_rgsvc_presentation-layer-spi_GridSystemService) 322 0 R (_rgsvc_presentation-layer-spi_HintStore) 345 0 R (_rgsvc_presentation-layer-spi_LocaleProvider) 363 0 R (_rgsvc_presentation-layer-spi_RoutingService) 381 0 R (_rgsvc_presentation-layer-spi_TableColumnOrderService) 397 0 R (_rgsvc_presentation-layer-spi_TranslationService) 406 0 R (_rgsvc_presentation-layer-spi_TranslationsResolver) 422 0 R (_rgsvc_presentation-layer-spi_UrlEncodingService) 437 0 R (_rgsvc_presentation-layer-spi_UserProfileService) 447 0 R (_rgsvc_testing) 1495 0 R (_rgsvc_testing_ExecutionParametersService) 1
<TRUNCATED>
[06/10] isis-site git commit: ISIS-1521: docs
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/8b42f65e/content/guides/rgsvc/rgsvc.html
----------------------------------------------------------------------
diff --git a/content/guides/rgsvc/rgsvc.html b/content/guides/rgsvc/rgsvc.html
index 3f1c568..ce44354 100644
--- a/content/guides/rgsvc/rgsvc.html
+++ b/content/guides/rgsvc/rgsvc.html
@@ -1939,7 +1939,63 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect2">
- <h3 id="_rgsvc_presentation-layer-spi_TableColumnOrderService">3.11. <code>TableColumnOrderService</code></h3>
+ <h3 id="_rgsvc_presentation-layer-spi_SessionLoggingService">3.11. <code>SessionLoggingService</code></h3>
+ <div class="btn-group" style="float: right; font-size: small; padding: 6px; margin-top: -55px; ">
+ <button type="button" class="btn btn-xs btn-default" onclick="window.location.href="https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_presentation-layer-spi_SessionLoggingService.adoc""><i class="fa fa-pencil-square-o"></i> Edit</button>
+ <button type="button" class="btn btn-xs btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><span class="caret"></span><span class="sr-only">Toggle Dropdown</span></button>
+ <ul class="dropdown-menu">
+ <li><a href="https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_presentation-layer-spi_SessionLoggingService.adoc" target="_blank"><i class="fa fa-pencil-square-o fa-fw" aria-hidden="true"></i> Edit</a></li>
+ <li><a href="https://github.com/apache/isis/commits/master/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_presentation-layer-spi_SessionLoggingService.adoc" target="_blank"><i class="fa fa-clock-o fa-fw" aria-hidden="true"></i> History</a></li>
+ <li><a href="https://github.com/apache/isis/raw/master/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_presentation-layer-spi_SessionLoggingService.adoc" target="_blank"><i class="fa fa-file-text-o fa-fw" aria-hidden="true"></i> Raw</a></li>
+ <li><a href="https://github.com/apache/isis/blame/master/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_presentation-layer-spi_SessionLoggingService.adoc" target="_blank"><i class="fa fa-hand-o-right fa-fw" aria-hidden="true"></i> Blame</a></li>
+ </ul>
+ </div>
+ <div class="paragraph">
+ <p>The <code>SessionLoggingService</code> defines an SPI to keep track of (typically: to log) the current sessions that are using the application.</p>
+ </div>
+ <div class="sect3">
+ <h4 id="_spi_11">3.11.1. SPI</h4>
+ <div class="paragraph">
+ <p>The SPI defined by this 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">SessionLoggingService</span> {
+ <span class="directive">public</span> <span class="type">enum</span> <span class="predefined-type">Type</span> { LOGIN, LOGOUT }
+ <span class="directive">public</span> <span class="type">enum</span> CausedBy { USER, SESSION_EXPIRATION, RESTART }
+
+ <span class="type">void</span> log(
+ <span class="predefined-type">Type</span> type,
+ <span class="predefined-type">String</span> username,
+ <span class="predefined-type">Date</span> date,
+ CausedBy causedBy,
+ <span class="predefined-type">String</span> sessionId); <i class="conum" data-value="1"></i><b>(1)</b>
+}</code></pre>
+ </div>
+ </div>
+ <div class="colist arabic">
+ <table>
+ <tbody>
+ <tr>
+ <td><i class="conum" data-value="1"></i><b>1</b></td>
+ <td>an internal identifier (the JVM hashCode of the Wicket session).</td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ </div>
+ <div class="sect3">
+ <h4 id="_implementations_2">3.11.2. Implementations</h4>
+ <div class="paragraph">
+ <p>The framework provides an implementation, <code>SessionLoggingService.Stderr</code> that just prints out to standard error. This is not registered by default, but can be easily registered manually (in <code>1.15.0-SNAPSHOT</code>) using <code>AppManifestAbstract.Builder#withAdditionalServices(…)</code>.</p>
+ </div>
+ <div class="paragraph">
+ <p>The (non-ASF) <a href="http://github.com/isisaddons/isis-module-sessionlogger">Sessionlogger module</a> provides an implementation that logs each session as a JDO entity.</p>
+ </div>
+ </div>
+ </div>
+ <div class="sect2">
+ <h3 id="_rgsvc_presentation-layer-spi_TableColumnOrderService">3.12. <code>TableColumnOrderService</code></h3>
<div class="btn-group" style="float: right; font-size: small; padding: 6px; margin-top: -55px; ">
<button type="button" class="btn btn-xs btn-default" onclick="window.location.href="https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_presentation-layer-spi_TableColumnOrderService.adoc""><i class="fa fa-pencil-square-o"></i> Edit</button>
<button type="button" class="btn btn-xs btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><span class="caret"></span><span class="sr-only">Toggle Dropdown</span></button>
@@ -1954,7 +2010,7 @@ table.CodeRay td.code>pre{padding:0}
<p>The <code>TableColumnOrderService</code> provides the ability to reorder (or suppress) columns in both parented- and standalone tables.</p>
</div>
<div class="sect3">
- <h4 id="_spi_11">3.11.1. SPI</h4>
+ <h4 id="_spi_12">3.12.1. SPI</h4>
<div class="paragraph">
<p>The SPI defined by this service is:</p>
</div>
@@ -1991,20 +2047,20 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect3">
- <h4 id="_implementation_10">3.11.2. Implementation</h4>
+ <h4 id="_implementation_10">3.12.2. Implementation</h4>
<div class="paragraph">
<p>The framework provides a fallback implementation of this service, namely <code>TableColumnOrderService.Default</code>.</p>
</div>
</div>
<div class="sect3">
- <h4 id="_registering_the_services_8">3.11.3. Registering the Services</h4>
+ <h4 id="_registering_the_services_8">3.12.3. Registering the Services</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/rgcms.html#_rgcms_classes_AppManifest-bootstrapping">bootstrap the app</a>), then the default implementation of <code>TableColumnOrderService</code> is automatically registered and injected, and no further configuration is required.</p>
</div>
</div>
</div>
<div class="sect2">
- <h3 id="_rgsvc_presentation-layer-spi_TranslationService">3.12. <code>TranslationService</code></h3>
+ <h3 id="_rgsvc_presentation-layer-spi_TranslationService">3.13. <code>TranslationService</code></h3>
<div class="btn-group" style="float: right; font-size: small; padding: 6px; margin-top: -55px; ">
<button type="button" class="btn btn-xs btn-default" onclick="window.location.href="https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_presentation-layer-spi_TranslationService.adoc""><i class="fa fa-pencil-square-o"></i> Edit</button>
<button type="button" class="btn btn-xs btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><span class="caret"></span><span class="sr-only">Toggle Dropdown</span></button>
@@ -2032,7 +2088,7 @@ table.CodeRay td.code>pre{padding:0}
</table>
</div>
<div class="sect3">
- <h4 id="_spi_12">3.12.1. SPI</h4>
+ <h4 id="_spi_13">3.13.1. SPI</h4>
<div class="paragraph">
<p>The SPI defined by this service is:</p>
</div>
@@ -2078,7 +2134,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect3">
- <h4 id="_implementation_11">3.12.2. Implementation</h4>
+ <h4 id="_implementation_11">3.13.2. Implementation</h4>
<div class="paragraph">
<p>The Apache Isis framework provides a default implementation (<code>TranslationServicePo</code>) that uses the GNU <code>.pot</code> and <code>.po</code> files for translations. It relies on the <code>LocaleProvider</code> service (to return the <code>Locale</code> of the current user) and also the <code>TranslationsResolver</code> service (to read existing translations).</p>
</div>
@@ -2090,7 +2146,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect3">
- <h4 id="_registering_the_services_9">3.12.3. Registering the Services</h4>
+ <h4 id="_registering_the_services_9">3.13.3. Registering the Services</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/rgcms.html#_rgcms_classes_AppManifest-bootstrapping">bootstrap the app</a>) then Apache Isis' core implementation of <code>TranslationService</code> service (along with the supporting menu service) are automatically registered and injected (it is annotated with <code>@DomainService</code>) so no further configuration is required.</p>
</div>
@@ -2102,20 +2158,20 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect3">
- <h4 id="__rgsvc_metadata-api_LayoutService_related-mixins-and-menus">3.12.4. Related Menus</h4>
+ <h4 id="__rgsvc_metadata-api_LayoutService_related-mixins-and-menus">3.13.4. Related Menus</h4>
<div class="paragraph">
<p>The <code>TranslationServicePoMenu</code> menu exposes the <code>TranslationServicePo</code> service’s <code>toPot()</code> method so that all translations can be downloaded as a single file.</p>
</div>
</div>
<div class="sect3">
- <h4 id="_related_services_9">3.12.5. Related Services</h4>
+ <h4 id="_related_services_9">3.13.5. Related Services</h4>
<div class="paragraph">
<p>This service works in conjunction with <a href="../rgsvc/rgsvc.html#_rgsvc_presentation-layer-spi_LocaleProvider"><code>LocaleProvider</code></a> and <a href="../rgsvc/rgsvc.html#_rgsvc_presentation-layer-spi_TranslationsResolver"><code>TranslationsResolver</code></a> in order to provide i18n support.</p>
</div>
</div>
</div>
<div class="sect2">
- <h3 id="_rgsvc_presentation-layer-spi_TranslationsResolver">3.13. <code>TranslationsResolver</code></h3>
+ <h3 id="_rgsvc_presentation-layer-spi_TranslationsResolver">3.14. <code>TranslationsResolver</code></h3>
<div class="btn-group" style="float: right; font-size: small; padding: 6px; margin-top: -55px; ">
<button type="button" class="btn btn-xs btn-default" onclick="window.location.href="https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_presentation-layer-spi_TranslationsResolver.adoc""><i class="fa fa-pencil-square-o"></i> Edit</button>
<button type="button" class="btn btn-xs btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><span class="caret"></span><span class="sr-only">Toggle Dropdown</span></button>
@@ -2146,7 +2202,7 @@ table.CodeRay td.code>pre{padding:0}
</table>
</div>
<div class="sect3">
- <h4 id="_spi_13">3.13.1. SPI</h4>
+ <h4 id="_spi_14">3.14.1. SPI</h4>
<div class="paragraph">
<p>The SPI defined by this service is:</p>
</div>
@@ -2160,7 +2216,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect3">
- <h4 id="_implementation_12">3.13.2. Implementation</h4>
+ <h4 id="_implementation_12">3.14.2. Implementation</h4>
<div class="paragraph">
<p>Isis' <a href="../ugvw/ugvw.html">Wicket viewer</a> provides an implementation of this service (<code>TranslationsResolverWicket</code>) which leverages Apache Wicket APIs. This searches for translation files in the standard <code>WEB-INF/</code> directory.</p>
</div>
@@ -2179,7 +2235,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect3">
- <h4 id="_registering_the_service_3">3.13.3. Registering the Service</h4>
+ <h4 id="_registering_the_service_3">3.14.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/rgcms.html#<em>rgcms_classes_AppManifest-bootstrapping">bootstrap the app</a>), _and that the <a href="../ugvw/ugvw.html">Wicket viewer</a> is being used, then an implementation of <code>TranslationsResolver</code> is automatically registered and injected (it is annotated with <code>@DomainService</code>) so no further configuration is required.</p>
</div>
@@ -2188,14 +2244,14 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect3">
- <h4 id="_related_services_10">3.13.4. Related Services</h4>
+ <h4 id="_related_services_10">3.14.4. Related Services</h4>
<div class="paragraph">
<p>This service works in conjunction with <a href="../rgsvc/rgsvc.html#_rgsvc_presentation-layer-spi_LocaleProvider"><code>LocaleProvider</code></a> and <a href="../rgsvc/rgsvc.html#_rgsvc_presentation-layer-spi_TranslationService"><code>TranslationService</code></a> in order to provide i18n support.</p>
</div>
</div>
</div>
<div class="sect2">
- <h3 id="_rgsvc_presentation-layer-spi_UrlEncodingService">3.14. <code>UrlEncodingService</code></h3>
+ <h3 id="_rgsvc_presentation-layer-spi_UrlEncodingService">3.15. <code>UrlEncodingService</code></h3>
<div class="btn-group" style="float: right; font-size: small; padding: 6px; margin-top: -55px; ">
<button type="button" class="btn btn-xs btn-default" onclick="window.location.href="https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_presentation-layer-spi_UrlEncodingService.adoc""><i class="fa fa-pencil-square-o"></i> Edit</button>
<button type="button" class="btn btn-xs btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><span class="caret"></span><span class="sr-only">Toggle Dropdown</span></button>
@@ -2225,7 +2281,7 @@ table.CodeRay td.code>pre{padding:0}
<p>The framework provides a default implementation of this service, <code>UrlEncodingServiceUsingBaseEncoding</code> (also in the applib) that uses <code>base-64</code> encoding to <code>UTF-8</code> charset.</p>
</div>
<div class="sect3">
- <h4 id="_spi_14">3.14.1. SPI</h4>
+ <h4 id="_spi_15">3.15.1. SPI</h4>
<div class="paragraph">
<p>The SPI defined by the service is:</p>
</div>
@@ -2255,7 +2311,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect3">
- <h4 id="_implementation_13">3.14.2. Implementation</h4>
+ <h4 id="_implementation_13">3.15.2. Implementation</h4>
<div class="paragraph">
<p>The framework provides a default implementation (<code>UrlEncodingServiceUsingBaseEncoding</code>) that simply converts the string using base-64 encoding and UTF-8 character set. As already noted, be aware that the maximum length of a URL should not exceed 2083 characters. For large view models, there’s the possibility that this limit could be exceeded; in such cases register an alternative implementation of this service.</p>
</div>
@@ -2265,7 +2321,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect2">
- <h3 id="_rgsvc_presentation-layer-spi_UserProfileService">3.15. <code>UserProfileService</code></h3>
+ <h3 id="_rgsvc_presentation-layer-spi_UserProfileService">3.16. <code>UserProfileService</code></h3>
<div class="btn-group" style="float: right; font-size: small; padding: 6px; margin-top: -55px; ">
<button type="button" class="btn btn-xs btn-default" onclick="window.location.href="https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_presentation-layer-spi_UserProfileService.adoc""><i class="fa fa-pencil-square-o"></i> Edit</button>
<button type="button" class="btn btn-xs btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><span class="caret"></span><span class="sr-only">Toggle Dropdown</span></button>
@@ -2283,7 +2339,7 @@ table.CodeRay td.code>pre{padding:0}
<p>Another use case is to allow the user to switch context in some fashion or other. This might be to emulate a sort of "sudo"-like function, or perhaps to focus on some particular set of data.</p>
</div>
<div class="sect3">
- <h4 id="_spi_15">3.15.1. SPI</h4>
+ <h4 id="_spi_16">3.16.1. SPI</h4>
<div class="paragraph">
<p>The SPI defined by the service is:</p>
</div>
@@ -2313,7 +2369,7 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
<div class="sect3">
- <h4 id="_implementation_14">3.15.2. Implementation</h4>
+ <h4 id="_implementation_14">3.16.2. Implementation</h4>
<div class="paragraph">
<p>There is no default implementation of this service provided by the core Apache Isis framework.</p>
</div>
@@ -4529,7 +4585,7 @@ org.quartz.plugin.jobInitializer.failOnFileNotFound = true</code></pre>
<p>The persisting of commands is only half the story; there needs to be a separate process to read the commands and execute them. The abstract <a href="../rgsvc/rgsvc.html#_rgsvc_application-layer-api_BackgroundService_BackgroundCommandExecution"><code>BackgroundCommandExecution</code></a> provides a mechanism to execute such commands. This can be considered an API, albeit "internal" because the implementation relies on internals of the framework.</p>
</div>
<div class="sect3">
- <h4 id="_spi_16">5.1.1. SPI</h4>
+ <h4 id="_spi_17">5.1.1. SPI</h4>
<div class="paragraph">
<p>The SPI of the <code>BackgroundCommandService</code> is:</p>
</div>
@@ -4724,7 +4780,7 @@ org.quartz.plugin.jobInitializer.failOnFileNotFound = true</code></pre>
</div>
</div>
<div class="sect3">
- <h4 id="_spi_17">5.2.2. SPI</h4>
+ <h4 id="_spi_18">5.2.2. SPI</h4>
<div class="paragraph">
<p>The <code>CommandService</code> service defines the following very simple API:</p>
</div>
@@ -7185,7 +7241,7 @@ Scratchpad scratchpad;</code></pre>
</div>
</div>
<div class="sect3">
- <h4 id="_implementations_2">7.2.3. Implementations</h4>
+ <h4 id="_implementations_3">7.2.3. Implementations</h4>
<div class="paragraph">
<p>The Wicket viewer core framework provides a default implementation of this API:</p>
</div>
@@ -8856,7 +8912,7 @@ repositoryService.persist(cust);</code></pre>
</table>
</div>
<div class="sect3">
- <h4 id="_spi_18">9.3.1. SPI</h4>
+ <h4 id="_spi_19">9.3.1. SPI</h4>
<div class="paragraph">
<p>The SPI defined by the service is:</p>
</div>
@@ -9034,7 +9090,7 @@ repositoryService.persist(cust);</code></pre>
</div>
</div>
<div class="sect3">
- <h4 id="_spi_19">9.4.4. SPI</h4>
+ <h4 id="_spi_20">9.4.4. SPI</h4>
<div class="paragraph">
<p>The <code>SudoService.Spi</code> service allows implementations of <code>SudoService</code> to notify other services/components that the effective user and roles are different. The default implementation of <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_UserService"><code>UserService</code></a> has been refactored to leverage this SPI.</p>
</div>
@@ -9238,7 +9294,57 @@ repositoryService.persist(cust);</code></pre>
</ul>
</div>
<div class="sect2">
- <h3 id="_rgsvc_persistence-layer-api_IsisJdoSupport">10.1. <code>IsisJdoSupport</code></h3>
+ <h3 id="_rgsvc_persistence-layer-api_HsqlDbManagerMenu">10.1. <code>HsqlDbManagerMenu</code></h3>
+ <div class="btn-group" style="float: right; font-size: small; padding: 6px; margin-top: -55px; ">
+ <button type="button" class="btn btn-xs btn-default" onclick="window.location.href="https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_persistence-layer-api_HsqlDbManagerMenu.adoc""><i class="fa fa-pencil-square-o"></i> Edit</button>
+ <button type="button" class="btn btn-xs btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><span class="caret"></span><span class="sr-only">Toggle Dropdown</span></button>
+ <ul class="dropdown-menu">
+ <li><a href="https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_persistence-layer-api_HsqlDbManagerMenu.adoc" target="_blank"><i class="fa fa-pencil-square-o fa-fw" aria-hidden="true"></i> Edit</a></li>
+ <li><a href="https://github.com/apache/isis/commits/master/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_persistence-layer-api_HsqlDbManagerMenu.adoc" target="_blank"><i class="fa fa-clock-o fa-fw" aria-hidden="true"></i> History</a></li>
+ <li><a href="https://github.com/apache/isis/raw/master/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_persistence-layer-api_HsqlDbManagerMenu.adoc" target="_blank"><i class="fa fa-file-text-o fa-fw" aria-hidden="true"></i> Raw</a></li>
+ <li><a href="https://github.com/apache/isis/blame/master/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_persistence-layer-api_HsqlDbManagerMenu.adoc" target="_blank"><i class="fa fa-hand-o-right fa-fw" aria-hidden="true"></i> Blame</a></li>
+ </ul>
+ </div>
+ <div class="paragraph">
+ <p>The <code>HsqlDbManagerMenu</code> provides a single menu item to open up the HSQLDB manager. This is only enabled for prototyping, and if HSQLDB is detected in the underlying JDBC URL. The menu appears under the "Prototyping" menu.</p>
+ </div>
+ <div class="sect3">
+ <h4 id="_api_implementation_16">10.1.1. API & Implementation</h4>
+ <div class="paragraph">
+ <p>The API 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">class</span> <span class="class">HsqlDbManagerMenu</span> {
+ <span class="directive">public</span> <span class="type">void</span> hsqlDbManager() { ... }
+}</code></pre>
+ </div>
+ </div>
+ <div class="paragraph">
+ <p>Note that this launches the manager on the same host that the webapp runs, and so is only appropriate to use when running on <code>localhost</code>.</p>
+ </div>
+ </div>
+ <div class="sect3">
+ <h4 id="_disabling_hiding_the_menu">10.1.2. Disabling/hiding the menu</h4>
+ <div class="paragraph">
+ <p>The menu can be hidden or disabled by subscribing to its domain event, eg:</p>
+ </div>
+ <div class="listingblock">
+ <div class="content">
+ <pre class="CodeRay highlight"><code data-lang="java"><span class="annotation">@DomainService</span>(nature=DOMAIN)
+<span class="directive">public</span> <span class="type">void</span> HideHsqlDbManagerMenu <span class="directive">extends</span> AbstractSubscriber {
+
+ <span class="annotation">@EventHandler</span> <span class="annotation">@Subscribe</span>
+ <span class="directive">public</span> <span class="type">void</span> on(HsqlDbManagerMenu.ActionDomainEvent ev) {
+ ev.hide();
+ }
+}</code></pre>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="sect2">
+ <h3 id="_rgsvc_persistence-layer-api_IsisJdoSupport">10.2. <code>IsisJdoSupport</code></h3>
<div class="btn-group" style="float: right; font-size: small; padding: 6px; margin-top: -55px; ">
<button type="button" class="btn btn-xs btn-default" onclick="window.location.href="https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_persistence-layer-api_IsisJdoSupport.adoc""><i class="fa fa-pencil-square-o"></i> Edit</button>
<button type="button" class="btn btn-xs btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><span class="caret"></span><span class="sr-only">Toggle Dropdown</span></button>
@@ -9256,7 +9362,7 @@ repositoryService.persist(cust);</code></pre>
<p>The following sections discuss the functionality provided by the service, broken out into categories.</p>
</div>
<div class="sect3">
- <h4 id="__rgsvc_persistence-layer-api_IsisJdoSupport_executing-sql">10.1.1. Executing SQL</h4>
+ <h4 id="__rgsvc_persistence-layer-api_IsisJdoSupport_executing-sql">10.2.1. Executing SQL</h4>
<div class="paragraph">
<p>You can use the <code>IsisJdoSupportService</code> to perform arbitrary SQL SELECTs or UPDATEs:</p>
</div>
@@ -9308,12 +9414,12 @@ repositoryService.persist(cust);</code></pre>
</div>
</div>
<div class="sect3">
- <h4 id="__rgsvc_persistence-layer-api_IsisJdoSupport_type-safe-jdoql-queries">10.1.2. Type-safe JDOQL Queries</h4>
+ <h4 id="__rgsvc_persistence-layer-api_IsisJdoSupport_type-safe-jdoql-queries">10.2.2. Type-safe JDOQL Queries</h4>
<div class="paragraph">
<p>DataNucleus provides an <a href="http://www.datanucleus.org/products/accessplatform_4_0/jdo/jdoql_typesafe.html">extension to JDO</a>, so that JDOQL queries can be built up and executed using a set of type-safe classes.</p>
</div>
<div class="paragraph">
- <p>The types in question for type safe queries are not the domain entities, but rather are companion "Q…" query classes. These classes are generated dynamically by an <a href="https://www.jcp.org/en/jsr/detail?id=269">annotation processor</a> as a side-effect of compilation, one "Q…" class for each of the <a href="../rgant/rgant.html#_rgant-PersistenceCapable"><code>@PersistenceCapable</code></a> domain entity in your application. For example, a <code>ToDoItem</code> domain entity will give rise to a <code>QToDoItem</code> query class. These "Q…" classes mirror the structure of domain entity, but expose properties that allow predicates to be built up for querying instances, as well as other functions in support of order by. group by and other clauses.</p>
+ <p>The types in question for type safe queries are not the domain entities, but rather are companion "Q…" query classes. These classes are generated dynamically by an <a href="https://www.jcp.org/en/jsr/detail?id=269">annotation processor</a> as a side-effect of compilation, one "Q…" class for each of the <a href="../rgant/rgant.html#_rgant-PersistenceCapable"><code>@PersistenceCapable</code></a> domain entity in your application. For example, a <code>ToDoItem</code> domain entity will give rise to a <code>QToDoItem</code> query class. These "Q…" classes mirror the structure of domain entity, but expose properties that allow predicates to be built up for querying instances, as well as other functions in support of order by, group by and other clauses.</p>
</div>
<div class="admonitionblock note">
<table>
@@ -9337,6 +9443,8 @@ repositoryService.persist(cust);</code></pre>
<span class="annotation">@Programmatic</span>
<T> <span class="predefined-type">List</span><T> executeQuery(<span class="directive">final</span> <span class="predefined-type">Class</span><T> cls, <span class="directive">final</span> BooleanExpression be);
<span class="annotation">@Programmatic</span>
+ <T> T executeQueryUnique(<span class="directive">final</span> <span class="predefined-type">Class</span><T> cls, <span class="directive">final</span> BooleanExpression be);
+ <span class="annotation">@Programmatic</span>
<T> TypesafeQuery<T> newTypesafeQuery(<span class="predefined-type">Class</span><T> cls);
...
}</code></pre>
@@ -9383,6 +9491,9 @@ repositoryService.persist(cust);</code></pre>
</table>
</div>
<div class="paragraph">
+ <p>The <code>executeUniqueQuery(…)</code> method (<code>1.15.0-SNAPSHOT</code>) is similar to <code>executeQuery(…)</code>, however expects the query to return at most a single object, which it returns (or <code>null</code> if none).</p>
+ </div>
+ <div class="paragraph">
<p>The <code>newTypesafeQuery(…)</code> method is a lower-level API that allows a type safe query to be instantiated for most sophisticated querying, eg using group by or order by clauses. See the DataNucleus <a href="http://www.datanucleus.org/products/accessplatform_4_0/jdo/jdoql_typesafe.html">documentation</a> for full details of using this.</p>
</div>
<div class="paragraph">
@@ -9400,7 +9511,7 @@ repositoryService.persist(cust);</code></pre>
</div>
</div>
<div class="sect3">
- <h4 id="__rgsvc_persistence-layer-api_IsisJdoSupport_fixture-support">10.1.3. Fixture support</h4>
+ <h4 id="__rgsvc_persistence-layer-api_IsisJdoSupport_fixture-support">10.2.3. Fixture support</h4>
<div class="paragraph">
<p>When writing <a href="../ugtst/ugtst.html#_ugtst_integ-test-support">integration tests</a> you’ll usually need to tear down some/all mutable transactional data before each test. One way to do that is to use the <code>executeUpdate(…)</code> method described <a href="../rgsvc/rgsvc.html#__rgsvc_persistence-layer-api_IsisJdoSupport_executing-sql">above</a>.</p>
</div>
@@ -9448,7 +9559,7 @@ repositoryService.persist(cust);</code></pre>
</div>
</div>
<div class="sect3">
- <h4 id="__rgsvc_persistence-layer-api_IsisJdoSupport_reloading-entities">10.1.4. Reloading entities</h4>
+ <h4 id="__rgsvc_persistence-layer-api_IsisJdoSupport_reloading-entities">10.2.4. Reloading entities</h4>
<div class="paragraph">
<p>An <a href="http://www.datanucleus.org:15080/products/accessplatform_5_0/jdo/mapping.html#one_many_relations">(intentional) limitation</a> of JDO/DataNucleus is that persisting a child entity (in a 1:n bidirectional relationship) does not cause the parent’s collection to be updated.</p>
</div>
@@ -9520,7 +9631,7 @@ repositoryService.persist(cust);</code></pre>
</div>
</div>
<div class="sect3">
- <h4 id="__rgsvc_persistence-layer-api_IsisJdoSupport_jdo-persistencemanager">10.1.5. JDO <code>PersistenceManager</code></h4>
+ <h4 id="__rgsvc_persistence-layer-api_IsisJdoSupport_jdo-persistencemanager">10.2.5. JDO <code>PersistenceManager</code></h4>
<div class="paragraph">
<p>The functionality provided by <code>IsisJdoSupport</code> focus only on the most common use cases. If you require more flexibility than this, eg for dynamically constructed queries, then you can use the service to access the underlying JDO <code>PersistenceManager</code> API:</p>
</div>
@@ -9549,7 +9660,7 @@ repositoryService.persist(cust);</code></pre>
</div>
</div>
<div class="sect3">
- <h4 id="_registering_the_services_18">10.1.6. Registering the Services</h4>
+ <h4 id="_registering_the_services_18">10.2.6. Registering the Services</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/rgcms.html#_rgcms_classes_AppManifest-bootstrapping">bootstrap the app</a>) then Apache Isis' core implementation of <code>IsisJdoSupport</code> service is automatically registered and injected (it is annotated with <code>@DomainService</code>) so no further configuration is required.</p>
</div>
@@ -9559,7 +9670,7 @@ repositoryService.persist(cust);</code></pre>
</div>
</div>
<div class="sect2">
- <h3 id="_rgsvc_persistence-layer-api_MetricsService">10.2. <code>MetricsService</code></h3>
+ <h3 id="_rgsvc_persistence-layer-api_MetricsService">10.3. <code>MetricsService</code></h3>
<div class="btn-group" style="float: right; font-size: small; padding: 6px; margin-top: -55px; ">
<button type="button" class="btn btn-xs btn-default" onclick="window.location.href="https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_persistence-layer-api_MetricsService.adoc""><i class="fa fa-pencil-square-o"></i> Edit</button>
<button type="button" class="btn btn-xs btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><span class="caret"></span><span class="sr-only">Toggle Dropdown</span></button>
@@ -9577,7 +9688,7 @@ repositoryService.persist(cust);</code></pre>
<p>The service is used by the <a href="../rgsvc/rgsvc.html#_rgsvc_application-layer-api_InteractionContext"><code>InteractionContext</code></a> domain service (to populate the DTO held by the <code>Interaction.Execution</code>) and also by the (internal) <a href="../rgfis/rgfis.html#_rgfis_persistence-layer_PublishingServiceInternal"><code>PublishingServiceInternal</code></a> domain service (to populate the <code>PublishedObjects</code> class.</p>
</div>
<div class="sect3">
- <h4 id="_api_implementation_16">10.2.1. API & Implementation</h4>
+ <h4 id="_api_implementation_17">10.3.1. API & Implementation</h4>
<div class="paragraph">
<p>The API of the service is:</p>
</div>
@@ -9614,20 +9725,20 @@ repositoryService.persist(cust);</code></pre>
</div>
</div>
<div class="sect3">
- <h4 id="_registering_the_service_28">10.2.2. Registering the Service</h4>
+ <h4 id="_registering_the_service_28">10.3.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/rgcms.html#_rgcms_classes_AppManifest-bootstrapping">bootstrap the app</a>) then Apache Isis' default implementation of <code>MetricsService</code> class is automatically registered (it is annotated with <code>@DomainService</code>) so no further configuration is required.</p>
</div>
</div>
<div class="sect3">
- <h4 id="_related_services_26">10.2.3. Related Services</h4>
+ <h4 id="_related_services_26">10.3.3. Related Services</h4>
<div class="paragraph">
<p>The <a href="../rgsvc/rgsvc.html#_rgsvc_persistence-layer-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>
</div>
</div>
</div>
<div class="sect2">
- <h3 id="_rgsvc_persistence-layer-api_QueryResultsCache">10.3. <code>QueryResultsCache</code></h3>
+ <h3 id="_rgsvc_persistence-layer-api_QueryResultsCache">10.4. <code>QueryResultsCache</code></h3>
<div class="btn-group" style="float: right; font-size: small; padding: 6px; margin-top: -55px; ">
<button type="button" class="btn btn-xs btn-default" onclick="window.location.href="https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_persistence-layer-api_QueryResultsCache.adoc""><i class="fa fa-pencil-square-o"></i> Edit</button>
<button type="button" class="btn btn-xs btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><span class="caret"></span><span class="sr-only">Toggle Dropdown</span></button>
@@ -9658,7 +9769,7 @@ repositoryService.persist(cust);</code></pre>
</table>
</div>
<div class="sect3">
- <h4 id="_api_implementation_17">10.3.1. API & Implementation</h4>
+ <h4 id="_api_implementation_18">10.4.1. API & Implementation</h4>
<div class="paragraph">
<p>The API defined by <code>QueryResultsCache</code> is:</p>
</div>
@@ -9700,7 +9811,7 @@ repositoryService.persist(cust);</code></pre>
</div>
</div>
<div class="sect3">
- <h4 id="_usage_15">10.3.2. Usage</h4>
+ <h4 id="_usage_15">10.4.2. Usage</h4>
<div class="paragraph">
<p>Suppose that there’s a <code>TaxService</code> that calculates tax on <code>Taxable</code> items, with respect to some <code>TaxType</code>, and for a given <code>LocalDate</code>. To calculate tax it must run a database query and then perform some additional calculations.</p>
</div>
@@ -9763,7 +9874,7 @@ repositoryService.persist(cust);</code></pre>
</div>
</div>
<div class="sect3">
- <h4 id="_registering_the_service_29">10.3.3. Registering the Service</h4>
+ <h4 id="_registering_the_service_29">10.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/rgcms.html#_rgcms_classes_AppManifest-bootstrapping">bootstrap the app</a>) then Apache Isis' core implementation of <code>QueryResultsCache</code> service is automatically registered and injected (it is annotated with <code>@DomainService</code>) so no further configuration is required.</p>
</div>
@@ -9772,14 +9883,14 @@ repositoryService.persist(cust);</code></pre>
</div>
</div>
<div class="sect3">
- <h4 id="_related_services_27">10.3.4. Related Services</h4>
+ <h4 id="_related_services_27">10.4.4. Related Services</h4>
<div class="paragraph">
<p>The <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-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/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>
</div>
</div>
<div class="sect2">
- <h3 id="_rgsvc_persistence-layer-api_RepositoryService">10.4. <code>RepositoryService</code></h3>
+ <h3 id="_rgsvc_persistence-layer-api_RepositoryService">10.5. <code>RepositoryService</code></h3>
<div class="btn-group" style="float: right; font-size: small; padding: 6px; margin-top: -55px; ">
<button type="button" class="btn btn-xs btn-default" onclick="window.location.href="https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_persistence-layer-api_RepositoryService.adoc""><i class="fa fa-pencil-square-o"></i> Edit</button>
<button type="button" class="btn btn-xs btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><span class="caret"></span><span class="sr-only">Toggle Dropdown</span></button>
@@ -9813,7 +9924,7 @@ repositoryService.persist(cust);</code></pre>
</table>
</div>
<div class="sect3">
- <h4 id="_api_10">10.4.1. API</h4>
+ <h4 id="_api_10">10.5.1. API</h4>
<div class="paragraph">
<p>The API of <code>RepositoryService</code> is:</p>
</div>
@@ -9905,7 +10016,7 @@ repositoryService.persist(cust);</code></pre>
</div>
</div>
<div class="sect3">
- <h4 id="_usage_16">10.4.2. Usage</h4>
+ <h4 id="_usage_16">10.5.2. Usage</h4>
<div class="paragraph">
<p>This section briefly discusses how application code can use (some of) these APIs.</p>
</div>
@@ -10130,7 +10241,7 @@ repositoryService.persist(cust);</code></pre>
</div>
</div>
<div class="sect3">
- <h4 id="_implementation_30">10.4.3. Implementation</h4>
+ <h4 id="_implementation_30">10.5.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>
@@ -10161,7 +10272,7 @@ public static final String KEY_DISABLE_AUTOFLUSH = "isis.services.container.disa
</div>
</div>
<div class="sect3">
- <h4 id="_registering_the_service_30">10.4.4. Registering the Service</h4>
+ <h4 id="_registering_the_service_30">10.5.4. 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/rgcms.html#_rgcms_classes_AppManifest-bootstrapping">bootstrap the app</a>) then Apache Isis' core implementation of <code>RepositoryService</code> service is automatically registered and injected (it is annotated with <code>@DomainService</code>) so no further configuration is required.</p>
</div>
@@ -10170,7 +10281,7 @@ public static final String KEY_DISABLE_AUTOFLUSH = "isis.services.container.disa
</div>
</div>
<div class="sect3">
- <h4 id="_related_services_28">10.4.5. Related Services</h4>
+ <h4 id="_related_services_28">10.5.5. Related Services</h4>
<div class="paragraph">
<p>the <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_FactoryService"><code>FactoryService</code></a> is often used in conjunction with the <code>RepositoryService</code>, to instantiate domain objects before persisting.</p>
</div>
@@ -10327,7 +10438,7 @@ public static final String KEY_DISABLE_AUTOFLUSH = "isis.services.container.disa
</table>
</div>
<div class="sect3">
- <h4 id="_spi_20">11.1.1. SPI</h4>
+ <h4 id="_spi_21">11.1.1. SPI</h4>
<div class="paragraph">
<p>The SPI for the service is:</p>
</div>
@@ -10381,7 +10492,7 @@ public static final String KEY_DISABLE_AUTOFLUSH = "isis.services.container.disa
</div>
</div>
<div class="sect3">
- <h4 id="_implementations_3">11.1.2. Implementations</h4>
+ <h4 id="_implementations_4">11.1.2. Implementations</h4>
<div class="paragraph">
<p>The framework allows multiple implementations of this service to be registered; all will be called. The framework provides one implementation of its own, <code>AuditerServiceLogging</code> (in <code>o.a.i.applib.services.audit</code> package); this logs simple messages to an SLF4J logger.</p>
</div>
@@ -10484,7 +10595,7 @@ log4j.additivity.org.apache.isis.applib.services.audit.AuditerServiceLogging=fal
</table>
</div>
<div class="sect3">
- <h4 id="_spi_21">11.2.1. SPI</h4>
+ <h4 id="_spi_22">11.2.1. SPI</h4>
<div class="paragraph">
<p>The SPI for the service is:</p>
</div>
@@ -10581,7 +10692,7 @@ log4j.additivity.org.apache.isis.applib.services.audit.AuditerServiceLogging=fal
<p>See <a href="../rgsvc/rgsvc.html#_rgsvc_persistence-layer-spi_PublishingService"><code>PublishingService</code></a> for further discussion.</p>
</div>
<div class="sect3">
- <h4 id="_spi_22">11.3.1. SPI</h4>
+ <h4 id="_spi_23">11.3.1. SPI</h4>
<div class="paragraph">
<p>The SPI defined by this service is:</p>
</div>
@@ -10689,7 +10800,7 @@ log4j.additivity.org.apache.isis.applib.services.audit.AuditerServiceLogging=fal
<p>Only actions/properties/domain objects annotated for publishing (using <a href="../rgant/rgant.html#_rgant-Action_publishing"><code>@Action#publishing()</code></a>, <a href="../rgant/rgant.html#_rgant-Property_publishing"><code>@Property#publishing()</code></a> or <a href="../rgant/rgant.html#_rgant-DomainObject_publishing"><code>@DomainObject#publishing()</code></a>) are published.</p>
</div>
<div class="sect3">
- <h4 id="_spi_23">11.4.1. SPI</h4>
+ <h4 id="_spi_24">11.4.1. SPI</h4>
<div class="paragraph">
<p>The SPI defined by the service is:</p>
</div>
@@ -10765,7 +10876,7 @@ log4j.additivity.org.apache.isis.applib.services.audit.AuditerServiceLogging=fal
</div>
</div>
<div class="sect3">
- <h4 id="_implementations_4">11.4.2. Implementations</h4>
+ <h4 id="_implementations_5">11.4.2. Implementations</h4>
<div class="paragraph">
<p>The framework allows multiple implementations of this service to be registered; all will be called. The framework provides one implementation of its own, <code>PublisherServiceLogging</code> (in <code>o.a.i.applib.services.publish</code> package); this logs "deep" serializations to an SLF4J logger.</p>
</div>
@@ -10878,7 +10989,7 @@ log4j.additivity.org.apache.isis.applib.services.publish.PublisherServiceLogging
</table>
</div>
<div class="sect3">
- <h4 id="_spi_24">11.5.1. SPI</h4>
+ <h4 id="_spi_25">11.5.1. SPI</h4>
<div class="paragraph">
<p>The SPI defined by the service is:</p>
</div>
@@ -11125,7 +11236,7 @@ log4j.additivity.org.apache.isis.applib.services.publish.PublisherServiceLogging
</table>
</div>
<div class="sect3">
- <h4 id="_spi_25">11.6.1. SPI</h4>
+ <h4 id="_spi_26">11.6.1. SPI</h4>
<div class="paragraph">
<p>The SPI defined by the service is:</p>
</div>
@@ -11311,7 +11422,7 @@ log4j.additivity.org.apache.isis.applib.services.publish.PublisherServiceLogging
<p>This service is used by the <a href="../rgcms/rgcms.html#_rgcms_classes_super_FixtureScripts"><code>FixtureScripts</code></a> service to automatically locate any <a href="../rgcms/rgcms.html#_rgcms_classes_super_FixtureScript"><code>FixtureScript</code></a> implementations.</p>
</div>
<div class="sect3">
- <h4 id="_spi_26">12.1.1. SPI</h4>
+ <h4 id="_spi_27">12.1.1. SPI</h4>
<div class="paragraph">
<p>The SPI defined by the service is:</p>
</div>
[04/10] isis-site git commit: ISIS-1521: docs
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/8b42f65e/content/guides/ugtst/ugtst.html
----------------------------------------------------------------------
diff --git a/content/guides/ugtst/ugtst.html b/content/guides/ugtst/ugtst.html
index f9b23fc..0179ec7 100644
--- a/content/guides/ugtst/ugtst.html
+++ b/content/guides/ugtst/ugtst.html
@@ -1347,30 +1347,75 @@ CustomerRepository customers;</code></pre>
<p>Integration tests instantiate an Apache Isis "runtime" (as a singleton) within a JUnit test. Because (depending on the size of your app) it takes a little time to bootstrap Apache Isis, the framework caches the runtime on a thread-local from one test to the next.</p>
</div>
<div class="paragraph">
- <p>Nevertheless, we do need to bootstrap the runtime for the very first test.</p>
- </div>
- <div class="paragraph">
- <p>As of 1.9.0 the bootstrapping of integration tests and webapps has been simplified through the <a href="../rgcms/rgcms.html#_rgcms_classes_AppManifest-bootstrapping"><code>AppManifest</code></a> class. Since this isn’t mandatory, for now we present both techniques.</p>
+ <p>Newer releases of the framework reduce the amount of boilerplate to do this; this guide documents multiple versions.</p>
</div>
<div class="paragraph">
<p>The example code in this section is taken from the app generated by the <a href="../ugfun/ugfun.html#_ugfun_getting-started_simpleapp-archetype">SimpleApp archetype</a>.</p>
</div>
<div class="sect3">
- <h4 id="_system_initializer">4.2.1. System Initializer</h4>
+ <h4 id="_1_15_0_snapshot">4.2.1. 1.15.0-SNAPSHOT</h4>
<div class="paragraph">
- <p>The bootstrapping itself is performed by a "system initializer" class. This is responsible for instantiating the Apache Isis runtime, and binding it to a thread-local.</p>
+ <p>In <code>1.15.0-SNAPSHOT</code> the bootstrapping is accomplished using a combination of <code>AppManifestAbstract</code> (a framework-provided implementation of <a href="../rgcms/rgcms.html#_rgcms_classes_AppManifest-bootstrapping"><code>AppManifest</code></a>) and <code>IntegrationTestAbstract2</code> superclass.</p>
</div>
- <div class="sect4">
- <h5 id="_1_13_0_improved_intent">1.13.0 (Improved intent)</h5>
- <div class="paragraph">
- <p>As of <code>1.13.0</code>, the <code>IsisConfigurationForJdoIntegTests</code> (which provides a number of configuration settings specifically for running integration tests) can be removed; instead all configuration properties can be defined through the <code>AppManifest</code>:</p>
+ <div class="paragraph">
+ <p>For example, the <a href="../ugfun/ugfun.html#_ugfun_getting-started_simpleapp-archetype">SimpleApp archetype</a>'s integration tests all inherit from this class:</p>
+ </div>
+ <div class="listingblock">
+ <div class="content">
+ <pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="directive">abstract</span> <span class="type">class</span> <span class="class">DomainAppIntegTestAbstract</span> <span class="directive">extends</span> IntegrationTestAbstract2 {
+
+ <span class="annotation">@BeforeClass</span>
+ <span class="directive">public</span> <span class="directive">static</span> <span class="type">void</span> initSystem() {
+ bootstrapUsing(<span class="keyword">new</span> DomainAppAppManifest());
+ }
+
+}</code></pre>
</div>
- <div class="paragraph">
- <p>For example:</p>
+ </div>
+ <div class="paragraph">
+ <p>where <code>DomainAppAppManifest</code> in turn 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">class</span> <span class="class">DomainAppAppManifest</span> <span class="directive">extends</span> AppManifestAbstract {
+
+ <span class="directive">public</span> <span class="directive">static</span> <span class="directive">final</span> Builder BUILDER = Builder.forModules(
+ SimpleModuleDomSubmodule.class,
+ DomainAppApplicationModuleFixtureSubmodule.class,
+ DomainAppApplicationModuleServicesSubmodule.class
+ )
+ .withConfigurationPropertiesFile(DomainAppAppManifest.class,
+ <span class="string"><span class="delimiter">"</span><span class="content">isis.properties</span><span class="delimiter">"</span></span>,
+ <span class="string"><span class="delimiter">"</span><span class="content">authentication_shiro.properties</span><span class="delimiter">"</span></span>,
+ <span class="string"><span class="delimiter">"</span><span class="content">persistor_datanucleus.properties</span><span class="delimiter">"</span></span>,
+ <span class="string"><span class="delimiter">"</span><span class="content">viewer_restfulobjects.properties</span><span class="delimiter">"</span></span>,
+ <span class="string"><span class="delimiter">"</span><span class="content">viewer_wicket.properties</span><span class="delimiter">"</span></span>
+ ).withAuthMechanism(<span class="string"><span class="delimiter">"</span><span class="content">shiro</span><span class="delimiter">"</span></span>);
+
+ <span class="directive">public</span> DomainAppAppManifest() {
+ <span class="local-variable">super</span>(BUILDER);
+ }
+}</code></pre>
</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">DomainAppSystemInitializer</span> {
+ </div>
+ <div class="paragraph">
+ <p>The <code>AppManifestAbstract</code> class (which is also used to bootstrap the regular app as well as integration tests) is discussed further <a href="../rgcms/rgcms.html#_rgcms_classes_AppManifest-bootstrapping">here</a>, while the <code>IntegrationTestAbstract2</code> class is discussed further <a href="#_ugtst_integ-test-support_abstract-class">here</a>.</p>
+ </div>
+ </div>
+ <div class="sect3">
+ <h4 id="_1_13_0">4.2.2. 1.13.0</h4>
+ <div class="paragraph">
+ <p>In <code>1.13.0</code> the bootstrapping itself is typically performed by a "system initializer" class. This is responsible for instantiating the Apache Isis runtime (based on a provided <code>AppManifest</code>) and binding it to a thread-local.</p>
+ </div>
+ <div class="paragraph">
+ <p>The <code>AppManifest.Util</code> class allows configuration properties for integration testing to be defined (replacing the <code>IsisConfigurationForJdoIntegTests</code> of earlier releases).</p>
+ </div>
+ <div class="paragraph">
+ <p>For example:</p>
+ </div>
+ <div class="listingblock">
+ <div class="content">
+ <pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">class</span> <span class="class">DomainAppSystemInitializer</span> {
<span class="directive">public</span> <span class="directive">static</span> <span class="type">void</span> initIsft() {
IsisSystemForTest isft = IsisSystemForTest.getElseNull();
<span class="keyword">if</span>(isft == <span class="predefined-constant">null</span>) {
@@ -1392,20 +1437,62 @@ CustomerRepository customers;</code></pre>
}
}
}</code></pre>
- </div>
- </div>
- <div class="paragraph">
- <p>While the code is slightly longer than previously, the responsibilities for returning the configuration properties to use for the test now reside in a single location. The new <code>AppManifest.Util</code> class provides the helper methods to actually add in the appropriate config properties.</p>
</div>
</div>
- <div class="sect4">
- <h5 id="_1_9_0_code_appmanifest_code">1.9.0 (<code>AppManifest</code>)</h5>
- <div class="paragraph">
- <p>As of 1.9.0, the code (using <code>AppManifest</code>) is:</p>
+ <div class="paragraph">
+ <p>The above code uses the <code>AppManifest.Util</code> helper class, which provides a number of static methods that can be used to set up <a href="#_ugtst_integ-test-support_configuration-properties">configuration properties</a> appropriate for integration testing (eg run using an in-memory database). This allows the responsibility of returning the configuration properties to belong exclusively to the <code>AppManifest</code>.</p>
+ </div>
+ <div class="paragraph">
+ <p>There are three such static methods:</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">AppManifest</span> {
+ ...
+ public <span class="directive">static</span> <span class="type">class</span> <span class="class">Util</span> {
+ <span class="directive">public</span> <span class="directive">static</span> <span class="predefined-type">Map</span><<span class="predefined-type">String</span>,<span class="predefined-type">String</span>>
+ withJavaxJdoRunInMemoryProperties(<span class="predefined-type">Map</span><<span class="predefined-type">String</span>, <span class="predefined-type">String</span>> map) { ... } <i class="conum" data-value="1"></i><b>(1)</b>
+ <span class="directive">public</span> <span class="directive">static</span> <span class="predefined-type">Map</span><<span class="predefined-type">String</span>,<span class="predefined-type">String</span>>
+ withDataNucleusProperties(<span class="predefined-type">Map</span><<span class="predefined-type">String</span>, <span class="predefined-type">String</span>> map) { ... } <i class="conum" data-value="2"></i><b>(2)</b>
+ <span class="directive">public</span> <span class="directive">static</span> <span class="predefined-type">Map</span><<span class="predefined-type">String</span>,<span class="predefined-type">String</span>>
+ withIsisIntegTestProperties(<span class="predefined-type">Map</span><<span class="predefined-type">String</span>, <span class="predefined-type">String</span>> map) { ... } <i class="conum" data-value="3"></i><b>(3)</b>
+ }
+}</code></pre>
</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">DomainAppSystemInitializer</span> {
+ </div>
+ <div class="colist arabic">
+ <table>
+ <tbody>
+ <tr>
+ <td><i class="conum" data-value="1"></i><b>1</b></td>
+ <td>sets up the <code>javax.jdo.option.Connection*</code> properties so as to run against an in-memory instance of HSQLDB</td>
+ </tr>
+ <tr>
+ <td><i class="conum" data-value="2"></i><b>2</b></td>
+ <td>sets up DataNucleus to automatically create the databse schema, as well as a number of other standard properties (disable persistence by reachability, support mixed case identifiers, disable level 2 cache)</td>
+ </tr>
+ <tr>
+ <td><i class="conum" data-value="3"></i><b>3</b></td>
+ <td>sets up standard properties for the Apache Isis framework, most specifically to enable fixtures to be installed.</td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ </div>
+ <div class="sect3">
+ <h4 id="_1_9_0">4.2.3. 1.9.0</h4>
+ <div class="paragraph">
+ <p>In <code>1.9.0</code> the <code>AppManifest</code> was introduced as mechanism to specify all parts (domain code, framework components, configuation properties) that make up a running application.</p>
+ </div>
+ <div class="paragraph">
+ <p>The suggested way to use this concept was using a "system initializer" class. This uses a <code>IsisConfigurationForJdoIntegTests</code> class to bring together the configuration properties (discussed further <a href="#_ugtst_integ-test-support_configuration-properties">here</a>) to bootstrap the application.</p>
+ </div>
+ <div class="paragraph">
+ <p>For example:</p>
+ </div>
+ <div class="listingblock">
+ <div class="content">
+ <pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">class</span> <span class="class">DomainAppSystemInitializer</span> {
<span class="directive">public</span> <span class="directive">static</span> <span class="type">void</span> initIsft() {
IsisSystemForTest isft = IsisSystemForTest.getElseNull();
<span class="keyword">if</span>(isft == <span class="predefined-constant">null</span>) {
@@ -1419,14 +1506,14 @@ CustomerRepository customers;</code></pre>
}
}
}</code></pre>
- </div>
- </div>
- <div class="paragraph">
- <p>where <code>DomainAppAppManifest</code> in turn is defined as:</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">DomainAppAppManifest</span> <span class="directive">implements</span> AppManifest {
+ </div>
+ <div class="paragraph">
+ <p>where <code>DomainAppAppManifest</code> in turn is defined as:</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">DomainAppAppManifest</span> <span class="directive">implements</span> AppManifest {
<span class="annotation">@Override</span>
<span class="directive">public</span> <span class="predefined-type">List</span><<span class="predefined-type">Class</span><?>> getModules() {
<span class="keyword">return</span> <span class="predefined-type">Arrays</span>.asList(
@@ -1437,20 +1524,20 @@ CustomerRepository customers;</code></pre>
}
...
}</code></pre>
- </div>
- </div>
- <div class="paragraph">
- <p>Further details on bootstrapping with the <code>AppManifest</code> can be found in the <a href="../rgcms/rgcms.html#_rgcms_classes_AppManifest-bootstrapping">reference guide</a>.</p>
</div>
</div>
- <div class="sect4">
- <h5 id="_1_8_0_and_earlier">1.8.0 and earlier</h5>
- <div class="paragraph">
- <p>Prior to 1.9.0, the services and entities had to be specified in two separate locations. The suggested way to do this was to introduce a subclass of the <code>IsisSystemForTest.Builder</code> class:</p>
- </div>
- <div class="listingblock">
- <div class="content">
- <pre class="CodeRay highlight"><code data-lang="java"><span class="directive">private</span> <span class="directive">static</span> <span class="type">class</span> <span class="class">DomainAppSystemBuilder</span> <span class="directive">extends</span> IsisSystemForTest.Builder { <i class="conum" data-value="1"></i><b>(1)</b>
+ <div class="paragraph">
+ <p>Further details on bootstrapping with the <code>AppManifest</code> can be found in the <a href="../rgcms/rgcms.html#_rgcms_classes_AppManifest-bootstrapping">reference guide</a>.</p>
+ </div>
+ </div>
+ <div class="sect3">
+ <h4 id="_1_8_0_and_earlier">4.2.4. 1.8.0 and earlier</h4>
+ <div class="paragraph">
+ <p>Prior to 1.9.0, the services and entities had to be specified in two separate locations. The suggested way to do this was to introduce a subclass of the <code>IsisSystemForTest.Builder</code> class:</p>
+ </div>
+ <div class="listingblock">
+ <div class="content">
+ <pre class="CodeRay highlight"><code data-lang="java"><span class="directive">private</span> <span class="directive">static</span> <span class="type">class</span> <span class="class">DomainAppSystemBuilder</span> <span class="directive">extends</span> IsisSystemForTest.Builder { <i class="conum" data-value="1"></i><b>(1)</b>
<span class="directive">public</span> DomainAppSystemBuilder() {
withLoggingAt(org.apache.log4j.Level.INFO);
with(testConfiguration());
@@ -1464,320 +1551,51 @@ CustomerRepository customers;</code></pre>
<span class="keyword">return</span> testConfiguration;
}
}</code></pre>
- </div>
- </div>
- <div class="colist arabic">
- <table>
- <tbody>
- <tr>
- <td><i class="conum" data-value="1"></i><b>1</b></td>
- <td>subclass the framework-provided <code>IsisSystemForTest.Builder</code>.</td>
- </tr>
- <tr>
- <td><i class="conum" data-value="2"></i><b>2</b></td>
- <td>equivalent to <code>isis.persistor=datanucleus</code> in <code>isis.properties</code></td>
- </tr>
- <tr>
- <td><i class="conum" data-value="3"></i><b>3</b></td>
- <td>specify the <code>isis.services</code> key in <code>isis.properties</code> (where "domainapp" is the base package for all classes within the app)</td>
- </tr>
- <tr>
- <td><i class="conum" data-value="4"></i><b>4</b></td>
- <td><code>IsisConfigurationForJdoIntegTests</code> has pre-canned configuration for using an in-memory HSQLDB and other standard settings; more on this below.</td>
- </tr>
- <tr>
- <td><i class="conum" data-value="5"></i><b>5</b></td>
- <td>equivalent to <code>isis.persistor.datanucleus.RegisterEntities.packagePrefix</code> key (typically in <code>persistor_datanucleus.properties</code>)</td>
- </tr>
- </tbody>
- </table>
- </div>
- <div class="paragraph">
- <p>This builder could then be used within the system initializer:</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">DomainAppSystemInitializer</span> {
- <span class="directive">public</span> <span class="directive">static</span> <span class="type">void</span> initIsft() {
- IsisSystemForTest isft = IsisSystemForTest.getElseNull();
- <span class="keyword">if</span>(isft == <span class="predefined-constant">null</span>) {
- isft = <span class="keyword">new</span> DomainAppSystemBuilder() <i class="conum" data-value="1"></i><b>(1)</b>
- .build()
- .setUpSystem();
- IsisSystemForTest.set(isft); <i class="conum" data-value="2"></i><b>(2)</b>
- }
- }
- <span class="directive">private</span> <span class="directive">static</span> <span class="type">class</span> <span class="class">DomainAppSystemBuilder</span>
- <span class="directive">extends</span> IsisSystemForTest.Builder { ... }
-}</code></pre>
- </div>
- </div>
- <div class="colist arabic">
- <table>
- <tbody>
- <tr>
- <td><i class="conum" data-value="1"></i><b>1</b></td>
- <td>instantiates and initializes the Apache Isis runtime (the <code>IsisSystemForTest</code> class)</td>
- </tr>
- <tr>
- <td><i class="conum" data-value="2"></i><b>2</b></td>
- <td>binds the runtime to a thread-local.</td>
- </tr>
- </tbody>
- </table>
</div>
</div>
- <div class="sect4">
- <h5 id="_isisconfigurationforjdointegtests">IsisConfigurationForJdoIntegTests</h5>
- <div class="paragraph">
- <p>Integration tests are configured programmatically, with a default set of properties to bootstrap the JDO/DataNucleus objectstore using an HSQLDB in-memory database.</p>
- </div>
- <div class="paragraph">
- <p>To remove a little bit of boilerplate, the <code>IsisConfigurationForJdoIntegTests</code> class (in the <code>org.apache.isis.objectstore.jdo.datanucleus</code> package) can be used to bootstrap the application. If necessary, this class can be subclassed to override these defaults.</p>
- </div>
- <table class="tableblock frame-all grid-all spread">
- <caption class="title">
- Table 1. Default Configuration Properties for Integration Tests
- </caption>
- <colgroup>
- <col style="width: 33.3333%;">
- <col style="width: 16.6666%;">
- <col style="width: 50.0001%;">
- </colgroup>
- <thead>
- <tr>
- <th class="tableblock halign-left valign-top">Property</th>
- <th class="tableblock halign-left valign-top">Value</th>
- <th class="tableblock halign-left valign-top">Description</th>
- </tr>
- </thead>
- <tbody>
- <tr>
- <td class="tableblock halign-left valign-top">
- <div>
- <div class="paragraph">
- <p><code>isis.persistor.datanucleus.impl.</code><br> <code>javax.jdo.option.ConnectionURL</code></p>
- </div>
- </div></td>
- <td class="tableblock halign-left valign-top"><p class="tableblock">jdbc:hsqldb:mem:test</p></td>
- <td class="tableblock halign-left valign-top">
- <div>
- <div class="paragraph">
- <p>JDBC URL</p>
- </div>
- </div></td>
- </tr>
- <tr>
- <td class="tableblock halign-left valign-top">
- <div>
- <div class="paragraph">
- <p><code>isis.persistor.datanucleus.impl.</code><br> <code>javax.jdo.option.ConnectionDriverName</code></p>
- </div>
- </div></td>
- <td class="tableblock halign-left valign-top"><p class="tableblock">org.hsqldb.jdbcDriver</p></td>
- <td class="tableblock halign-left valign-top">
- <div>
- <div class="paragraph">
- <p>JDBC Driver</p>
- </div>
- </div></td>
- </tr>
- <tr>
- <td class="tableblock halign-left valign-top">
- <div>
- <div class="paragraph">
- <p><code>isis.persistor.datanucleus.impl.</code><br> <code>javax.jdo.option.ConnectionUserName</code></p>
- </div>
- </div></td>
- <td class="tableblock halign-left valign-top"><p class="tableblock">sa</p></td>
- <td class="tableblock halign-left valign-top">
- <div>
- <div class="paragraph">
- <p>Username</p>
- </div>
- </div></td>
- </tr>
- <tr>
- <td class="tableblock halign-left valign-top">
- <div>
- <div class="paragraph">
- <p><code>isis.persistor.datanucleus.impl.</code><br> <code>javax.jdo.option.ConnectionPassword</code></p>
- </div>
- </div></td>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><empty string></p></td>
- <td class="tableblock halign-left valign-top">
- <div>
- <div class="paragraph">
- <p>Password, possibly encrypted (see <code>datanucleus.ConnectionPasswordEncrypter</code>, below).</p>
- </div>
- </div></td>
- </tr>
- <tr>
- <td class="tableblock halign-left valign-top">
- <div>
- <div class="paragraph">
- <p><code>isis.persistor.datanucleus.impl.</code><br> <code>datanucleus.ConnectionPasswordEncrypter</code></p>
- </div>
- </div></td>
- <td class="tableblock halign-left valign-top"><p class="tableblock"><empty string></p></td>
- <td class="tableblock halign-left valign-top">
- <div>
- <div class="paragraph">
- <p>Specify the <code>datanucleus.ConnectionPasswordDecrypter</code> implementation used to decrypt the password.</p>
- </div>
- <div class="paragraph">
- <p>See the <a href="http://www.datanucleus.org/products/accessplatform_4_1/persistence_properties.html#ConnectionPasswordDecrypter">DataNucleus documentation</a> for further details.</p>
- </div>
- </div></td>
- </tr>
- <tr>
- <td class="tableblock halign-left valign-top">
- <div>
- <div class="paragraph">
- <p><code>isis.persistor.datanucleus.impl.</code><br> <code>datanucleus.schema.autoCreateAll</code></p>
- </div>
- </div></td>
- <td class="tableblock halign-left valign-top"><p class="tableblock">true</p></td>
- <td class="tableblock halign-left valign-top">
- <div>
- <div class="paragraph">
- <p>Recreate DB for each test run (an in-memory database)</p>
- </div>
- </div></td>
- </tr>
- <tr>
- <td class="tableblock halign-left valign-top">
- <div>
- <div class="paragraph">
- <p><code>isis.persistor.datanucleus.impl.</code><br> <code>datanucleus.schema.validateAll</code></p>
- </div>
- </div></td>
- <td class="tableblock halign-left valign-top"><p class="tableblock">false</p></td>
- <td class="tableblock halign-left valign-top">
- <div>
- <div class="paragraph">
- <p>Disable validations (minimize bootstrap time)</p>
- </div>
- </div></td>
- </tr>
- <tr>
- <td class="tableblock halign-left valign-top">
- <div>
- <div class="paragraph">
- <p><code>isis.persistor.datanucleus.impl.</code><br> <code>datanucleus.persistenceByReachabilityAtCommit</code></p>
- </div>
- </div></td>
- <td class="tableblock halign-left valign-top"><p class="tableblock">false</p></td>
- <td class="tableblock halign-left valign-top">
- <div>
- <div class="paragraph">
- <p>As per WEB-INF/persistor_datanucleus.properties</p>
- </div>
- </div></td>
- </tr>
+ <div class="colist arabic">
+ <table>
+ <tbody>
<tr>
- <td class="tableblock halign-left valign-top">
- <div>
- <div class="paragraph">
- <p><code>isis.persistor.datanucleus.impl.</code><br> <code>datanucleus.identifier.case</code></p>
- </div>
- </div></td>
- <td class="tableblock halign-left valign-top"><p class="tableblock">MixedCase</p></td>
- <td class="tableblock halign-left valign-top">
- <div>
- <div class="paragraph">
- <p>As per WEB-INF/persistor_datanucleus.properties</p>
- </div>
- </div></td>
+ <td><i class="conum" data-value="1"></i><b>1</b></td>
+ <td>subclass the framework-provided <code>IsisSystemForTest.Builder</code>.</td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top">
- <div>
- <div class="paragraph">
- <p><code>isis.persistor.datanucleus.impl.</code><br> <code>datanucleus.cache.level2.type</code></p>
- </div>
- </div></td>
- <td class="tableblock halign-left valign-top"><p class="tableblock">none</p></td>
- <td class="tableblock halign-left valign-top">
- <div>
- <div class="paragraph">
- <p>As per WEB-INF/persistor_datanucleus.properties</p>
- </div>
- </div></td>
+ <td><i class="conum" data-value="2"></i><b>2</b></td>
+ <td>equivalent to <code>isis.persistor=datanucleus</code> in <code>isis.properties</code></td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top">
- <div>
- <div class="paragraph">
- <p><code>isis.persistor.datanucleus.impl.</code><br> <code>datanucleus.cache.level2.mode</code></p>
- </div>
- </div></td>
- <td class="tableblock halign-left valign-top"><p class="tableblock">ENABLE_SELECTIVE</p></td>
- <td class="tableblock halign-left valign-top">
- <div>
- <div class="paragraph">
- <p>As per WEB-INF/persistor_datanucleus.properties</p>
- </div>
- </div></td>
+ <td><i class="conum" data-value="3"></i><b>3</b></td>
+ <td>specify the <code>isis.services</code> key in <code>isis.properties</code> (where "domainapp" is the base package for all classes within the app)</td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top">
- <div>
- <div class="paragraph">
- <p><code>isis.persistor.datanucleus.</code><br> <code>install-fixtures</code></p>
- </div>
- </div></td>
- <td class="tableblock halign-left valign-top"><p class="tableblock">true</p></td>
- <td class="tableblock halign-left valign-top">
- <div>
- <div class="paragraph">
- <p>Automatically install any fixtures that might have been registered</p>
- </div>
- </div></td>
+ <td><i class="conum" data-value="4"></i><b>4</b></td>
+ <td><code>IsisConfigurationForJdoIntegTests</code> has pre-canned configuration for using an in-memory HSQLDB and other standard settings; more on this below.</td>
</tr>
<tr>
- <td class="tableblock halign-left valign-top">
- <div>
- <div class="paragraph">
- <p><code>isis.persistor.</code><br> <code>enforceSafeSemantics</code></p>
- </div>
- </div></td>
- <td class="tableblock halign-left valign-top"><p class="tableblock">false</p></td>
- <td class="tableblock halign-left valign-top">
- <div></div></td>
+ <td><i class="conum" data-value="5"></i><b>5</b></td>
+ <td>equivalent to <code>isis.persistor.datanucleus.RegisterEntities.packagePrefix</code> key (typically in <code>persistor_datanucleus.properties</code>)</td>
</tr>
- <tr>
- <td class="tableblock halign-left valign-top">
- <div>
- <div class="paragraph">
- <p><code>isis.deploymentType</code></p>
- </div>
- </div></td>
- <td class="tableblock halign-left valign-top"><p class="tableblock">server_prototype</p></td>
- <td class="tableblock halign-left valign-top">
- <div></div></td>
- </tr>
- </tbody>
+ </tbody>
</table>
</div>
- </div>
- <div class="sect3">
- <h4 id="_abstract_class">4.2.2. Abstract Class</h4>
- <div class="paragraph">
- <p>We recommend defining a base class for all your other classes to integration classes to inherit from. The main responsibility of this class is tocall the system initializer, described earlier. We only need the initialization to be performed once, so this call is performed in a <code>@BeforeClass</code> hook.</p>
- </div>
<div class="paragraph">
- <p>The code below shows the general form:</p>
+ <p>This builder could then be used within the system initializer:</p>
</div>
<div class="listingblock">
<div class="content">
- <pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="directive">abstract</span> <span class="type">class</span> <span class="class">DomainAppIntegTest</span> {
- <span class="annotation">@BeforeClass</span>
- <span class="directive">public</span> <span class="directive">static</span> <span class="type">void</span> initClass() {
- org.apache.log4j.PropertyConfigurator.configure(<span class="string"><span class="delimiter">"</span><span class="content">logging.properties</span><span class="delimiter">"</span></span>); <i class="conum" data-value="1"></i><b>(1)</b>
- DomainAppSystemInitializer.initIsft(); <i class="conum" data-value="2"></i><b>(2)</b>
- <span class="keyword">new</span> ScenarioExecutionForIntegration(); <i class="conum" data-value="3"></i><b>(3)</b>
+ <pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">class</span> <span class="class">DomainAppSystemInitializer</span> {
+ <span class="directive">public</span> <span class="directive">static</span> <span class="type">void</span> initIsft() {
+ IsisSystemForTest isft = IsisSystemForTest.getElseNull();
+ <span class="keyword">if</span>(isft == <span class="predefined-constant">null</span>) {
+ isft = <span class="keyword">new</span> DomainAppSystemBuilder() <i class="conum" data-value="1"></i><b>(1)</b>
+ .build()
+ .setUpSystem();
+ IsisSystemForTest.set(isft); <i class="conum" data-value="2"></i><b>(2)</b>
+ }
}
+ <span class="directive">private</span> <span class="directive">static</span> <span class="type">class</span> <span class="class">DomainAppSystemBuilder</span>
+ <span class="directive">extends</span> IsisSystemForTest.Builder { ... }
}</code></pre>
</div>
</div>
@@ -1786,37 +1604,59 @@ CustomerRepository customers;</code></pre>
<tbody>
<tr>
<td><i class="conum" data-value="1"></i><b>1</b></td>
- <td>ensure that logging messages don’t get swallowed</td>
+ <td>instantiates and initializes the Apache Isis runtime (the <code>IsisSystemForTest</code> class)</td>
</tr>
<tr>
<td><i class="conum" data-value="2"></i><b>2</b></td>
- <td>initialize the Apache Isis runtime</td>
- </tr>
- <tr>
- <td><i class="conum" data-value="3"></i><b>3</b></td>
- <td>primarily exists to support the writing of <a href="../ugtst/ugtst.html#_ugtst_bdd-spec-support">BDD specifications</a>, but also enables finer-grained management of sessions/transactions (discussed below).</td>
+ <td>binds the runtime to a thread-local.</td>
</tr>
</tbody>
</table>
</div>
- <div class="sect4">
- <h5 id="__ugtst_integ-test-support_bootstrapping_IntegrationTestAbstract"><code>IntegrationTestAbstract</code></h5>
- <div class="paragraph">
- <p>In fact, we recommend that your base class inherit from Apache Isis' <code>IntegrationTestAbstract</code> class:</p>
- </div>
- <div class="listingblock">
- <div class="content">
- <pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="directive">abstract</span> <span class="type">class</span> <span class="class">DomainAppIntegTest</span> <span class="directive">extends</span> IntegrationTestAbstract {
+ </div>
+ </div>
+ <div class="sect2">
+ <h3 id="_ugtst_integ-test-support_abstract-class">4.3. Abstract class</h3>
+ <div class="btn-group" style="float: right; font-size: small; padding: 6px; margin-top: -55px; ">
+ <button type="button" class="btn btn-xs btn-default" onclick="window.location.href="https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/ugtst/_ugtst_integ-test-support_abstract-class.adoc""><i class="fa fa-pencil-square-o"></i> Edit</button>
+ <button type="button" class="btn btn-xs btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><span class="caret"></span><span class="sr-only">Toggle Dropdown</span></button>
+ <ul class="dropdown-menu">
+ <li><a href="https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/ugtst/_ugtst_integ-test-support_abstract-class.adoc" target="_blank"><i class="fa fa-pencil-square-o fa-fw" aria-hidden="true"></i> Edit</a></li>
+ <li><a href="https://github.com/apache/isis/commits/master/adocs/documentation/src/main/asciidoc/guides/ugtst/_ugtst_integ-test-support_abstract-class.adoc" target="_blank"><i class="fa fa-clock-o fa-fw" aria-hidden="true"></i> History</a></li>
+ <li><a href="https://github.com/apache/isis/raw/master/adocs/documentation/src/main/asciidoc/guides/ugtst/_ugtst_integ-test-support_abstract-class.adoc" target="_blank"><i class="fa fa-file-text-o fa-fw" aria-hidden="true"></i> Raw</a></li>
+ <li><a href="https://github.com/apache/isis/blame/master/adocs/documentation/src/main/asciidoc/guides/ugtst/_ugtst_integ-test-support_abstract-class.adoc" target="_blank"><i class="fa fa-hand-o-right fa-fw" aria-hidden="true"></i> Blame</a></li>
+ </ul>
+ </div>
+ <div class="paragraph">
+ <p>When writing integration tests, it’s easiest to inherit from a base class:</p>
+ </div>
+ <div class="ulist">
+ <ul>
+ <li> <p>for <code>1.15.0-SNAPSHOT</code>, use <code>IntegrationTestAbstract2</code></p> </li>
+ <li> <p>for earlier releases, use (its superclass) <code>IntegrationTestAbstract</code>.</p> </li>
+ </ul>
+ </div>
+ <div class="paragraph">
+ <p>This base class <a href="#_ugtst_integ-test-support_bootstrapping">bootstraps</a> the framework (caching the framework on a thread-local), and provides various utility methods and framework-provided services for use by your application’s subclass tests.</p>
+ </div>
+ <div class="sect3">
+ <h4 id="__ugtst_integ-test-support_abstract-class_IntegrationTestAbstract2">4.3.1. <code>IntegrationTestAbstract2</code> (<code>1.15.0-SNAPSHOT</code>)</h4>
+ <div class="paragraph">
+ <p>(As of <code>1.15.0-SNAPSHOT</code>) we recommend that your integration tests inherit from Apache Isis' <code>IntegrationTestAbstract2</code> class:</p>
+ </div>
+ <div class="listingblock">
+ <div class="content">
+ <pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="directive">abstract</span> <span class="type">class</span> <span class="class">DomainAppIntegTest</span> <span class="directive">extends</span> IntegrationTestAbstract2 {
...
}</code></pre>
- </div>
- </div>
- <div class="paragraph">
- <p>Although not mandatory, this provides a number of helper/convenience methods and JUnit rules:</p>
</div>
- <div class="listingblock">
- <div class="content">
- <pre class="CodeRay highlight"><code data-lang="java"> <span class="annotation">@Rule</span>
+ </div>
+ <div class="paragraph">
+ <p>Although not mandatory, this provides a number of helper/convenience methods and JUnit rules:</p>
+ </div>
+ <div class="listingblock">
+ <div class="content">
+ <pre class="CodeRay highlight"><code data-lang="java"> <span class="annotation">@Rule</span>
<span class="directive">public</span> IsisTransactionRule isisTransactionRule = <i class="conum" data-value="1"></i><b>(1)</b>
<span class="keyword">new</span> IsisTransactionRule();
<span class="annotation">@Rule</span>
@@ -1828,57 +1668,321 @@ CustomerRepository customers;</code></pre>
<span class="annotation">@Rule</span>
<span class="directive">public</span> ExceptionRecognizerTranslate exceptionRecognizerTranslations = <i class="conum" data-value="4"></i><b>(4)</b>
ExceptionRecognizerTranslate.create();</code></pre>
- </div>
- </div>
- <div class="colist arabic">
- <table>
- <tbody>
- <tr>
- <td><i class="conum" data-value="1"></i><b>1</b></td>
- <td>ensures an Apache Isis session/transaction running for each test</td>
- </tr>
- <tr>
- <td><i class="conum" data-value="2"></i><b>2</b></td>
- <td>sets up a JMock context (using Apache Isis' extension to JMock as described in <a href="../ugtst/ugtst.html#_ugtst_unit-test-support_jmock-extensions">JMock Extensions</a>.</td>
- </tr>
- <tr>
- <td><i class="conum" data-value="3"></i><b>3</b></td>
- <td>standard JUnit rule for writing tests that throw exceptions</td>
- </tr>
- <tr>
- <td><i class="conum" data-value="4"></i><b>4</b></td>
- <td>to capture messages that require translation, as described in <a href="../ugbtb/ugbtb.html#_ugbtb_i18n">i18 support</a>.</td>
- </tr>
- </tbody>
- </table>
- </div>
- <div class="paragraph">
- <p>All of these rules could be inlined in your own base class; as we say, they are a convenience.</p>
</div>
- <div class="paragraph">
- <p>The <code>IntegrationTestAbstract</code> also provides a number of helper/convenience methods, though most of these have been deprecated because the functionality they expose is now readily accessible through various domain services; most notably these are:</p>
+ </div>
+ <div class="colist arabic">
+ <table>
+ <tbody>
+ <tr>
+ <td><i class="conum" data-value="1"></i><b>1</b></td>
+ <td>ensures an Apache Isis session/transaction running for each test</td>
+ </tr>
+ <tr>
+ <td><i class="conum" data-value="2"></i><b>2</b></td>
+ <td>sets up a JMock context (using Apache Isis' extension to JMock as described in <a href="../ugtst/ugtst.html#_ugtst_unit-test-support_jmock-extensions">JMock Extensions</a>.</td>
+ </tr>
+ <tr>
+ <td><i class="conum" data-value="3"></i><b>3</b></td>
+ <td>standard JUnit rule for writing tests that throw exceptions</td>
+ </tr>
+ <tr>
+ <td><i class="conum" data-value="4"></i><b>4</b></td>
+ <td>to capture messages that require translation, as described in <a href="../ugbtb/ugbtb.html#_ugbtb_i18n">i18 support</a>.</td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ <div class="paragraph">
+ <p>All of these rules could be inlined in your own base class; as we say, they are a convenience.</p>
+ </div>
+ <div class="paragraph">
+ <p>The <code>IntegrationTestAbstract2</code> also provides a number of helper/convenience methods, though most of these have been deprecated because the functionality they expose is now readily accessible through various domain services; most notably these are:</p>
+ </div>
+ <div class="ulist">
+ <ul>
+ <li> <p><a href="../rgsvc/rgsvc.html#_rgsvc_persistence-layer-api_RepositoryService"><code>RepositoryService</code></a></p> </li>
+ <li> <p><a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_FactoryService"><code>FactoryService</code></a></p> </li>
+ <li> <p><a href="../rgsvc/rgsvc.html#_rgsvc_metadata-api_ServiceRegistry"><code>ServiceRegistry2</code></a></p> </li>
+ <li> <p><a href="../rgsvc/rgsvc.html#_rgsvc_application-layer-api_WrapperFactory"><code>WrapperFactory</code></a><br></p>
+ <div class="paragraph">
+ <p>to wrap objects simulating interaction through the user interface)</p>
+ </div> </li>
+ <li> <p><a href="../rgsvc/rgsvc.html#_rgsvc_application-layer-api_TransactionService"><code>TransactionService</code></a><br></p>
+ <div class="paragraph">
+ <p>most commonly used to commit changes after the fixture setup) and,</p>
+ </div> </li>
+ <li> <p><a href="../rgsvc/rgsvc.html#_rgsvc_application-layer-api_SessionManagementService"><code>SessionManagementService</code></a><br></p>
+ <div class="paragraph">
+ <p>for tests that check interactions over multiple separate sessions.</p>
+ </div> </li>
+ </ul>
+ </div>
+ </div>
+ <div class="sect3">
+ <h4 id="__ugtst_integ-test-support_abstract-class_IntegrationTestAbstract">4.3.2. <code>IntegrationTestAbstract</code></h4>
+ <div class="paragraph">
+ <p>For earlier releases we recommend that your base class inherit from Apache Isis' <code>IntegrationTestAbstract</code> class:</p>
+ </div>
+ <div class="listingblock">
+ <div class="content">
+ <pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="directive">abstract</span> <span class="type">class</span> <span class="class">DomainAppIntegTest</span> <span class="directive">extends</span> IntegrationTestAbstract {
+ ...
+}</code></pre>
</div>
- <div class="ulist">
- <ul>
- <li> <p><a href="../rgsvc/rgsvc.html#_rgsvc_application-layer-api_WrapperFactory"><code>WrapperFactory</code></a><br></p>
+ </div>
+ <div class="paragraph">
+ <p>This provides most of the benefits of <code>IntegrationTestAbstract2</code> (it is the latter’s superclass, in fact), but the <a href="#_ugtst_integ-test-support_bootstrapping">bootstrapping</a> is more verbose.</p>
+ </div>
+ </div>
+ </div>
+ <div class="sect2">
+ <h3 id="_ugtst_integ-test-support_configuration-properties">4.4. Configuration Properties</h3>
+ <div class="btn-group" style="float: right; font-size: small; padding: 6px; margin-top: -55px; ">
+ <button type="button" class="btn btn-xs btn-default" onclick="window.location.href="https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/ugtst/_ugtst_integ-test-support_configuration-properties.adoc""><i class="fa fa-pencil-square-o"></i> Edit</button>
+ <button type="button" class="btn btn-xs btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><span class="caret"></span><span class="sr-only">Toggle Dropdown</span></button>
+ <ul class="dropdown-menu">
+ <li><a href="https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/ugtst/_ugtst_integ-test-support_configuration-properties.adoc" target="_blank"><i class="fa fa-pencil-square-o fa-fw" aria-hidden="true"></i> Edit</a></li>
+ <li><a href="https://github.com/apache/isis/commits/master/adocs/documentation/src/main/asciidoc/guides/ugtst/_ugtst_integ-test-support_configuration-properties.adoc" target="_blank"><i class="fa fa-clock-o fa-fw" aria-hidden="true"></i> History</a></li>
+ <li><a href="https://github.com/apache/isis/raw/master/adocs/documentation/src/main/asciidoc/guides/ugtst/_ugtst_integ-test-support_configuration-properties.adoc" target="_blank"><i class="fa fa-file-text-o fa-fw" aria-hidden="true"></i> Raw</a></li>
+ <li><a href="https://github.com/apache/isis/blame/master/adocs/documentation/src/main/asciidoc/guides/ugtst/_ugtst_integ-test-support_configuration-properties.adoc" target="_blank"><i class="fa fa-hand-o-right fa-fw" aria-hidden="true"></i> Blame</a></li>
+ </ul>
+ </div>
+ <div class="paragraph">
+ <p>The recommended way to run integration tests is against an HSQLDB in-memory database. This can be done using the application’s usual <a href="../rgcms/rgcms.html#_rgcms_classes_AppManifest-bootstrapping"><code>AppManifest</code></a>, and then overriding JDBC URL and similar.</p>
+ </div>
+ <div class="paragraph">
+ <p>Different releases of the framework have provided differing ways to accomplish this. As of <code>1.15.0-SNAPSHOT</code>, using <code>IntegrationTestAbstract2’s `bootstrapUsing</code> method will make these configuration properties as the default. In earlier releases either the helper methods in <code>AppManifest.Util</code> class or the <code>IsisConfigurationForJdoIntegTests</code> (implementation of <code>IsisConfiguration</code>) can be used.</p>
+ </div>
+ <div class="paragraph">
+ <p>Whichever approach is used, these are the configuration properties that will be overridden:</p>
+ </div>
+ <table class="tableblock frame-all grid-all spread">
+ <caption class="title">
+ Table 1. Default Configuration Properties for Integration Tests
+ </caption>
+ <colgroup>
+ <col style="width: 33.3333%;">
+ <col style="width: 16.6666%;">
+ <col style="width: 50.0001%;">
+ </colgroup>
+ <thead>
+ <tr>
+ <th class="tableblock halign-left valign-top">Property</th>
+ <th class="tableblock halign-left valign-top">Value</th>
+ <th class="tableblock halign-left valign-top">Description</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td class="tableblock halign-left valign-top">
+ <div>
<div class="paragraph">
- <p>to wrap objects simulating interaction through the user interface)</p>
- </div> </li>
- <li> <p><a href="../rgsvc/rgsvc.html#_rgsvc_application-layer-api_TransactionService"><code>TransactionService</code></a><br></p>
+ <p><code>isis.persistor.datanucleus.impl.</code><br> <code>javax.jdo.option.ConnectionURL</code></p>
+ </div>
+ </div></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock">jdbc:hsqldb:mem:test</p></td>
+ <td class="tableblock halign-left valign-top">
+ <div>
<div class="paragraph">
- <p>most commonly used to commit changes after the fixture setup) and,</p>
- </div> </li>
- <li> <p><a href="../rgsvc/rgsvc.html#_rgsvc_application-layer-api_SessionManagementService"><code>SessionManagementService</code></a><br></p>
+ <p>JDBC URL</p>
+ </div>
+ </div></td>
+ </tr>
+ <tr>
+ <td class="tableblock halign-left valign-top">
+ <div>
<div class="paragraph">
- <p>for tests that check interactions over multiple separate sessions.</p>
- </div> </li>
- </ul>
- </div>
- </div>
- </div>
+ <p><code>isis.persistor.datanucleus.impl.</code><br> <code>javax.jdo.option.ConnectionDriverName</code></p>
+ </div>
+ </div></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock">org.hsqldb.jdbcDriver</p></td>
+ <td class="tableblock halign-left valign-top">
+ <div>
+ <div class="paragraph">
+ <p>JDBC Driver</p>
+ </div>
+ </div></td>
+ </tr>
+ <tr>
+ <td class="tableblock halign-left valign-top">
+ <div>
+ <div class="paragraph">
+ <p><code>isis.persistor.datanucleus.impl.</code><br> <code>javax.jdo.option.ConnectionUserName</code></p>
+ </div>
+ </div></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock">sa</p></td>
+ <td class="tableblock halign-left valign-top">
+ <div>
+ <div class="paragraph">
+ <p>Username</p>
+ </div>
+ </div></td>
+ </tr>
+ <tr>
+ <td class="tableblock halign-left valign-top">
+ <div>
+ <div class="paragraph">
+ <p><code>isis.persistor.datanucleus.impl.</code><br> <code>javax.jdo.option.ConnectionPassword</code></p>
+ </div>
+ </div></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><empty string></p></td>
+ <td class="tableblock halign-left valign-top">
+ <div>
+ <div class="paragraph">
+ <p>Password, possibly encrypted (see <code>datanucleus.ConnectionPasswordEncrypter</code>, below).</p>
+ </div>
+ </div></td>
+ </tr>
+ <tr>
+ <td class="tableblock halign-left valign-top">
+ <div>
+ <div class="paragraph">
+ <p><code>isis.persistor.datanucleus.impl.</code><br> <code>datanucleus.ConnectionPasswordEncrypter</code></p>
+ </div>
+ </div></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><empty string></p></td>
+ <td class="tableblock halign-left valign-top">
+ <div>
+ <div class="paragraph">
+ <p>Specify the <code>datanucleus.ConnectionPasswordDecrypter</code> implementation used to decrypt the password.</p>
+ </div>
+ <div class="paragraph">
+ <p>See the <a href="http://www.datanucleus.org/products/accessplatform_4_1/persistence_properties.html#ConnectionPasswordDecrypter">DataNucleus documentation</a> for further details.</p>
+ </div>
+ </div></td>
+ </tr>
+ <tr>
+ <td class="tableblock halign-left valign-top">
+ <div>
+ <div class="paragraph">
+ <p><code>isis.persistor.datanucleus.impl.</code><br> <code>datanucleus.schema.autoCreateAll</code></p>
+ </div>
+ </div></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock">true</p></td>
+ <td class="tableblock halign-left valign-top">
+ <div>
+ <div class="paragraph">
+ <p>Recreate DB for each test run (an in-memory database)</p>
+ </div>
+ </div></td>
+ </tr>
+ <tr>
+ <td class="tableblock halign-left valign-top">
+ <div>
+ <div class="paragraph">
+ <p><code>isis.persistor.datanucleus.impl.</code><br> <code>datanucleus.schema.validateAll</code></p>
+ </div>
+ </div></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock">false</p></td>
+ <td class="tableblock halign-left valign-top">
+ <div>
+ <div class="paragraph">
+ <p>Disable validations (minimize bootstrap time)</p>
+ </div>
+ </div></td>
+ </tr>
+ <tr>
+ <td class="tableblock halign-left valign-top">
+ <div>
+ <div class="paragraph">
+ <p><code>isis.persistor.datanucleus.impl.</code><br> <code>datanucleus.persistenceByReachabilityAtCommit</code></p>
+ </div>
+ </div></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock">false</p></td>
+ <td class="tableblock halign-left valign-top">
+ <div>
+ <div class="paragraph">
+ <p>As per WEB-INF/persistor_datanucleus.properties</p>
+ </div>
+ </div></td>
+ </tr>
+ <tr>
+ <td class="tableblock halign-left valign-top">
+ <div>
+ <div class="paragraph">
+ <p><code>isis.persistor.datanucleus.impl.</code><br> <code>datanucleus.identifier.case</code></p>
+ </div>
+ </div></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock">MixedCase</p></td>
+ <td class="tableblock halign-left valign-top">
+ <div>
+ <div class="paragraph">
+ <p>As per WEB-INF/persistor_datanucleus.properties</p>
+ </div>
+ </div></td>
+ </tr>
+ <tr>
+ <td class="tableblock halign-left valign-top">
+ <div>
+ <div class="paragraph">
+ <p><code>isis.persistor.datanucleus.impl.</code><br> <code>datanucleus.cache.level2.type</code></p>
+ </div>
+ </div></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock">none</p></td>
+ <td class="tableblock halign-left valign-top">
+ <div>
+ <div class="paragraph">
+ <p>As per WEB-INF/persistor_datanucleus.properties</p>
+ </div>
+ </div></td>
+ </tr>
+ <tr>
+ <td class="tableblock halign-left valign-top">
+ <div>
+ <div class="paragraph">
+ <p><code>isis.persistor.datanucleus.impl.</code><br> <code>datanucleus.cache.level2.mode</code></p>
+ </div>
+ </div></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock">ENABLE_SELECTIVE</p></td>
+ <td class="tableblock halign-left valign-top">
+ <div>
+ <div class="paragraph">
+ <p>As per WEB-INF/persistor_datanucleus.properties</p>
+ </div>
+ </div></td>
+ </tr>
+ <tr>
+ <td class="tableblock halign-left valign-top">
+ <div>
+ <div class="paragraph">
+ <p><code>isis.persistor.datanucleus.</code><br> <code>install-fixtures</code></p>
+ </div>
+ </div></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock">true</p></td>
+ <td class="tableblock halign-left valign-top">
+ <div>
+ <div class="paragraph">
+ <p>Automatically install any fixtures that might have been registered</p>
+ </div>
+ </div></td>
+ </tr>
+ <tr>
+ <td class="tableblock halign-left valign-top">
+ <div>
+ <div class="paragraph">
+ <p><code>isis.persistor.</code><br> <code>enforceSafeSemantics</code></p>
+ </div>
+ </div></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock">false</p></td>
+ <td class="tableblock halign-left valign-top">
+ <div></div></td>
+ </tr>
+ <tr>
+ <td class="tableblock halign-left valign-top">
+ <div>
+ <div class="paragraph">
+ <p><code>isis.deploymentType</code></p>
+ </div>
+ </div></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock">server_prototype</p></td>
+ <td class="tableblock halign-left valign-top">
+ <div></div></td>
+ </tr>
+ </tbody>
+ </table>
</div>
<div class="sect2">
- <h3 id="_ugtst_integ-test-support_wrapper-factory">4.3. Wrapper Factory</h3>
+ <h3 id="_ugtst_integ-test-support_wrapper-factory">4.5. Wrapper Factory</h3>
<div class="btn-group" style="float: right; font-size: small; padding: 6px; margin-top: -55px; ">
<button type="button" class="btn btn-xs btn-default" onclick="window.location.href="https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/ugtst/_ugtst_integ-test-support_wrapper-factory.adoc""><i class="fa fa-pencil-square-o"></i> Edit</button>
<button type="button" class="btn btn-xs btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><span class="caret"></span><span class="sr-only">Toggle Dropdown</span></button>
@@ -1932,7 +2036,7 @@ CustomerRepository customers;</code></pre>
<p>Let’s look in a bit more detail at what the test can do with the wrapper.</p>
</div>
<div class="sect3">
- <h4 id="_wrapping_and_unwrapping">4.3.1. Wrapping and Unwrapping</h4>
+ <h4 id="_wrapping_and_unwrapping">4.5.1. Wrapping and Unwrapping</h4>
<div class="paragraph">
<p>Wrapping a domain object is very straightforward; simply call <code>WrapperFactory#wrap(…)</code>.</p>
</div>
@@ -1971,7 +2075,7 @@ Customer customer = (Customer)((WrappingObject)wrappedCustomer).__isis_wrapped()
</div>
</div>
<div class="sect3">
- <h4 id="_using_the_wrapper">4.3.2. Using the wrapper</h4>
+ <h4 id="_using_the_wrapper">4.5.2. Using the wrapper</h4>
<div class="paragraph">
<p>As the wrapper is intended to simulate the UI, only those methods that correspond to the "primary" methods of the domain object’s members are allowed to be called. That means:</p>
</div>
@@ -2009,7 +2113,7 @@ Customer customer = (Customer)((WrappingObject)wrappedCustomer).__isis_wrapped()
</div>
</div>
<div class="sect3">
- <h4 id="_firing_domain_events">4.3.3. Firing Domain Events</h4>
+ <h4 id="_firing_domain_events">4.5.3. Firing Domain Events</h4>
<div class="paragraph">
<p>As well as enforcing business rules, the wrapper has another important feature, namely that it will cause domain events to be fired.</p>
</div>
@@ -2101,7 +2205,7 @@ Customer customer = (Customer)((WrappingObject)wrappedCustomer).__isis_wrapped()
</div>
</div>
<div class="sect2">
- <h3 id="_ugtst_integ-test-support_maven-configuration">4.4. Maven Configuration</h3>
+ <h3 id="_ugtst_integ-test-support_maven-configuration">4.6. Maven Configuration</h3>
<div class="btn-group" style="float: right; font-size: small; padding: 6px; margin-top: -55px; ">
<button type="button" class="btn btn-xs btn-default" onclick="window.location.href="https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/ugtst/_ugtst_integ-test-support_maven-configuration.adoc""><i class="fa fa-pencil-square-o"></i> Edit</button>
<button type="button" class="btn btn-xs btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><span class="caret"></span><span class="sr-only">Toggle Dropdown</span></button>
[09/10] isis-site git commit: ISIS-1521: docs
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/8b42f65e/content/elasticlunr/index.json
----------------------------------------------------------------------
diff --git a/content/elasticlunr/index.json b/content/elasticlunr/index.json
index 889907c..857ac79 100644
--- a/content/elasticlunr/index.json
+++ b/content/elasticlunr/index.json
@@ -1 +1 @@
-{"version":"0.9.5","fields":["title","body","description","url"],"ref":"id","documentStore":{"docs":{"372886":{"title":"Rows, full-width cols, and tabs","url":"guides/ugvw/ugvw.html#_rows_full_width_cols_and_tabs","body":"Rows, full-width cols, and tabs The example layout consists of three rows: a row for the object/icon, a row containing a properties, and a row containing collections. In all three cases the row contains a single column spanning the full width of the page. For the property and collection rows, the column contains a tab group. This corresponds to the following XML: You will notice that one of the columns has an unreferencedActions attribute, while one of the tabGroups has a similar unreferencedCollections attribute. This topic is discussed in more detail below. ","description":" The example layout consists of three rows: a row for the object/icon, a row containing a properties, and a row containing collections. In all three cases the row contains a single column s
panning the full width of the page. For the property and collection rows, the column contains a","id":372886},"2646929":{"title":"Apache Isis vs …","url":"guides/ugfun/ugfun.html#_ugfun_core-concepts_apache-isis-vs","body":"Apache Isis vs … Many other frameworks promise rapid application development and provide automatically generated user interfaces, so how do they compare to Apache Isis? ","description":" Many other frameworks promise rapid application development and provide automatically generated user interfaces, so how do they compare to Apache Isis? ","id":2646929},"3836440":{"title":"Running","url":"guides/dg/dg.html#__dg_ide_intellij_running","body":"Running Let’s see how to run both the app and the tests. ","description":" Let’s see how to run both the app and the tests. ","id":3836440},"11600575":{"title":"Using Contributions","url":"pages/tg/tg.html#_using_contributions","body":"Using Contributions One of Apache Isis' most powerful features is the abilit
y for the UI to combine functionality from domain services into the representation of an entity. The effect is similar to traits or mix-ins in other languages, however the \"mixing in\" is done at runtime, within the Apache Isis metamodel. In Apache Isis' terminology, we say that the domain service action is contributed to the entity. Any action of a domain service that has a domain entity type as one of its parameter types will (by default) be contributed. If the service action takes more than one argument, or does not have safe semantics, then it will be contributed as an entity action. If the service action has precisely one parameter type (that of the entity) and has safe semantics then it will be contributed either as a collection or as a property (dependent on whether it returns a collection of a scalar). Why are contributions so useful? Because the service action will match not on the entity type, but also on any of the entity’s supertypes (all the way up to java.lang.Obj
ect). That means that you can apply the dependency inversion principle to ensure that the modules of your application have acyclic dependencies; but in the UI it can still appear as if there are bidirectional dependencies between those modules. The lack of bidirectional dependencies can help save your app degrading into a big ball of mud. Finally, note that the layout of contributed actions/collections/properties can be specified using the .layout.json file (and it is highly recommended that you do so). ","description":" One of Apache Isis' most powerful features is the ability for the UI to combine functionality from domain services into the representation of an entity. The effect is similar to traits or mix-ins in other languages, however the \"mixing in\" is done at runtime, within the Apache Isis metamodel","id":11600575},"12649581":{"title":"Mark the version as released","url":"guides/cgcom/cgcom.html#_mark_the_version_as_released","body":"Mark the version as released In JIRA
, go to the administration section for the Apache Isis project and update the version as being released. In the Kanban view this will have the effect of marking all tickets as released (clearing the \"done\" column). ","description":" In JIRA, go to the administration section for the Apache Isis project and update the version as being released. ","id":12649581},"13573617":{"title":"hide…()","url":"guides/rgcms/rgcms.html#_rgcms_methods_prefixes_hide","body":"hide…() The hide…() supporting method is called for properties, collections and actions. It allows the property/collection to be completely hidden from view. It’s comparatively rare for properties or collections to be imperatively hidden from view, but actions are sometimes hidden or shown visible (as opposed to being just disabled, ie greyed out). The signature of the supporting method is simply: Returning true will hide the property, collection or action, returning false leaves it visible. For example, t
o hide an action: Or, to hide a property: ","description":" The hide…() supporting method is called for properties, collections and actions. It allows the property/collection to be completely hidden from view. ","id":13573617},"14971197":{"title":"Suppressing 'remember me'","url":"guides/ugvw/ugvw.html#_ugvw_configuration-properties_suppressing-remember-me","body":"Suppressing 'remember me' The 'remember me' checkbox on the login page can be suppressed, if required, by setting a configuration flag. ","description":" The 'remember me' checkbox on the login page can be suppressed, if required, by setting a configuration flag. ","id":14971197},"16629694":{"title":"allowLateRegistration","url":"migration-notes/migration-notes.html#__code_allowlateregistration_code","body":"allowLateRegistration One possible issue is that (as per ISIS-830) the EventBusService is now initialized as one of the first domain services; this is to ensure that any object lifecycle events caused by domai
n services initializing themselves can be posted on the event bus for subscribers. The typical case for such lifecycle events to occur is from domain services that seed reference data; one such example can be found in the (non-ASF) Isis addons' security module. In previous releases, the ordering of initialization for the EventBusService was undefined (but would typically be towards the \"end\" of the list of services. What this meant in practice is that it generally didn’t matter whether (domain service) subscribers were initialized before or after seed services. Now, though, because the EventBusService is initialized early on, it proactively checks that all subscribers have been registered before any event posts occur (so that no events get missed). If any subscriber attempts to register after at least one event has been posted, then the service will fail fast and the framework will not start. The error looks something like: To ensure that subscriber domain services are initia
lized before \"seed\" domain services, the @DomainServiceLayout#menuOrder() attribute can be used. Normally this attribute is just used to order UI-visible services on the menu bars, but it also is used internally to sequence the internal list of services being initialized. Alternatively, you can disable this checking within the EventBusService using: If you do that, be aware that not all subscribers may not receive some events generated by other domain services. For more details, see the EventBusService man page. ","description":" One possible issue is that (as per ISIS-830) the EventBusService is now initialized as one of the first domain services; this is to ensure that any object lifecycle events caused by domain services initializing themselves can be posted on the event bus for subscribers. The typical case for such","id":16629694},"17000573":{"title":"ObjectCreatedEvent","url":"guides/rgcms/rgcms.html#_rgcms_classes_lifecycleevent_ObjectCreatedEvent","body":"ObjectCreatedE
vent Subclass of AbstractLifecycleEvent, broadcast when an object is first instantiated using the DomainObjectContainer's #newTransientInstance(…) method. ObjectCreatedEvent.Default is the concrete implementation that is used. ","description":" Subclass of AbstractLifecycleEvent, broadcast when an object is first instantiated using the DomainObjectContainer's #newTransientInstance(…) method. ","id":17000573},"17618894":{"title":"New Feature","url":"release-notes/release-notes.html#_new_feature_20","body":"New Feature ","description":"","id":17618894},"17724516":{"title":"Multi-select action parameters","url":"guides/ugfun/ugfun.html#_multi_select_action_parameters","body":"Multi-select action parameters As well as scalar values, action parameters can also be collections. For this to be valid, a choices or autoComplete supporting method must be provided. For example, suppose we want to \"tag\" or \"label\" an object: ","description":" As well as scalar values, action pa
rameters can also be collections. For this to be valid, a choices or autoComplete supporting method must be provided. ","id":17724516},"18445041":{"title":"Verifying Releases","url":"downloads.html#_verifying_releases","body":"Verifying Releases ","description":"","id":18445041},"19254915":{"title":"API & Implementation","url":"guides/rgsvc/rgsvc.html#_api_implementation_7","body":"API & Implementation The API of Scratchpad service is: This class (o.a.i.applib.services.scratchpad.Scratchpad) is also the implementation. And, as you can see, the service is just a request-scoped wrapper around a java.util.Map. ","description":" The API of Scratchpad service is: ","id":19254915},"21190750":{"title":"Run the archetype","url":"pages/tg/tg.html#_run_the_archetype","body":"Run the archetype Throughout this tutorial you can, if you wish, just checkout from the github repo wherever you see a \"git checkout\" note: Run the simpleapp archetype to build an empty Isis application. With the *n
ix bash shell, use: Adjust as necessary if using Windows cmd.exe or Powershell. This will generate the app in a petclinic directory. Move the contents back: ","description":" Throughout this tutorial you can, if you wish, just checkout from the github repo wherever you see a \"git checkout\" note: ","id":21190750},"21212015":{"title":"Key features","url":"pages/powered-by/powered-by.html#_key_features","body":"Key features ","description":"","id":21212015},"21857601":{"title":"Other Guides","url":"guides/cgcom/cgcom.html#_other_guides","body":"Other Guides Apache Isis documentation is broken out into a number of user, reference and \"supporting procedures\" guides. The user guides available are: The reference guides are: The remaining guides are: This guide provides guidance for Apache Isis' own committers. ","description":" Apache Isis documentation is broken out into a number of user, reference and \"supporting procedures\" guides. ","id":21857601},"23125949":{"title":"Edit
ing","url":"guides/dg/dg.html#__dg_ide_intellij_hints-and-tips_editing","body":"Editing ","description":"","id":23125949},"23524101":{"title":"Collections","url":"guides/ugvw/ugvw.html#_collections","body":"Collections In the final row the collections are placed in tabs, simply one collection per tab. This corresponds to the following XML: As with properties, actions can be associated with collections; this indicates that they should be rendered in the collection’s header. ","description":" In the final row the collections are placed in tabs, simply one collection per tab. This corresponds to the following XML: ","id":23524101},"26509816":{"title":"Commit changes","url":"guides/cgcom/cgcom.html#__cgcom_cutting-a-release_releasing-core_commit-changes","body":"Commit changes Commit any changes from the preceding steps: ","description":" Commit any changes from the preceding steps: ","id":26509816},"27806498":{"title":"renderedAsDayBefore()","url":"guides/rgant/rgant.html#_rgant-P
arameterLayout_renderedAsDayBefore","body":"renderedAsDayBefore() The renderedAsDayBefore() attribute applies only to date parameters whereby the date will be rendered as the day before the value actually held in the domain object. It is ignored for parameters of other types. This attribute is also supported for properties. This behaviour might at first glance appear odd, but the rationale is to support the use case of a sequence of instances that represent adjacent intervals of time. In such cases there would typically be startDate and endDate properties, eg for all of Q2. Storing this as a half-closed interval — eg [1-Apr-2015, 1-July-2015) — can substantially simplify internal algorithms; the endDate of one interval will correspond to the startDate of the next. However, from an end-user perspective the requirement may be to render the interval as a fully closed interval; eg the end date should be shown as 30-Jun-2015. This attribute therefore bridges the gap; it presents
the information in a way that makes sense to an end-user, but also stores the domain object in a way that is easy work with internally. For example: ","description":" The renderedAsDayBefore() attribute applies only to date parameters whereby the date will be rendered as the day before the value actually held in the domain object. It is ignored for parameters of other types. This attribute is also supported for properties. ","id":27806498},"31857620":{"title":"Interacting with the services","url":"guides/rgsvc/rgsvc.html#_interacting_with_the_services","body":"Interacting with the services Typically domain objects will have little need to interact with the CommandContext and Command directly; what is more useful is that these are persisted in support of the various use cases identified above. One case however where a domain object might want to obtain the Command is to determine whether it has been invoked in the foreground, or in the background. It can do this using the getExecu
tedIn() method: Although not often needed, this then allows the domain object to access the Command object through the CommandContext service. To expand th above example: If run in the background, it might then notify the user (eg by email) if all work is done. This leads us onto a related point, distinguishing the current effective user vs the originating \"real\" user. When running in the foreground, the current user can be obtained from the UserService, using: If running in the background, however, then the current user will be the credentials of the background process, for example as run by a Quartz scheduler job. The domain object can still obtain the original (\"effective\") user that caused the job to be created, using: ","description":" Typically domain objects will have little need to interact with the CommandContext and Command directly; what is more useful is that these are persisted in support of the various use cases identified above. ","id":31857620},"36734123":{"
title":"Bug","url":"release-notes/release-notes.html#_bug_8","body":"Bug ","description":"","id":36734123},"39248326":{"title":"Runtime vs Noop implementation","url":"guides/rgfis/rgfis.html#_runtime_vs_noop_implementation","body":"Runtime vs Noop implementation The framework provides two implementations: The …Default implementation takes priority over the …Noop implementation. ","description":" The framework provides two implementations: ","id":39248326},"39290887":{"title":"Implementation","url":"guides/rgsvc/rgsvc.html#_implementation_22","body":"Implementation The core framework provides a default implementation of this service (o.a.i.core.metamodel.services.container.DomainObjectContainerDefault). ","description":" The core framework provides a default implementation of this service (o.a.i.core.metamodel.services.container.DomainObjectContainerDefault). ","id":39290887},"42240053":{"title":"Screenshots","url":"guides/ugvw/ugvw.html#_screenshots_9","body":"Screensho
ts The screenshot below shows the Isis addons example todoapp (not ASF) with a 'brand logo' image in its header: A custom brand logo (typically larger) can also be specified for the signin page: ","description":" The screenshot below shows the Isis addons example todoapp (not ASF) with a 'brand logo' image in its header: ","id":42240053},"44021072":{"title":"Subsidiary Goals","url":"guides/rgcms/rgcms.html#_subsidiary_goals","body":"Subsidiary Goals There are a number of subsidiary goals of the AppManifest class (though not all of these are fully implemented): ","description":" There are a number of subsidiary goals of the AppManifest class (though not all of these are fully implemented): ","id":44021072},"44483327":{"title":"New Feature","url":"release-notes/release-notes.html#_new_feature_17","body":"New Feature ","description":"","id":44483327},"57327287":{"title":"cssClassFa()","url":"guides/rgant/rgant.html#_rgant-ViewModelLayout_cssClassFa","body":"cssClassFa() The cssClas
sFa() attribute is used to specify the name of a Font Awesome icon name, to be rendered as the domain object’s icon. These attribute can also be applied to domain objects to specify the object’s icon, and to actions to specify an icon for the action’s representation as a button or menu item. If necessary the icon specified can be overridden by a particular object instance using the iconName() method. For example: There can be multiple \"fa-\" classes, eg to mirror or rotate the icon. There is no need to include the mandatory fa \"marker\" CSS class; it will be automatically added to the list. The fa- prefix can also be omitted from the class names; it will be prepended to each if required. The related cssClassFaPosition() attribute is currently unused for domain objects; the icon is always rendered to the left. ","description":" The cssClassFa() attribute is used to specify the name of a Font Awesome icon name, to be rendered as the domain object’s icon. ","id":57327287
},"64932464":{"title":"Other Guides","url":"guides/ugtst/ugtst.html#_other_guides","body":"Other Guides Apache Isis documentation is broken out into a number of user, reference and \"supporting procedures\" guides. The user guides available are: The reference guides are: The remaining guides are: ","description":" Apache Isis documentation is broken out into a number of user, reference and \"supporting procedures\" guides. ","id":64932464},"66604001":{"title":"@Programmatic","url":"guides/rgant/rgant.html#_rgant-Programmatic","body":"@Programmatic ","description":"","id":66604001},"68441589":{"title":"License headers","url":"guides/cgcom/cgcom.html#__cgcom_cutting-a-release_releasing-core_license-headers","body":"License headers The Apache Release Audit Tool RAT (from the Apache Creadur project) checks for missing license header files. The parent pom.xml of each releasable module specifies the RAT Maven plugin, with a number of custom exclusions. To run the RAT tool, use: whe
re rat.numUnapprovedLicenses property is set to a high figure, temporarily overriding the default value of 0. This will allow the command to run over all submodules, rather than failing after the first one. The command writes out a target\\rat.txt for each submodule. missing license notes are indicated using the key !???. The for command collates all the errors. Investigate and fix any reported violations, typically by either: To add missing headers, use the groovy script addmissinglicenses.groovy (in the scripts directory) to automatically insert missing headers for certain file types. The actual files checked are those with extensions specified in the line def fileEndings = [\".java\", \".htm\"]: (If the -x is omitted then the script is run in \"dry run\" mode). Once you’ve fixed all issues, confirm once more that apache-rat-plugin no longer reports any license violations, this time leaving the rat.numUnapprovedLicenses property to its default, 0: ","description":" The Apache
Release Audit Tool RAT (from the Apache Creadur project) checks for missing license header files. The parent pom.xml of each releasable module specifies the RAT Maven plugin, with a number of custom exclusions. ","id":68441589},"73703450":{"title":"New Feature","url":"release-notes/release-notes.html#_new_feature_29","body":"New Feature ","description":"","id":73703450},"75054401":{"title":"Supporting Method Prefixes","url":"guides/rgcms/rgcms.html#_rgcms_methods_prefixes","body":"Supporting Method Prefixes Supporting methods are those that are associated with properties, collections and actions, providing additional imperative business rule checking and behaviour to be performed when the user interacts with those object members. This association is performed by name matching. Thus, a property called \"firstName\", derived from a method getFirstName() may have supporting methods hideFirstName(), disableFirstName() and validateFirstName(). Supporting methods are, therefore, each c
haracterized by their own particular prefix. The table below lists the method prefixes that are recognized as part of Apache Isis' default programming model. ","description":" Supporting methods are those that are associated with properties, collections and actions, providing additional imperative business rule checking and behaviour to be performed when the user interacts with those object members. ","id":75054401},"77231561":{"title":"Interaction Execution","url":"guides/rgcms/rgcms.html#_rgcms_schema-ixn","body":"Interaction Execution The interaction (\"ixn\") schema defines the serialized form of an action invocation or a property edit. In fact, it actually defines a call-graph of such executions for those cases where the WrapperFactory is used to execute sub-actions/property edits. Each execution identifies the target object, the member to invoke, and the arguments. It also captures metrics about the execution, and the result of the execution (eg return value of an action in
vocation). ","description":" The interaction (\"ixn\") schema defines the serialized form of an action invocation or a property edit. In fact, it actually defines a call-graph of such executions for those cases where the WrapperFactory is used to execute sub-actions/property edits. ","id":77231561},"78112488":{"title":"Screencast","url":"guides/ugvw/ugvw.html#_screencast","body":"Screencast This screencast describes the feature. ","description":" This screencast describes the feature. ","id":78112488},"78624086":{"title":"Other Guides","url":"guides/ugsec/ugsec.html#_other_guides","body":"Other Guides Apache Isis documentation is broken out into a number of user, reference and \"supporting procedures\" guides. The user guides available are: The reference guides are: The remaining guides are: ","description":" Apache Isis documentation is broken out into a number of user, reference and \"supporting procedures\" guides. ","id":78624086},"80534397":{"title":"ContentMappingService"
,"url":"guides/rgsvc/rgsvc.html#_rgsvc_presentation-layer-spi_ContentMappingService","body":"ContentMappingService The ContentMappingService supports the (default implementation of the) ContentNegotiationService enabling the RestfulObjects viewer to represent domain objects in some other format as specified by the HTTP Accept header. See ContentNegotiationService for further discussion. ","description":" The ContentMappingService supports the (default implementation of the) ContentNegotiationService enabling the RestfulObjects viewer to represent domain objects in some other format as specified by the HTTP Accept header. ","id":80534397},"83803344":{"title":"MessageService","url":"guides/rgsvc/rgsvc.html#_rgsvc_application-layer-api_MessageService","body":"MessageService The MessageService allows domain objects to raise information, warning or error messages. These messages can either be simple strings, or can be translated. ","description":" The MessageService allows domain obje
cts to raise information, warning or error messages. These messages can either be simple strings, or can be translated. ","id":83803344},"83933647":{"title":"Persistence Concerns","url":"guides/ugbtb/ugbtb.html#_persistence_concerns","body":"Persistence Concerns ","description":"","id":83933647},"85931482":{"title":"Task","url":"release-notes/release-notes.html#_task_24","body":"Task ","description":"","id":85931482},"87271564":{"title":"2004:","url":"pages/articles-and-presentations/articles-and-presentations.html#_2004","body":"2004: ","description":"","id":87271564},"90561824":{"title":"Wicket Viewer","url":"release-notes/release-notes.html#_wicket_viewer_8","body":"Wicket Viewer ","description":"","id":90561824},"90935214":{"title":"Wicket Viewer","url":"release-notes/release-notes.html#_wicket_viewer_10","body":"Wicket Viewer ","description":"","id":90935214},"91902412":{"title":"The issue in more detail","url":"guides/ugodn/ugodn.html#_the_issue_in_more_detail","body":"The iss
ue in more detail Consider these entities (yuml.me/b8681268): In the course of a transaction, the Agreement entity is loaded into memory (not necessarily modified), and then new AgreementRoles are associated to it. All these entities implement Comparable using ObjectContracts, and the implementation of AgreementRole's (simplified) is: while Agreement's is implemented as: and Party's is similarly implemented as: DataNucleus’s persistence-by-reachability algorithm adds the AgreementRole instances into a SortedSet, which causes AgreementRole#compareTo() to fire: In other words, in figuring out whether AgreementRole requires the persistence-by-reachability algorithm to run, it causes the adjacent associated entity Party to also be retrieved. ","description":" Consider these entities (yuml.me/b8681268): ","id":91902412},"92467660":{"title":"API and Usage","url":"guides/ugtst/ugtst.html#_ugtst_fixture-scripts_api-and-usage","body":"API and Usage There are two parts to using fixt
ure scripts: the FixtureScripts domain service class, and the FixtureScript view model class: Let’s look at FixtureScripts domain service in more detail first. ","description":" There are two parts to using fixture scripts: the FixtureScripts domain service class, and the FixtureScript view model class: ","id":92467660},"95725933":{"title":"Appendix: Isis Add-ons (not ASF)","url":"guides/ugvw/ugvw.html#_ugvw_isis-addons","body":"Appendix: Isis Add-ons (not ASF) ","description":"","id":95725933},"96583162":{"title":"Configure toolchains plugin","url":"guides/cgcom/cgcom.html#_configure_toolchains_plugin","body":"Configure toolchains plugin Apache Isis releases are built using Java 7, enforced using the maven toolchains plugin. Ensure that Java 7 is installed and the toolchains plugin is configured, as described in the contributors' guide. ","description":" Apache Isis releases are built using Java 7, enforced using the maven toolchains plugin. Ensure that Java 7 is installed and
the toolchains plugin is configured, as described in the contributors' guide. ","id":96583162},"98976996":{"title":"Bootstrapping","url":"guides/rgcms/rgcms.html#_bootstrapping","body":"Bootstrapping One of the primary goals of the AppManifest is to unify the bootstrapping of both integration tests and the webapp. This requires that the integration tests and webapp can both reference the implementation. We strongly recommend using a myapp-app Maven module to hold the implementation of the AppManifest. This Maven module can then also hold dependencies which are common to both integration tests and the webapp, specifically the org.apache.isis.core:isis-core-runtime and the org.apache.isis.core:isis-core-wrapper modules. We also strongly recommend that any application-layer domain services and view models (code that references persistent domain entities but that is not referenced back) is moved to this myapp-app module. This will allow the architectural layering of the overall appli
cation to be enforced by Maven. What then remains is to update the bootstrapping code itself. ","description":" One of the primary goals of the AppManifest is to unify the bootstrapping of both integration tests and the webapp. This requires that the integration tests and webapp can both reference the implementation. ","id":98976996},"99090360":{"title":"Running the App","url":"guides/ugfun/ugfun.html#__ugfun_getting-started_simpleapp-archetype_running-the-app","body":"Running the App The simpleapp archetype generates a single WAR file, configured to run both the Wicket viewer and the Restful Objects viewer. The archetype also configures the DataNucleus/JDO Objectstore to use an in-memory HSQLDB connection. Once you’ve built the app, you can run the WAR in a variety of ways. ","description":" The simpleapp archetype generates a single WAR file, configured to run both the Wicket viewer and the Restful Objects viewer. The archetype also configures the DataNucleus/JDO Objectstore
to use an in-memory HSQLDB connection. ","id":99090360},"100682258":{"title":"Update dependencies","url":"guides/cgcom/cgcom.html#_update_dependencies","body":"Update dependencies With the release complete, now is a good time to bump versions of dependencies (so that there is a full release cycle to identify any possible issues). You will probably want to create a new JIRA ticket for these updates (or if minor then use the \"catch-all\" JIRA ticket raised earlier for the next release). ","description":" With the release complete, now is a good time to bump versions of dependencies (so that there is a full release cycle to identify any possible issues). ","id":100682258},"102347041":{"title":"Bug","url":"release-notes/release-notes.html#_bug_10","body":"Bug ","description":"","id":102347041},"104167755":{"title":"How to implement a spellchecker?","url":"guides/ugbtb/ugbtb.html#_ugbtb_hints-and-tips_how-to-implement-a-spellchecker","body":"How to implement a spellchecker? From this
thread on the Apache Isis users mailing list: One way to implement is to use the event bus: if if the change is made through an edit, you can use @Property#domainEvent(). You’ll need some way to know which fields should be spell checked. Two ways spring to mind: And you’ll (obviously) also need some sort of spell checker implementation to call. ","description":" From this thread on the Apache Isis users mailing list: ","id":104167755},"105480253":{"title":"Visitor","url":"guides/ugbtb/ugbtb.html#__code_visitor_code","body":"Visitor More often than not, you’ll want to visit every element in the metamodel, and so for this you can instead subclass from MetaModelValidatorVisiting.Visitor: You can then create your custom validator by subclassing MetaModelValidatorComposite and adding the visiting validator: If you have more than one rule then each can live in its own visitor. ","description":" More often than not, you’ll want to visit every element in the metamodel, and s
o for this you can instead subclass from MetaModelValidatorVisiting.Visitor: ","id":105480253},"106558909":{"title":"contributedAs()","url":"guides/rgant/rgant.html#_rgant-ActionLayout_contributedAs","body":"contributedAs() For a domain service action that can be contributed, the contributedAs() attribute determines how it is contributed: as an action or as an association (ie a property or collection). The distinction between property or collection is automatic: if the action returns a java.util.Collection (or subtype) then the action is contributed as a collection; otherwise it is contributed as a property. For a domain service action to be contributed, the domain services must have a nature nature of either VIEW or VIEW_CONTRIBUTIONS_ONLY, and the action must have safe action semantics, and takes a single argument, namely the contributee domain object. For example: It’s also possible to use the attribute to suppress the action completely: In such cases, though, it would pr
obably make more sense to annotate the action as either hidden or indeed @Programmatic. ","description":" For a domain service action that can be contributed, the contributedAs() attribute determines how it is contributed: as an action or as an association (ie a property or collection). ","id":106558909},"106606865":{"title":"Using the Wicket Viewer","url":"guides/rgcfg/rgcfg.html#_using_the_wicket_viewer","body":"Using the Wicket Viewer Most of the you’re likely to run Apache Isis using the Wicket viewer. In this case Apache Isis' \"deployment type\" concept maps to Wicket’s \"configuration\" concept: Wicket’s mechanism for specifying the \"configuration\" is to use a context parameter in web.xml; Apache Isis automatically infers its own deployment type from this. In other words: ","description":" Most of the you’re likely to run Apache Isis using the Wicket viewer. In this case Apache Isis' \"deployment type\" concept maps to Wicket’s \"configuration\" concept: ","id":
106606865},"108721033":{"title":"Incode Catalog","url":"guides/ugfun/ugfun.html#_ugfun_available-domain-services_incode-catalog","body":"Incode Catalog The Incode Catalog website also provides a number of reusable modules, focusing on business logic for generic subdomains. This section surveys the functionality available. The modules themselves fall into a number of broader groups: Each of the modules has a full README and demo application demonstrating their usage. The sections below briefly outline the capabilities of these modules. ","description":" The Incode Catalog website also provides a number of reusable modules, focusing on business logic for generic subdomains. ","id":108721033},"108815435":{"title":"unchanging() (1.15.0-SNAPSHOT)","url":"guides/rgant/rgant.html#_rgant-PropertyLayout_unchanging","body":"unchanging() (1.15.0-SNAPSHOT) The unchanging() attribute is used to indicate that the value held by the property never changes over time, even when other properties
of the object do change. Setting this attribute to true is used as a hint to the viewer to not redraw the property after an AJAX update of some other property/ies of the object have changed. This is primarily for performance, eg can improve the user experience when rendering PDFs/blobs. Note that for this to work, the viewer will also ensure that none of the property’s parent component (such as a tab group panel) are re-rendered. For example: ","description":" The unchanging() attribute is used to indicate that the value held by the property never changes over time, even when other properties of the object do change. ","id":108815435},"109833874":{"title":"Persistable","url":"guides/rgcms/rgcms.html#_rgcms_classes_mixins_Persistable","body":"Persistable All domain entities automatically implement the DataNucleus Persistable role interface as a result of the enhancer process (the fully qualified class name is org.datanucleus.enhancement.Persistable). So as a developer you do no
t need to write any code to obtain the mixins that contribute to this interface. ","description":" All domain entities automatically implement the DataNucleus Persistable role interface as a result of the enhancer process (the fully qualified class name is org.datanucleus.enhancement.Persistable). So as a developer you do not need to write any code to obtain the mixins that contribute to this interface. ","id":109833874},"112375674":{"title":"Auditing","url":"migration-notes/migration-notes.html#_auditing","body":"Auditing The AuditingService SPI service has been deprecated, instead replaced by the AuditerService. There can be more than one implementation of this new SPI, and a framework-provided implementation (AuditerServiceLogging) will log to a file. The (non-ASF) Isis addons' audit module also implements the new SPI. ","description":" The AuditingService SPI service has been deprecated, instead replaced by the AuditerService. ","id":112375674},"114685873":{"title":"Usage","ur
l":"guides/rgsvc/rgsvc.html#_usage_19","body":"Usage To indicate that an action invocation should be published, annotate it with the @Action#publishing() annotation. To indicate that an property edit should be published, annotate it with the @Property#publishing() annotation. To indicate that a changed object should be published is to annotate it with the @DomainObject#publishing() annotation. ","description":" To indicate that an action invocation should be published, annotate it with the @Action#publishing() annotation. ","id":114685873},"115229271":{"title":"Domain Entities","url":"guides/ugfun/ugfun.html#_ugfun_programming-model_domain-entities","body":"Domain Entities Entities are persistent domain objects, with their persistence handled by JDO/DataNucleus. As such, they are mapped to a persistent object store, typically an RDBMS, with DataNucleus taking care of both lazy loading and also the persisting of modified (\"dirty\") objects. Domain entities are generally decorat
ed with both DataNucleus and Apache Isis annotations. Let’s look at some of the most commonly-used annotations. To start with, entities are flagged as being \"persistence capable\", indicating how JDO/DataNucleus should manage their identity: All domain entities will have some sort of mandatory key properties. The example below is a very simple case, where the entity is identified by a name property: It’s also common for domain entities to have queries annotated on them. These are used by repository domain services to query for instances of the entity: DataNucleus provides several APIs for defining queries, including entirely programmatic and type-safe APIs; but JDOQL is very similar to SQL and so easily learnt. The corresponding repository method for the above query is: ","description":" Entities are persistent domain objects, with their persistence handled by JDO/DataNucleus. As such, they are mapped to a persistent object store, typically an RDBMS, with DataNucleus takin
g care of both lazy loading and also the persisting of modified (\"dirty\") objects. ","id":115229271},"117553409":{"title":"Object Icon","url":"guides/ugfun/ugfun.html#_object_icon","body":"Object Icon The icon is often the same for all instances of a particular class, and is picked up by convention. It’s is also possible for an individual instance to return a custom icon, typically so that some significant state of that domain object is represented. For example, a custom icon could be used to represent a shipped order, say, or an overdue library loan. ","description":" The icon is often the same for all instances of a particular class, and is picked up by convention. ","id":117553409},"121574190":{"title":"Related Services","url":"guides/rgsvc/rgsvc.html#_related_services_18","body":"Related Services The ActionInteractionContext service allows bulk actions to co-ordinate with each other. The QueryResultsCache is useful for caching the results of expensive method calls. ","de
scription":" The ActionInteractionContext service allows bulk actions to co-ordinate with each other. ","id":121574190},"121879267":{"title":"Wicket Viewer","url":"release-notes/release-notes.html#_wicket_viewer_2","body":"Wicket Viewer ","description":"","id":121879267},"122762699":{"title":"Contributee","url":"guides/rgcms/rgcms.html#_rgcms_classes_contributee","body":"Contributee The interfaces listed in this chapter act as contributees; they allow domain services to contribute actions/properties/collections to any domain objects that implement these interfaces. ","description":" The interfaces listed in this chapter act as contributees; they allow domain services to contribute actions/properties/collections to any domain objects that implement these interfaces. ","id":122762699},"125299345":{"title":"Example","url":"guides/rgant/rgant.html#_example_2","body":"Example This example is taken from the (non-ASF) Isis addons' todoapp: ","description":" This example is taken from the
(non-ASF) Isis addons' todoapp: ","id":125299345},"125961908":{"title":"Do it!","url":"pages/tg/tg.html#_do_it","body":"Do it! ","description":"","id":125961908},"134804772":{"title":"How to handle void/null results","url":"guides/ugbtb/ugbtb.html#_ugbtb_hints-and-tips_how-to-handle-void-and-null-results","body":"How to handle void/null results From this thread on the Apache Isis users mailing list: One way to implement this idea is to provide a custom implementation of the RoutingService SPI domain service. The default implementation will either return the current object (if not null), else the home page (as defined by @HomePage) if one exists. The following custom implementation refines this to use the breadcrumbs (available in the Wicket viewer) to return the first non-deleted domain object found in the list of breadcrumbs: Note that the above implementation uses Java 8, so if you are using Java 7 then you’ll need to backport accordingly. ","description":" From this thread
on the Apache Isis users mailing list: ","id":134804772},"140760147":{"title":"Isis Add-on modules","url":"guides/ugvw/ugvw.html#_isis_add_on_modules","body":"Isis Add-on modules Some of the (non-ASF) Isis Addons modules also provide services whose actions appear in top-level menus. The security's module places its domain service menus in three top-level menus: Meanwhile the devutils module places its actions - to download layouts and so forth - on a \"Prototyping\" top-level menu, on the SECONDARY menu bar. Currently there is no facility to alter the placement of these services. However, their UI can be suppressed using security or using a vetoing subscriber. ","description":" Some of the (non-ASF) Isis Addons modules also provide services whose actions appear in top-level menus. ","id":140760147},"145340696":{"title":"Registering the Services","url":"guides/rgsvc/rgsvc.html#_registering_the_services_20","body":"Registering the Services The (non-ASF) Isis addons' audit module
provides an implementation of this service (AuditingService), and also provides a number of related domain services (AuditingServiceMenu, AuditingServiceRepository and AuditingServiceContributions). Assuming that an AppManifest is being used to bootstrap the app) then this can be activated by updating the pom.xml and updating the AppManifest#getModules() method. If menu items or contributions are not required in the UI, these can be suppressed either using security or by implementing a vetoing subscriber. ","description":" The (non-ASF) Isis addons' audit module provides an implementation of this service (AuditingService), and also provides a number of related domain services (AuditingServiceMenu, AuditingServiceRepository and AuditingServiceContributions). ","id":145340696},"148135206":{"title":"Layout Metadata Reader (deprecated)","url":"guides/ugbtb/ugbtb.html#_ugbtb_programming-model_layout-metadata-reader","body":"Layout Metadata Reader (deprecated) The metadata for domain
objects is obtained both annotations and files. There is also deprecated support for reading layouts from .layout.json files. This service provides an SPI (and default implementation) for reading layouts defined in this fashion. ","description":" The metadata for domain objects is obtained both annotations and files. There is also deprecated support for reading layouts from .layout.json files. This service provides an SPI (and default implementation) for reading layouts defined in this fashion. ","id":148135206},"153666205":{"title":"Implementation","url":"guides/rgsvc/rgsvc.html#_implementation_17","body":"Implementation The core framework provides a default implementation of this service (o.a.i.core.metamodel.services.title.TitleServiceDefault). ","description":" The core framework provides a default implementation of this service (o.a.i.core.metamodel.services.title.TitleServiceDefault). ","id":153666205},"155655500":{"title":"@PrimaryKey (javax.jdo)","url":"guides/rgant/rgant.h
tml#_rgant-PrimaryKey","body":"@PrimaryKey (javax.jdo) ","description":"","id":155655500},"158069558":{"title":"Usability: Defaults","url":"pages/tg/tg.html#_usability_defaults","body":"Usability: Defaults Quick detour: often we want to set up defaults to go with choices. Sensible defaults for action parameters can really improve the usability of the app. ","description":" Quick detour: often we want to set up defaults to go with choices. Sensible defaults for action parameters can really improve the usability of the app. ","id":158069558},"158897592":{"title":"Refactoring","url":"guides/dg/dg.html#__dg_ide_intellij_hints-and-tips_refactoring","body":"Refactoring Loads of good stuff on the Refactor menu; most used are: If you can’t remember all those shortcuts, just use ctrl-shift-alt-T (might want to rebind that to something else!) and get a context-sensitive list of refactorings available for the currently selected object ","description":" Loads of good stuff on the Refactor
menu; most used are: ","id":158897592},"160872749":{"title":"Related Services","url":"guides/rgfis/rgfis.html#_related_services","body":"Related Services The default implementation of ContentNegotiationService delegates to ContentMappingService (if present) to convert domain entities into a stable form (eg DTO). The ContentNegotiationService is itself called by the (default implementation of) RepresentationService. ","description":" The default implementation of ContentNegotiationService delegates to ContentMappingService (if present) to convert domain entities into a stable form (eg DTO). ","id":160872749},"163915714":{"title":"web.xml","url":"migration-notes/migration-notes.html#_web_xml","body":"web.xml In the web.xml, the \"isis.viewers\" context-param is now ignored. Instead the viewer_wicket.properties and viewer_restfulobjects.properties will both be loaded if present (but neither need be present). ","description":" In the web.xml, the \"isis.viewers\" context-param is now
ignored. Instead the viewer_wicket.properties and viewer_restfulobjects.properties will both be loaded if present (but neither need be present). ","id":163915714},"165602306":{"title":"GridLoaderService","url":"guides/rgsvc/rgsvc.html#_rgsvc_presentation-layer-spi_GridLoaderService","body":"GridLoaderService The GridLoaderService provides the ability to load the XML layout (grid) for a domain class. ","description":" The GridLoaderService provides the ability to load the XML layout (grid) for a domain class. ","id":165602306},"165750333":{"title":"loaded()","url":"guides/rgcms/rgcms.html#_rgcms_methods_lifecycle_loaded","body":"loaded() The loaded() lifecycle callback method is called when a (persistent) object has just been loaded from the object store. ","description":" The loaded() lifecycle callback method is called when a (persistent) object has just been loaded from the object store. ","id":165750333},"166045728":{"title":"Sanity Check","url":"guides/cgcom/cgcom.html#_sanit
y_check_2","body":"Sanity Check Ensure that the framework builds ok using the same command that your CI server is set up to execute (see section above). ","description":" Ensure that the framework builds ok using the same command that your CI server is set up to execute (see section above). ","id":166045728},"166899251":{"title":"Installing and Setting up","url":"guides/dg/dg.html#__dg_ide_intellij_installing","body":"Installing and Setting up This section covers installation and setup. These notes/screenshots were prepared using IntelliJ Community Edition 14.1.x, but are believed to be compatible with more recent versions/other editions of the IDE. ","description":" This section covers installation and setup. These notes/screenshots were prepared using IntelliJ Community Edition 14.1.x, but are believed to be compatible with more recent versions/other editions of the IDE. ","id":166899251},"167039338":{"title":"Task","url":"release-notes/release-notes.html#_task_14","body":"Task
","description":"","id":167039338},"169081251":{"title":"Interaction","url":"guides/rgsvc/rgsvc.html#__code_interaction_code","body":"Interaction The public API of the Interaction class consists of: This class is concrete (is also the implementation). ","description":" The public API of the Interaction class consists of: ","id":169081251},"174738887":{"title":"Related functionality","url":"guides/ugvw/ugvw.html#_related_functionality_2","body":"Related functionality The Recent Pages also lists recently visited pages, selected from a drop-down. ","description":" The Recent Pages also lists recently visited pages, selected from a drop-down. ","id":174738887},"175028546":{"title":"Implementation","url":"guides/rgsvc/rgsvc.html#_implementation_5","body":"Implementation The framework provides a default implementation of this service, namely GridServiceDefault. ","description":" The framework provides a default implementation of this service, namely GridServiceDefault. ","id":17502854
6},"175197970":{"title":"Performance tuning","url":"pages/tg/tg.html#_performance_tuning","body":"Performance tuning The QueryResultsCache (request-scoped) domain service allows arbitrary objects to be cached for the duration of a request. This can be helpful for \"naive\" code which would normally make the same query within a loop. ","description":" The QueryResultsCache (request-scoped) domain service allows arbitrary objects to be cached for the duration of a request. ","id":175197970},"175636232":{"title":"RepositoryService","url":"guides/rgsvc/rgsvc.html#_rgsvc_persistence-layer-api_RepositoryService","body":"RepositoryService The RepositoryService collects together methods for creating, persisting and searching for entities from the underlying persistence store. It acts as an abstraction over the JDO/DataNucleus objectstore. You can use it during prototyping to write naive queries (find all rows, then filter using the Guava Predicate API, or you can use it to call JDO name
d queries using JDOQL. As an alternative, you could also use JDO typesafe queries through the IsisJdoSupport service. ","description":" The RepositoryService collects together methods for creating, persisting and searching for entities from the underlying persistence store. It acts as an abstraction over the JDO/DataNucleus objectstore. ","id":175636232},"176767338":{"title":"Command and Events","url":"guides/rgsvc/rgsvc.html#__rgsvc_intro_commands-and-events","body":"Command and Events A good number of the domain services manage the execution of action invocations/property edits, along with the state of domain objects that are modified as a result of these. These services capture information which can then be used for various purposes, most notably for auditing or for publishing events, or for deferring execution such that the execution be performed in the background at some later date. The diagram below shows how these services fit together. The outline boxes are services while
the coloured boxes represent data structures - defined in the applib and therefore accessible to domain applications - which hold various information about the executions. To explain: Implementations of CommandService can use the Command#getMemento() method to obtain a XML equivalent of that Command, reified using the cmd.xsd schema. This can be converted back into a CommandDto using the CommandDtoUtils utility class (part of the applib). Similarly, implementations of PublisherService can use the InteractionDtoUtils utility class to obtain a InteractionDto representing the interaction, either just for a single execution or for the entire call-graph. This can be converted into XML in a similar fashion. Likewise, the PublishedObjects class passed to the PublisherService at the end of the interaction provides the PublishedObjects#getDto() method which returns a ChangesDto instance. This can be converted into XML using the ChangesDtoUtils utility class. One final point: multiple P
ublisherService implementations are supported because different implementations may have different responsibilities. For example, the (non-ASF) Isis addons' publishmq module is responsible for publishing messages onto an ActiveMQ event bus, for inter-system communication. However, the SPI can also be used for profiling; each execution within the call-graph contains metrics of the number of objects loaded or modified as a result of that execution, and thus could be used for application profiling. The framework provides a default PublisherServiceLogging implementation that logs this using SLF4J. ","description":" A good number of the domain services manage the execution of action invocations/property edits, along with the state of domain objects that are modified as a result of these. These services capture information which can then be used for various purposes, most notably for auditing or for publishing events","id":176767338},"178125062":{"title":"domainEvent()","url":"guides/rgan
t/rgant.html#_rgant-Action_domainEvent","body":"domainEvent() Whenever a domain object (or list of domain objects) is to be rendered, the framework fires off multiple domain events for every property, collection and action of the domain object. In the cases of the domain object’s actions, the events that are fired are: Subscribers subscribe through the EventBusService using either Guava or Axon Framework annotations and can influence each of these phases. By default the event raised is ActionDomainEvent.Default. For example: The domainEvent() attribute allows a custom subclass to be emitted allowing more precise subscriptions (to those subclasses) to be defined instead. This attribute is also supported for collections and properties. For example: The benefit is that subscribers can be more targeted as to the events that they subscribe to. ","description":" Whenever a domain object (or list of domain objects) is to be rendered, the framework fires off multiple domain events f
or every property, collection and action of the domain object. In the cases of the domain object’s actions, the events that are fired are: ","id":178125062},"180783343":{"title":"TranslatableException","url":"guides/ugbtb/ugbtb.html#__code_translatableexception_code","body":"TranslatableException Another mechanism by which messages can be rendered to the user are as the result of exception messages thrown and recognized by an ExceptionRecognizer. In this case, if the exception implements TranslatableException, then the message will automatically be translated before being rendered. The TranslatableException itself takes the form: ","description":" Another mechanism by which messages can be rendered to the user are as the result of exception messages thrown and recognized by an ExceptionRecognizer. ","id":180783343},"183226640":{"title":"updatedLifecycleEvent()","url":"guides/rgant/rgant.html#_rgant-DomainObject_updatedLifecycleEvent","body":"updatedLifecycleEvent() Whenever a (
persistent) domain object has been modified and has been updated in the database, an \"updated\" lifecycle event is fired. Subscribers subscribe through the EventBusService and can use the event to obtain a reference to the domain object. By default the event raised is ObjectUpdatedEvent.Default. For example: The purpose of the updatedLifecycleEvent() attribute is to allows a custom subclass to be emitted instead. A similar attribute is available for other lifecycle events. For example: The benefit is that subscribers can be more targeted as to the events that they subscribe to. ","description":" Whenever a (persistent) domain object has been modified and has been updated in the database, an \"updated\" lifecycle event is fired. ","id":183226640},"188123644":{"title":"2013","url":"pages/articles-and-presentations/articles-and-presentations.html#_2013","body":"2013 ","description":"","id":188123644},"189180810":{"title":"HoldsUpdatedAt","url":"guides/rgcms/rgcms.html#_rgcms_clas
ses_roles_HoldsUpdatedAt","body":"HoldsUpdatedAt The HoldsUpdatedAt role interface allows the (framework-provided) TimestampService to update each object with the current timestamp whenever it is modified in a transaction. The interface is defined as: The current time is obtained from the ClockService. Entities that implement this interface often also implement HoldsUpdatedBy role interface; as a convenience the Timestampable interface combines the two roles. ","description":" The HoldsUpdatedAt role interface allows the (framework-provided) TimestampService to update each object with the current timestamp whenever it is modified in a transaction. ","id":189180810},"191180113":{"title":"persistence.xml","url":"guides/ugodn/ugodn.html#_ugodn_configuring_persistence-xml","body":"persistence.xml DataNucleus will for itself also and read the META-INF/persistence.xml. In theory it can hold mappings and even connection strings. However, with Apache Isis we tend to use annotations ins
tead and externalize connection strings. so its definition is extremely simply, specifying just the name of the \"persistence unit\". Here’s the one provided by the SimpleApp archetype: Normally all one needs to do is to change the persistence-unit name. See DataNucleus' documentation on persistence.xml to learn more. ","description":" DataNucleus will for itself also and read the META-INF/persistence.xml. In theory it can hold mappings and even connection strings. However, with Apache Isis we tend to use annotations instead and externalize connection strings. so its definition is extremely simply, specifying just the name of the \"persistence unit","id":191180113},"193237835":{"title":"Core","url":"release-notes/release-notes.html#_core_8","body":"Core ","description":"","id":193237835},"193497711":{"title":"UI Hints","url":"guides/ugfun/ugfun.html#_ugfun_ui-hints","body":"UI Hints ","description":"","id":193497711},"194608562":{"title":"SPI","url":"guides/rgsvc/rgsvc.html#_sp
i_19","body":"SPI The SudoService.Spi service allows implementations of SudoService to notify other services/components that the effective user and roles are different. The default implementation of UserService has been refactored to leverage this SPI. The names of these methods were chosen based on similar names within Shiro. ","description":" The SudoService.Spi service allows implementations of SudoService to notify other services/components that the effective user and roles are different. The default implementation of UserService has been refactored to leverage this SPI. ","id":194608562},"195374240":{"title":"Update the LDAP committee (if a PMC member)","url":"guides/cgcom/cgcom.html#_update_the_ldap_committee_if_a_pmc_member","body":"Update the LDAP committee (if a PMC member) (Assuming that the new committer is a PMC member), also add them as to the PMC committee. This takes two steps: The new committer does not officially become a member of the PMC until the ASF records
have been updated. ","description":" (Assuming that the new committer is a PMC member), also add them as to the PMC committee. This takes two steps: ","id":195374240},"195848147":{"title":"ICLA, obtain new account","url":"guides/cgcom/cgcom.html#_icla_obtain_new_account","body":"ICLA, obtain new account If required (that is, if the committer is not already a committer for a different ASF project), then ask them to complete an ICLA. As a result of this, they should also get an @apache.org user name. More info can be found in the ASF new committers guide. ","description":" If required (that is, if the committer is not already a committer for a different ASF project), then ask them to complete an ICLA. As a result of this, they should also get an @apache.org user name. ","id":195848147},"198329644":{"title":"Strings (Length)","url":"guides/ugfun/ugfun.html#__ugfun_programming-model_properties_datatypes_strings","body":"Strings (Length) By default JDO/DataNucleus will map string prop
erties to a VARCHAR(255). To limit the length, use the @Column(length=…) annotation. For example: This is a good example of a case where Apache Isis infers domain semantics from the JDO annotation. ","description":" By default JDO/DataNucleus will map string properties to a VARCHAR(255). To limit the length, use the @Column(length=…) annotation. ","id":198329644},"198382465":{"title":"Actions","url":"pages/tg/tg.html#_actions","body":"Actions Most business functionality is implemented using actions basically a public method accepting domain classes and primitives as its parameter types. The action can return a domain entity, or a collection of entities, or a primitive/String/value, or void. If a domain entity is returned then that object is rendered immediately; if a collection is returned then the Wicket viewer renders a table. Such collections are sometimes called \"standalone\" collections. ","description":" Most business functionality is implemented using actions ba
sically a public method accepting domain classes and primitives as its parameter types. The action can return a domain entity, or a collection of entities, or a primitive/String/value, or void. If a domain entity is returned then that object is rendered","id":198382465},"203208629":{"title":"New Feature","url":"release-notes/release-notes.html#_new_feature_18","body":"New Feature ","description":"","id":203208629},"203740710":{"title":"RoutingService","url":"guides/rgsvc/rgsvc.html#_rgsvc_presentation-layer-spi_RoutingService","body":"RoutingService The RoutingService provides the ability to return (and therefore render) an alternative object from an action invocation. There are two primary use cases: Currently the routing service is used only by the Wicket viewer; it is ignored by the Restful Objects viewer. ","description":" The RoutingService provides the ability to return (and therefore render) an alternative object from an action invocation. ","id":203740710},"204452611":{"t
itle":"Related services","url":"guides/rgsvc/rgsvc.html#_related_services_15","body":"Related services The ConfigurationServiceMenu exposes the allConfigurationProperties action in the user interface. ","description":" The ConfigurationServiceMenu exposes the allConfigurationProperties action in the user interface. ","id":204452611},"207811701":{"title":"API","url":"guides/rgsvc/rgsvc.html#_api_2","body":"API The API of TitleService is: ","description":" The API of TitleService is: ","id":207811701},"209853740":{"title":"To run","url":"guides/rgmvn/rgmvn.html#_to_run","body":"To run The plugin is activated by default, so is run simply using: This will run any tests, and then also - because the plugin is activated by the isis-validate property and bound to the test phase, will run the plugin’s validate goal. If for any reason you want to disable the validation, use: ","description":" The plugin is activated by default, so is run simply using: ","id":209853740},"213642269":{"ti
tle":"Moving on","url":"guides/ugfun/ugfun.html#__ugfun_getting-started_helloworld-archetype_moving-on","body":"Moving on When you are ready to start working on your own app, we don’t recommend building on top of the helloworld app. Instead, we suggest that you start with the simpleapp archetype instead. Although a little more complex, it provides more structure and tests, all of which will help you as your application grows. ","description":" When you are ready to start working on your own app, we don’t recommend building on top of the helloworld app. ","id":213642269},"216231183":{"title":"Raising a pull request","url":"guides/dg/dg.html#_raising_a_pull_request","body":"Raising a pull request If you have your own fork, you can now simply push the changes you’ve made locally to your fork: This will create a corresponding branch in the remote github repo. If you use gitk --all, you’ll also see a remotes/origin/ISIS-123-blobs branch. Then, use github to raise a pull requ
est. Pull requests sent to the Apache GitHub repositories will forward a pull request e-mail to the dev mailing list. You’ll probably want to sign up to the dev mailing list first before issuing your first pull request (though that isn’t mandatory). The process to raise the pull request, broadly speaking: ","description":" If you have your own fork, you can now simply push the changes you’ve made locally to your fork: ","id":216231183},"220685197":{"title":"AbstractSubscriber","url":"guides/rgcms/rgcms.html#_rgcms_classes_super_AbstractSubscriber","body":"AbstractSubscriber This is a convenience superclass for creating subscriber domain services on the EventBusService. It uses @PostConstruct and @PreDestroy callbacks to automatically register/unregister itself with the EventBusService. It’s important that subscribers register before any domain services that might emit events on the EventBusService. For example, the (non-ASF) Isis addons' security module provides a domain
service that automatically seeds certain domain entities; these will generate lifecycle events and so any subscribers must be registered before such seed services. The easiest way to do this is to use the @DomainServiceLayout#menuOrder() attribute. As a convenience, the AbstractSubscriber specifies this attribute. ","description":" This is a convenience superclass for creating subscriber domain services on the EventBusService. It uses @PostConstruct and @PreDestroy callbacks to automatically register/unregister itself with the EventBusService. ","id":220685197},"221961571":{"title":"Release prepare \"dry run\"","url":"guides/cgcom/cgcom.html#__cgcom_cutting-a-release_releasing-core_release-prepare-dry-run","body":"Release prepare \"dry run\" Most of the work is done using the mvn release:prepare goal. Since this makes a lot of changes, we run it first in \"dry run\" mode; only if that works do we run the goal for real. Run the dry-run as follows: You may be prompted for the gpg
passphrase. ","description":" Most of the work is done using the mvn release:prepare goal. Since this makes a lot of changes, we run it first in \"dry run\" mode; only if that works do we run the goal for real. ","id":221961571},"224301547":{"title":"IsisWebAppBootstrapper","url":"guides/ugbtb/ugbtb.html#__code_isiswebappbootstrapper_code","body":"IsisWebAppBootstrapper The IsisWebAppBootstrapper servlet context listener bootstraps the shared (global) metadata for the Apache Isis framework. This listener is not required (indeed must not be configured) if the Wicket viewer is in use. Its definition is: Its context parameters are: ","description":" The IsisWebAppBootstrapper servlet context listener bootstraps the shared (global) metadata for the Apache Isis framework. This listener is not required (indeed must not be configured) if the Wicket viewer is in use. ","id":224301547},"227377078":{"title":"Initialization","url":"guides/ugfun/ugfun.html#_ugfun_programming-model_domain-ser
vices_initialization","body":"Initialization Services can optionally declare lifecycle callbacks to initialize them (when the app is deployed) and to shut them down (when the app is undeployed). An Apache Isis session is available when initialization occurs (so services can interact with the object store, for example). The framework will call any public method annotated with @PostConstruct with either no arguments of an argument of type Map<String,String>. In the latter case, the framework passes in the configuration (isis.properties and any other component-specific configuration files). Shutdown is similar; the framework will call any method annotated with @PreDestroy. ","description":" Services can optionally declare lifecycle callbacks to initialize them (when the app is deployed) and to shut them down (when the app is undeployed). ","id":227377078},"228550183":{"title":"Policies","url":"guides/cgcom/cgcom.html#_cgcom_policies","body":"Policies ","description":"","id":2285501
83},"229025509":{"title":"Remove references to isis-viewer-wicket parent pom.","url":"migration-notes/migration-notes.html#_remove_references_to_code_isis_viewer_wicket_code_parent_pom","body":"Remove references to isis-viewer-wicket parent pom. In earlier releases the Wicket viewer defined its own parent pom.xml for dependency management and its dependencies and to declare the various submodules that make up the viewer. This pom.xml has now been incorporated into the parent pom.xml for the Core framework. Therefore, in the parent pom.xml of your own domain applications, remove: ","description":" In earlier releases the Wicket viewer defined its own parent pom.xml for dependency management and its dependencies and to declare the various submodules that make up the viewer. This pom.xml has now been incorporated into the parent pom.xml for the Core framework. ","id":229025509},"230599582":{"title":"AuditingServiceInternal","url":"guides/rgfis/rgfis.html#_rgfis_persistence-layer_Audi
tingServiceInternal","body":"AuditingServiceInternal The (internal) AuditingServiceInternal domain service acts as an internal facade to any configured AuditingService and AuditerService services. It is responsible for obtaining the details of all changes to domain objects within an interaction, and then to call the configured AuditingService to actually create audit entries of those changes. ","description":" The (internal) AuditingServiceInternal domain service acts as an internal facade to any configured AuditingService and AuditerService services. It is responsible for obtaining the details of all changes to domain objects within an interaction, and then to call the configured AuditingService to actually create audit entries of those changes. ","id":230599582},"232471644":{"title":"Registering Subscribers","url":"guides/rgsvc/rgsvc.html#_registering_subscribers","body":"Registering Subscribers The register() method should be called in the @PostConstruct lifecycle method. It is
valid and probably the least confusing to readers to also \"unregister\" in the @PreDestroy lifecycle method (though as noted above, unregistering is actually a no-op). For example: This works for both singleton (application-scoped) and also @RequestScoped domain services. ","description":" The register() method should be called in the @PostConstruct lifecycle method. It is valid and probably the least confusing to readers to also \"unregister\" in the @PreDestroy lifecycle method (though as noted above, unregistering is actually a no-op). ","id":232471644},"235512052":{"title":"Usage","url":"guides/rgsvc/rgsvc.html#_usage_21","body":"Usage The usage will vary depending upon the conventions of the design. As of 1.9.0, the usage of the service has been centralized such that the packages to be scanned are located from the AppManifest's #getModules() method. For example, the SimpleApp archetype's app manifest includes: where the three module classes in effect define three differe
nt package prefixes to search under (for domain services, fixture scripts and persistent entities). Other usages of the ClassDiscoveryService are likely to work in a similar way, requiring some sort of scope to be specified. ","description":" The usage will vary depending upon the conventions of the design. As of 1.9.0, the usage of the service has been centralized such that the packages to be scanned are located from the AppManifest's #getModules() method. ","id":235512052},"238546442":{"title":"rebuildMetamodel()","url":"guides/rgcms/rgcms.html#__rgcms_classes_mixins_Object_rebuildMetamodel","body":"rebuildMetamodel() The Object_rebuildMetamodel mixin provides the ability to discard the current internal metamodel data (an instance of ObjectSpecification) for the domain class of the rendered object, and recreate from code and other sources (most notably, layout XML data). It has the following signature: ","description":" The Object_rebuildMetamodel mixin provides the ability to d
iscard the current internal metamodel data (an instance of ObjectSpecification) for the domain class of the rendered object, and recreate from code and other sources (most notably, layout XML data). It has the following signature: ","id":238546442},"238979657":{"title":"New Feature","url":"release-notes/release-notes.html#_new_feature_22","body":"New Feature ","description":"","id":238979657},"240026998":{"title":"Improvement","url":"release-notes/release-notes.html#_improvement_14","body":"Improvement ","description":"","id":240026998},"242030985":{"title":"1.4.0","url":"release-notes/release-notes.html#_release-notes_1.4.0","body":"1.4.0 ","description":"","id":242030985},"243439147":{"title":"hidden()","url":"guides/rgant/rgant.html#_rgant-Property_hidden","body":"hidden() Properties can be hidden at the domain-level, indicating that they are not visible to the end-user. This attribute can also be applied to actions and collections. For example: The acceptable values for the w
here parameter are: For example, if a property is annotated with @Title, then normally this should be hidden from all tables. Annotating with @Property(where=Where.NOWHERE) overrides this. ","description":" Properties can be hidden at the domain-level, indicating that they are not visible to the end-user. This attribute can also be applied to actions and collections. ","id":243439147},"243876171":{"title":"Task","url":"release-notes/release-notes.html#_task_28","body":"Task ","description":"","id":243876171},"246275568":{"title":"Registering the Services","url":"guides/rgsvc/rgsvc.html#_registering_the_services_4","body":"Registering the Services Assuming that the configuration-and-annotation services installer is configured (implicit if using the AppManifest to bootstrap the app), then the default implementation of GridLoaderService is automatically registered and injected, and no further configuration is required. To use an alternative implementation, use @DomainServiceLayout#m
enuOrder() (as explained in the introduction to this guide). That said, there should be little reason to use a different implementation; if behaviour does need to be changed, it would also be possible to replace the implementation of either the GridLoaderService or the GridSystemService. ","description":" Assuming that the configuration-and-annotation services installer is configured (implicit if using the AppManifest to bootstrap the app), then the default implementation of GridLoaderService is automatically registered and injected, and no further configuration is required. ","id":246275568},"246409050":{"title":"Using system properties","url":"guides/ugbtb/ugbtb.html#_using_system_properties","body":"Using system properties The servlet context initializer will search for any system properties called isis.xxx and if present will use them as overrides. Thus, an alternative option for a Docker image is to bootstrap the servlet container (Tomcat, Jetty) with appropriate system prope
rties set up. For example, with Tomcat this can be done by writing into the conf/catalina.properties file (see for example this stackoverflow post). The Docker’s ENTRYPOINT therefore just needs to parse the Docker container’s own command line arguments and use to create this file. ","description":" The servlet context initializer will search for any system properties called isis.xxx and if present will use them as overrides. ","id":246409050},"251015067":{"title":"myapp-dom Module","url":"migration-notes/migration-notes.html#__code_myapp_dom_code_module","body":"myapp-dom Module In your myapp-dom module (containing definitions of your persistent entities and domain services), create an empty class to represent the module. This should be at the root package for the domain, eg: Since there is no requirement to actually instantiate this class (it merely provides the location of the myapp.dom package), we give it a private constructor. If you have any other modules where you hav
e either domain services or entities, similarly create an empty \"module\" class. ","description":" In your myapp-dom module (containing definitions of your persistent entities and domain services), create an empty class to represent the module. This should be at the root package for the domain, eg: ","id":251015067},"255768608":{"title":"Multi-tenancy support","url":"pages/isis-in-pictures/isis-in-pictures.html#_multi_tenancy_support","body":"Multi-tenancy support Of the various Isis Addons, the security module has the most features. One significant feature is the ability to associate users and objects with a \"tenancy\". The todoapp uses this feature so that different users' list of todo items are kept separate from one another. A user with administrator is able to switch their own \"tenancy\" to the tenancy of some other user, in order to access the objects in that tenancy: For more details, see the security module README. ","description":" Of the various Isis Addons, the secur
ity module has the most features. One significant feature is the ability to associate users and objects with a \"tenancy\". The todoapp uses this feature so that different users' list of todo items are kept separate from one another. A user with administrator is","id":255768608},"257661017":{"title":"AppManifest (bootstrapping)","url":"guides/rgcms/rgcms.html#_rgcms_classes_AppManifest-bootstrapping","body":"AppManifest (bootstrapping) This section describes how to implement the AppManifest interface to bootstrap both an Apache Isis web application, and also its integration tests. ","description":" This section describes how to implement the AppManifest interface to bootstrap both an Apache Isis web application, and also its integration tests. ","id":257661017},"259358868":{"title":"Hints and Tips","url":"guides/ugodn/ugodn.html#_ugodn_hints-and-tips","body":"Hints and Tips ","description":"","id":259358868},"266250802":{"title":"Implementation","url":"guides/rgsvc/rgsvc.html#_impl
ementation_2","body":"Implementation The (non-ASF) Isis addons' kitchensink app provides an example implementation: which is rendered as: ","description":" The (non-ASF) Isis addons' kitchensink app provides an example implementation: ","id":266250802},"267695496":{"title":"Building Apache Isis","url":"guides/dg/dg.html#_dg_building-isis","body":"Building Apache Isis ","description":"","id":267695496},"273843820":{"title":"Simulated UI (WrapperFactory)","url":"guides/ugtst/ugtst.html#_simulated_ui_code_wrapperfactory_code","body":"Simulated UI (WrapperFactory) When we talk about integration tests/specs here, we mean tests that exercise the domain object logic, through to the actual database. But we also want the tests to exercise the app from the users’s perspective, which means including the user interface. For most other frameworks that would require having to test the application in a very heavy weight/fragile fashion using a tool such as Selenium, driving a web browser to
navigate . In this regard though, Apache Isis has a significant trick up its sleeve. Because Apache Isis implements the naked objects pattern, it means that the UI is generated automatically from the UI. This therefore allows for other implementations of the UI. The WrapperFactory domain service allows a test to wrap domain objects and thus to interact with said objects \"as if\" through the UI: If the test invokes an action that is disabled, then the wrapper will throw an appropriate exception. If the action is ok to invoke, it delegates through. What this means is that an Isis application can be tested end-to-end without having to deploy it onto a webserver; the whole app can be tested while running in-memory. Although integration tests re (necessarily) slower than unit tests, they are not any harder to write (in fact, in some respects they are easier). ","description":" When we talk about integration tests/specs here, we mean tests that exercise the domain object logic, throug
h to the actual database. But we also want the tests to exercise the app from the users’s perspective, which means including the user interface. ","id":273843820},"273985863":{"title":"addTo…() (deprecated)","url":"guides/rgcms/rgcms.html#_rgcms_methods_prefixes_addTo","body":"addTo…() (deprecated) The addTo…() supporting method is called whenever an object is added to a collection. Its purpose is to allow additional business logic to be performed. For example: See also removeFrom…()` ","description":" The addTo…() supporting method is called whenever an object is added to a collection. Its purpose is to allow additional business logic to be performed. ","id":273985863},"278859977":{"title":"promptStyle() (1.15.0-SNAPSHOT)","url":"guides/rgant/rgant.html#_rgant-PropertyLayout_promptStyle","body":"promptStyle() (1.15.0-SNAPSHOT) The promptStyle() attribute is used to specify whether, when editing a domain object property, the new value for the property
is prompted by way of a dialog box, or is prompted using an inline panel (replacing the property on the page). If the attribute is not set, then the value of the configuration property isis.viewer.wicket.promptStyle is used. If this is itself not set, then an inline prompt is used. For example: Alternatively, the promptStyle() can be specified using file-based layouts. ","description":" The promptStyle() attribute is used to specify whether, when editing a domain object property, the new value for the property is prompted by way of a dialog box, or is prompted using an inline panel (replacing the property on the page). ","id":278859977},"278890330":{"title":"Build a domain app","url":"pages/tg/tg.html#_build_a_domain_app","body":"Build a domain app The remainder of the tutorial provides guidance on building a domain application. We don’t mandate any particular design, but we suggest one with no more than 3 to 6 domain entities in the first instance. If you’re stuck for ideas
, then how about: Hopefully one of those ideas appeals or sparks an idea for something of your own. ","description":" The remainder of the tutorial provides guidance on building a domain application. We don’t mandate any particular design, but we suggest one with no more than 3 to 6 domain entities in the first instance. If you’re stuck for ideas, then how about: ","id":278890330},"278999912":{"title":"Integration API","url":"guides/rgsvc/rgsvc.html#_rgsvc_integration-api","body":"Integration API ","description":"","id":278999912},"282766365":{"title":"Object CSS Styling","url":"guides/ugfun/ugfun.html#_object_css_styling","body":"Object CSS Styling It is also possible for an object to return a CSS class. In conjunction with customized CSS this can be used to apply arbitrary styling; for example each object could be rendered in a page with a different background colour. ","description":" It is also possible for an object to return a CSS class. In conjunction with customized CS
S this can be used to apply arbitrary styling; for example each object could be rendered in a page with a different background colour. ","id":282766365},"283629224":{"title":"App Structure","url":"guides/ugfun/ugfun.html#_app_structure","body":"App Structure As noted above, the generated app is a very simple application consisting of a single domain object that can be easily renamed and extended. The intention is not to showcase all of Apache Isis' capabilities; rather it is to allow you to very easily modify the generated application (eg rename SimpleObject to Customer) without having to waste time deleting lots of generated code. If you run into issues, please don’t hesitate to ask for help on the users mailing list. ","description":" As noted above, the generated app is a very simple application consisting of a single domain object that can be easily renamed and extended. The intention is not to showcase all of Apache Isis' capabilities; rather it is to allow you to very easi
ly modify the generated application (eg rename","id":283629224},"285898371":{"title":"ObjectUpdatedEvent","url":"guides/rgcms/rgcms.html#_rgcms_classes_lifecycleevent_ObjectUpdatedEvent","body":"ObjectUpdatedEvent Subclass of AbstractLifecycleEvent, broadcast when an object has just been updated in the database. This is done either explicitly when the current transaction is flushed using the DomainObjectContainer's #flush(…) method, else is done implicitly when the transaction commits at the end of the user request. ObjectUpdatedEvent.Default is the concrete implementation that is used. ","description":" Subclass of AbstractLifecycleEvent, broadcast when an object has just been updated in the database. This is done either explicitly when the current transaction is flushed using the DomainObjectContainer's #flush(…) method, else is done implicitly when the transaction commits at the end of the user request. ","id":285898371},"286850218":{"title":"Dependent choices for act
ion parameters","url":"guides/ugfun/ugfun.html#_dependent_choices_for_action_parameters","body":"Dependent choices for action parameters For action it is also possible (in a limited form) to define dependencies between parameters. Specifically, if one parameter is a drop-down choice, then other drop-down choices can be derived from it. A good example is a category/sub-category: Note how the choices method for the 2nd parameter also accepts the first parameter. ","description":" For action it is also possible (in a limited form) to define dependencies between parameters. Specifically, if one parameter is a drop-down choice, then other drop-down choices can be derived from it. ","id":286850218},"287120012":{"title":"Actions","url":"guides/ugfun/ugfun.html#_actions_2","body":"Actions Of course, the precondition business rules described above are only one type of business rule. More generally, business rules are implemented in the form of the implementation of actions. Rather than
have the end-user have to edit individual properties of numerous objects, an action can encode these rules and allow only safe transformations of the application from one consistent state to the next. ","description":" Of course, the precondition business rules described above are only one type of business rule. ","id":287120012},"288377989":{"title":"Philosophy and Architecture","url":"guides/ugfun/ugfun.html#_ugfun_core-concepts_philosophy","body":"Philosophy and Architecture This section describes some of the core ideas and architectural patterns upon which Apache Isis builds. ","description":" This section describes some of the core ideas and architectural patterns upon which Apache Isis builds. ","id":288377989},"288392697":{"title":"User Experience","url":"guides/ugvw/ugvw.html#_user_experience_3","body":"User Experience The copy URL dialog is typically obtained by clicking on the icon. Alternatively, alt+] will also open the dialog. It can be closed with either OK or the E
sc key. ","description":" The copy URL dialog is typically obtained by clicking on the icon. ","id":288392697},"291813215":{"title":"Raising events programmatically","url":"guides/rgant/rgant.html#_raising_events_programmatically","body":"Raising events programmatically Normally events are only raised for interactions through the UI. However, events can be raised programmatically either by calling the EventBusService API directly, or by emulating the UI by wrapping the target object using the WrapperFactory domain service. ","description":" Normally events are only raised for interactions through the UI. However, events can be raised programmatically either by calling the EventBusService API directly, or by emulating the UI by wrapping the target object using the WrapperFactory domain service. ","id":291813215},"293860175":{"title":"Usage","url":"guides/rgsvc/rgsvc.html#_usage_10","body":"Usage The most common use-case is for bulk actions that act upon multiple objects in a list.
The (same) Scratchpad service is injected into each of these objects, and so they can use pass information. For example, the Isis addons example todoapp (not ASF) demonstrates how the Scratchpad service can be used to calculate the total cost of the selected `ToDoItem`s: A more complex example could use a view model to enable bulk updates to a set of objects. The view model’s job is to gather track of the items to be updated: The bulk action in the objects simply adds the selected item to the view model: If using the Wicket viewer, the ToDoItemBulkUpdate view model returned from the last action invoked will be displayed. Thereafter this view model can be used to perform a bulk update of the \"enlisted\" items. ","description":" The most common use-case is for bulk actions that act upon multiple objects in a list. The (same) Scratchpad service is injected into each of these objects, and so they can use pass information. ","id":293860175},"295225295":{"title":"updatingLifecycleE
vent()","url":"guides/rgant/rgant.html#_rgant-DomainObject_updatingLifecycleEvent","body":"updatingLifecycleEvent() Whenever a (persistent) domain object has been modified and is about to be updated to the database, an \"updating\" lifecycle event is fired. Subscribers subscribe through the EventBusService and can use the event to obtain a reference to the domain object. The subscriber could then, for example, update the object, or it could use it maintain an external datastore. One possible application is to maintain a full-text search database using Apache Lucene or sim
<TRUNCATED>
[02/10] isis-site git commit: ISIS-1521: docs
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/8b42f65e/content/migration-notes/migration-notes.html
----------------------------------------------------------------------
diff --git a/content/migration-notes/migration-notes.html b/content/migration-notes/migration-notes.html
index a76c41a..d1965cc 100644
--- a/content/migration-notes/migration-notes.html
+++ b/content/migration-notes/migration-notes.html
@@ -294,35 +294,32 @@ table.CodeRay td.code>pre{padding:0}
</table>
</div>
<div class="sect2">
- <h3 id="_overriding_framework_services_a_href_https_issues_apache_org_jira_browse_isis_1611_isis_1611_a">Overriding framework services (<a href="https://issues.apache.org/jira/browse/ISIS-1611">ISIS-1611</a>)</h3>
+ <h3 id="__code_isis_mavendeps_code_aggregator_poms"><code>isis-mavendeps</code> Aggregator POMs</h3>
<div class="paragraph">
- <p>Domain services fall into three categories:</p>
+ <p>To remove boilerplate in your application’s <code>pom.xml</code>, three new maven "aggregator projects have been defined:</p>
</div>
<div class="ulist">
<ul>
- <li> <p>application services: written by the application developer and used only within the application</p> </li>
- <li> <p>SPI services: written by the application developer but called by the framework</p> </li>
- <li> <p>framework services: defined within the applib with a default implementation provided by the framework itself</p> </li>
+ <li> <p><code>org.apache.isis.mavendeps:isis-mavendeps-testing</code><br></p>
+ <div class="paragraph">
+ <p>aggregates dependencies for unit, integration and BDD tests</p>
+ </div> </li>
+ <li> <p><code>org.apache.isis.mavendeps:isis-mavendeps-webapp</code><br></p>
+ <div class="paragraph">
+ <p>aggregates dependencies for running as a webapp</p>
+ </div> </li>
+ <li> <p><code>org.apache.isis.mavendeps:isis-mavendeps-intellij</code><br></p>
+ <div class="paragraph">
+ <p>brings in a dependency on <code>isis-core-webserver</code> (to run the application from the command line using <code>org.apache.isis.WebServer</code>). This is defined in a profile which is actived only when running under the Intellij IDE.</p>
+ </div> </li>
</ul>
</div>
<div class="paragraph">
- <p>As described <a href="../guides/ugbtb/ugbtb.html#_ugbtb_hints-and-tips_replacing-default-service-implementations">here</a>, it is possible to override framework services so that the framework uses the replacement implementation. Previously this required explicitly setting either <a href="../guides/rgant/rgant.html#_rgant_DomainService_menuOrder"><code>@DomainService#menuOrder()</code></a> or <a href="../guides/rgant/rgant.html#_rgant_DomainServiceLayout_menuOrder"><code>@DomainServiceLayout#menuOrder()</code></a>.</p>
- </div>
- <div class="paragraph">
- <p>In 1.15.0, the default value for <code>menuOrder</code> has been set to a value lower than that of the framework-provided implementations, and so will a custom implementation will always take precedence over the framework implementations without having to remember to also set <code>menuOrder</code>.</p>
- </div>
- </div>
- <div class="sect2">
- <h3 id="_fix_to_config_variable_a_href_https_issues_apache_org_jira_browse_isis_1595_isis_1595_a">Fix to config variable (<a href="https://issues.apache.org/jira/browse/ISIS-1595">ISIS-1595</a>)</h3>
- <div class="paragraph">
- <p>The configuration property <a href="../guides/rgcfg/rgcfg.html#__rgcfg_configuring-core_metamodel-validation">[../guides/rgcfg/rgcfg#__rgcfg_configuring-core_metamodel-validation]</a> <code>isis.reflector.validator.jdoqlVariablesClause</code> was incorrectly named <code>variablesClause</code>. This has now been corrected.</p>
- </div>
- <div class="paragraph">
- <p>Any applications that used this configuration property should be updated.</p>
+ <p>The <a href="../ugfun/ugfun.html#_ugfun_getting-started_helloworld-archetype">HelloWorld</a> and <a href="../ugfun/ugfun.html#_ugfun_getting-started_simpleapp-archetype">SimpleApp</a> archetypes both make use of these new aggregators.</p>
</div>
</div>
<div class="sect2">
- <h3 id="_rename_of_isis_viewer_wicket_artifacts">Rename of isis-viewer-wicket artifacts</h3>
+ <h3 id="_rename_of_isis_viewer_wicket_artifacts_a_href_https_issues_apache_org_jira_browse_isis_1528_isis_1528_a">Rename of isis-viewer-wicket artifacts (<a href="https://issues.apache.org/jira/browse/ISIS-1528">ISIS-1528</a>)</h3>
<div class="paragraph">
<p>The <code><groupId></code> and <code><artifactId></code> of the <a href="../guides/ugvw/ugvw.html">Wicket viewer</a> have been made consistent with other artifacts:</p>
</div>
@@ -351,6 +348,114 @@ table.CodeRay td.code>pre{padding:0}
</div>
</div>
</div>
+ <div class="sect2">
+ <h3 id="_overriding_framework_services_a_href_https_issues_apache_org_jira_browse_isis_1611_isis_1611_a">Overriding framework services (<a href="https://issues.apache.org/jira/browse/ISIS-1611">ISIS-1611</a>)</h3>
+ <div class="paragraph">
+ <p>Domain services fall into three categories:</p>
+ </div>
+ <div class="ulist">
+ <ul>
+ <li> <p>application services: written by the application developer and used only within the application</p> </li>
+ <li> <p>SPI services: written by the application developer but called by the framework</p> </li>
+ <li> <p>framework services: defined within the applib with a default implementation provided by the framework itself.</p> </li>
+ </ul>
+ </div>
+ <div class="paragraph">
+ <p>As described <a href="../guides/ugbtb/ugbtb.html#_ugbtb_hints-and-tips_replacing-default-service-implementations">here</a>, it is possible to override framework services so that the framework uses the replacement implementation. Previously this required explicitly setting either <a href="../guides/rgant/rgant.html#_rgant_DomainService_menuOrder"><code>@DomainService#menuOrder()</code></a> or <a href="../guides/rgant/rgant.html#_rgant_DomainServiceLayout_menuOrder"><code>@DomainServiceLayout#menuOrder()</code></a>.</p>
+ </div>
+ <div class="paragraph">
+ <p>In 1.15.0, the default value for <code>menuOrder</code> has been set to a value lower than that of the framework-provided implementations, and so will a custom implementation will always take precedence over the framework implementations without having to remember to also set <code>menuOrder</code>.</p>
+ </div>
+ <div class="paragraph">
+ <p>Of course, your application can still override <code>menuOrder</code> if it wishes. A small change (made in (<a href="https://issues.apache.org/jira/browse/ISIS-1688">ISIS-1688</a>) is that if both are set, then the minimum value is used.</p>
+ </div>
+ </div>
+ <div class="sect2">
+ <h3 id="_metamodel_validators_a_href_https_issues_apache_org_jira_browse_isis_1504_isis_1504_a_a_href_https_issues_apache_org_jira_browse_isis_1622_isis_1622_a_a_href_https_issues_apache_org_jira_browse_isis_1669_isis_1669_a">Metamodel validators (<a href="https://issues.apache.org/jira/browse/ISIS-1504">ISIS-1504</a>, <a href="https://issues.apache.org/jira/browse/ISIS-1622">ISIS-1622</a>, <a href="https://issues.apache.org/jira/browse/ISIS-1669">ISIS-1669</a>)</h3>
+ <div class="paragraph">
+ <p>The metamodel validator has been extended with several new checks relating to <a href="../ugfun.html#_ugfun_programming-model_view-models_jaxb">JAXB view models</a>:</p>
+ </div>
+ <div class="ulist">
+ <ul>
+ <li> <p>that the view model can be instantiated:</p>
+ <div class="ulist">
+ <ul>
+ <li> <p>has a public, no-arg constructor</p> </li>
+ <li> <p>is not abstract</p> </li>
+ <li> <p>is not a member inner class (nested static class is ok)</p> </li>
+ </ul>
+ </div> </li>
+ <li> <p>that JODA datetimes are annotated with the <a href="../ugfun/ugfun.html#_ugfun_programming-model_view-models_jaxb_joda-datatypes">appropriate implementation</a> of a JAXB <code>XmlAdapter</code></p> </li>
+ <li> <p>that for references to persistent entities, that those persistent entities are annotated to use <a href="../ugfun/ugfun.html#_ugfun_programming-model_view-models_jaxb_referencing-domain-entities"><code>PersistentEntityAdapter</code></a> as their JAXB adapter.</p> </li>
+ </ul>
+ </div>
+ <div class="paragraph">
+ <p>... in other words, that the view model can be instantiated.</p>
+ </div>
+ <div class="paragraph">
+ <p>These checks are enabled by default but can be disabled with a <a href="../rgcfg.html#__rgcfg_configuring-core_metamodel-validation">configuration property</a> if required.</p>
+ </div>
+ </div>
+ <div class="sect2">
+ <h3 id="_logging_workaround_a_href_https_issues_apache_org_jira_browse_isis_1613_isis_1613_a">Logging workaround (<a href="https://issues.apache.org/jira/browse/ISIS-1613">ISIS-1613</a>)</h3>
+ <div class="paragraph">
+ <p><code>ISIS-1613</code> improves the UI so that the framework does not repaint the entire page after a property edit or after invoking an action that returns the same object (<code>this</code>). The overall effect is a smoother user experience.</p>
+ </div>
+ <div class="paragraph">
+ <p>However, it also results in "WARN" messages being emitted by Apache Wicket. These are not harmful, but may pollute the log.</p>
+ </div>
+ <div class="paragraph">
+ <p>To remove them, add the following to <code>logging.properties</code>:</p>
+ </div>
+ <div class="listingblock">
+ <div class="content">
+ <pre class="CodeRay highlight"><code data-lang="properties">log4j.logger.org.apache.wicket.page.XmlPartialPageUpdate=ERROR,console
+log4j.additivity.org.apache.wicket.page.XmlPartialPageUpdate=false</code></pre>
+ </div>
+ </div>
+ </div>
+ <div class="sect2">
+ <h3 id="_less_boilerplate_when_bootstrapping_a_href_https_issues_apache_org_jira_browse_isis_1686_isis_1686_a">Less boilerplate when bootstrapping (<a href="https://issues.apache.org/jira/browse/ISIS-1686">ISIS-1686</a></h3>
+ <div class="paragraph">
+ <p>Bootstrapping the application can now be accomplished with less boilerplate, both for the regular webapp and in integration tests.</p>
+ </div>
+ <div class="paragraph">
+ <p>For more information, see the <a href="../ugtst/ugtst.html#_ugtst_integ-test-support_bootstrapping">testing guide</a> and <a href="../rgcms/rgcms.html#__rgcms_classes_AppManifest-bootstrapping_bootstrapping_AppManifestAbstract">reference guide for classes/methods/schema</a>.</p>
+ </div>
+ </div>
+ <div class="sect2">
+ <h3 id="_fix_to_config_variable_a_href_https_issues_apache_org_jira_browse_isis_1595_isis_1595_a">Fix to config variable (<a href="https://issues.apache.org/jira/browse/ISIS-1595">ISIS-1595</a>)</h3>
+ <div class="paragraph">
+ <p>The configuration property <a href="../guides/rgcfg/rgcfg.html#__rgcfg_configuring-core_metamodel-validation">[../guides/rgcfg/rgcfg#__rgcfg_configuring-core_metamodel-validation]</a> <code>isis.reflector.validator.jdoqlVariablesClause</code> was incorrectly named <code>variablesClause</code>. This has now been corrected.</p>
+ </div>
+ <div class="paragraph">
+ <p>Any applications that used this configuration property should be updated.</p>
+ </div>
+ </div>
+ <div class="sect2">
+ <h3 id="__code_postconstruct_code_always_called_a_href_https_issues_apache_org_jira_browse_isis_1690_isis_1690_a"><code>@PostConstruct</code> always called (<a href="https://issues.apache.org/jira/browse/ISIS-1690">ISIS-1690</a>)</h3>
+ <div class="paragraph">
+ <p>In previous versions, if any domain service threw an exception in their initialization method (annotated <code>@PostConstruct</code>) then none of the remaining domain services would be initialized. Even though the failing service would cause an error to be logged during start-up, this could still manifest as the application starting (in a fashion) but then failing in unrelated areas later on.</p>
+ </div>
+ <div class="paragraph">
+ <p>As of this version, the framework now always calls ensures that all services are initialized, even if one or more of them throw an exception. The first exception encountered is then re-thrown (to preserve similar behaviour as possible to earlier versions).</p>
+ </div>
+ </div>
+ <div class="sect2">
+ <h3 id="__non_asf_incode_platform">(non-ASF) Incode Platform</h3>
+ <div class="paragraph">
+ <p>(<strong>work in progress</strong>) The supporting (non-ASF) <a href="http://isisaddons.org">Isis Addons</a> and <a href="http://catalog.incode.org">Incode Catalog</a> have also been reorganised into a single <a href="http://platform.incode.org">"Incode Platform"</a>.</p>
+ </div>
+ <div class="paragraph">
+ <p>While each module can still be consumed individually, the new platform versions consistently (a change in any one module will result in a re-release of all). This should make these modules easier to consume, and easier to maintain/develop.</p>
+ </div>
+ <div class="paragraph">
+ <p>All the modules remain open source, still licensed under the ASF v2.0 license.</p>
+ </div>
+ <div class="paragraph">
+ <p>As of this release, none of the <code>groupId</code>s or <code>artifactId</code>s have changed. They will be rationalized/made consistent in a future release; most probably to coincide with v2.0.0 of the framework.</p>
+ </div>
+ </div>
</div>
</div>
<div class="sect1">