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/03/07 23:59:59 UTC
[01/44] isis-site git commit: ISIS-1594: provide an 'edit' button
Repository: isis-site
Updated Branches:
refs/heads/asf-site 721364638 -> 83a3755a5
http://git-wip-us.apache.org/repos/asf/isis-site/blob/83a3755a/content/support.html
----------------------------------------------------------------------
diff --git a/content/support.html b/content/support.html
index 4a83201..3f3b98f 100644
--- a/content/support.html
+++ b/content/support.html
@@ -1,12 +1,10 @@
<!doctype html>
<html class="no-js" lang="en">
-<head>
- <meta charset="utf-8"/>
- <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-
- <title>Mailing lists</title>
-
- <!--
+ <head>
+ <meta charset="utf-8">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+ <title>Mailing lists</title>
+ <!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
@@ -23,31 +21,21 @@
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
- -->
-
- <!-- No caching headers -->
- <meta http-equiv="cache-control" content="no-cache" />
- <meta http-equiv="pragma" content="no-cache" />
- <meta http-equiv="expires" content="-1" />
-
-
- <!-- TODO: need to (re)instate CDN in the future (not using for now just so can develop off-line -->
- <link href="css/foundation/5.5.1/foundation.css" rel="stylesheet" />
- <script src="js/foundation/5.5.1/vendor/modernizr.js"></script>
- <link href="css/asciidoctor/colony.css" rel="stylesheet">
- <link href="css/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet">
-
-
-
-
- <link href="css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.css" rel="stylesheet" />
- <!--[if lt IE 9]>
+ -->
+ <!-- No caching headers -->
+ <meta http-equiv="cache-control" content="no-cache">
+ <meta http-equiv="pragma" content="no-cache">
+ <meta http-equiv="expires" content="-1">
+ <!-- TODO: need to (re)instate CDN in the future (not using for now just so can develop off-line -->
+ <link href="css/foundation/5.5.1/foundation.css" rel="stylesheet">
+ <script src="js/foundation/5.5.1/vendor/modernizr.js"></script>
+ <link href="css/asciidoctor/colony.css" rel="stylesheet">
+ <link href="css/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet">
+ <link href="css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.css" rel="stylesheet">
+ <!--[if lt IE 9]>
<link href="css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.ie.css" rel="stylesheet" />
- <![endif]-->
-
-
-
- <style type="text/css">
+ <![endif]-->
+ <style type="text/css">
pre code {
background-color: inherit;
border-style: none;
@@ -192,9 +180,8 @@ table.CodeRay td.code>pre{padding:0}
color:#fff;
font-size: 1.1em;
}
- </style>
-
- <style>
+ </style>
+ <style>
@media only screen and (min-width: 40.063em) {
.top-bar {
.contain-to-grid .top-bar {
@@ -205,9 +192,8 @@ table.CodeRay td.code>pre{padding:0}
.row {
max-width: 80rem;
}
- </style>
-
- <style>
+ </style>
+ <style>
.extended-quote,
.extended-quote-first {
margin-left: 40px;
@@ -231,9 +217,8 @@ table.CodeRay td.code>pre{padding:0}
text-shadow: 0 1px 2px rgba(0, 0, 0, 0.1);
}
- </style>
-
- <style>
+ </style>
+ <style>
body {
position: relative;
}
@@ -255,6 +240,7 @@ table.CodeRay td.code>pre{padding:0}
div#doc-content {
margin-top: 30px;
+ padding-top: 30px;
}
div.documentation-page table.frame-all {
@@ -286,9 +272,8 @@ table.CodeRay td.code>pre{padding:0}
min-height: 2000px;
}
- </style>
-
- <style>
+ </style>
+ <style>
@media only screen and (min-width: 768px) {
#toc.toc2 ul ul { margin-left: -10px; }
@@ -316,15 +301,13 @@ table.CodeRay td.code>pre{padding:0}
body div#toc2 li.tocify-item.active a {
color: red;
}
- </style>
-
- <style>
+ </style>
+ <style>
footer {
margin-top: 1000px;
}
- </style>
-
- <style>
+ </style>
+ <style>
/* overriding colony.css stylesheet */
.literalblock pre, .literalblock pre[class], .listingblock pre, .listingblock pre[class] {
/*padding: 1.25em 1.5625em 1.125em 1.5625em;*/
@@ -372,9 +355,8 @@ table.CodeRay td.code>pre{padding:0}
.imageblock img {
margin-bottom: 10px;
}
- </style>
-
- <style>
+ </style>
+ <style>
/* from http://ben.balter.com/2014/03/13/pages-anchor-links/ */
.header-link {
position: absolute;
@@ -395,9 +377,8 @@ table.CodeRay td.code>pre{padding:0}
h6:hover .header-link {
opacity: 1;
}
- </style>
-
- <style>
+ </style>
+ <style>
.top-bar
{
-webkit-transition-duration: .5s;
@@ -425,214 +406,164 @@ table.CodeRay td.code>pre{padding:0}
-webkit-transition-property: -webkit-transform;
transition-property: transform;
}
- </style>
-
- <style>
+ </style>
+ <style>
#doc-content a.guide {
color: white;
}
- </style>
-
- <style>
+ </style>
+ <style>
+ .tocify {
+ margin-top: 80px;
+ }
+ </style>
+ <style>
.tocify {
margin-top: 80px;
}
- </style>
-
-
-</script>
-
-</head>
-<body>
-
-<<div class="github-fork-ribbon-wrapper right" style="position: fixed;">
- <div class="github-fork-ribbon">
- <a href="https://github.com/apache/isis#fork-destination-box">Fork me on GitHub</a>
- </div>
-</div>
-
-
-<div class="row">
-
- <div class="fixed contain-to-grid header">
- <nav class="top-bar" data-topbar role="navigation" style="max-width: 80rem">
- <ul class="title-area">
- <li class="name">
- <h1>
- <a href="/index.html">Apache Isis™</a>
- </h1>
- </li>
- <!-- Remove the class "menu-icon" to get rid of menu icon. Take out "Menu" to just have icon alone -->
- <li class="toggle-topbar menu-icon"><a href="#"><span>Menu</span></a></li>
- </ul>
-
- <section class="top-bar-section">
- <ul class="right">
-
- <li class="has-form">
- <FORM class="searchbox navbar-form navbar-right" id="searchbox_012614087480249044419:dn-q5gtwxya" action="http://www.google.com/cse">
- <div class="row collapse">
- <input type="hidden" name="cx" value="012614087480249044419:dn-q5gtwxya">
- <INPUT type="hidden" name="cof" value="FORID:0">
- <INPUT class="form-control" name="q" type="text" placeholder="Search">
- </div>
- </FORM>
- </li>
-
- </ul>
-
- <!-- Left Nav Section -->
- <ul class="left">
-
- <li><a href="/documentation.html">Documentation</a></li>
- <li><a href="/downloads.html">Downloads</a></li>
- <li><a href="/help.html">Help</a></li>
- <li><a href="/asf.html">@ASF</a></li>
-
- </ul>
-
- </section>
- </nav>
- </div>
-</div>
-
-<div class="row">
-
- <div id="doc-content-left" class="large-9 medium-9 columns">
-
-
- <div id="doc-content">
- <div id="preamble">
-<div class="sectionbody">
-<div class="paragraph">
-<p><br/><br/><br/></p>
-</div>
-<div class="paragraph">
-<p>Apache Isis has two public mailing lists.</p>
-</div>
-<table class="tableblock frame-all grid-all spread">
-<caption class="title">Table 1. Table caption</caption>
-<colgroup>
-<col style="width: 20%;">
-<col style="width: 30%;">
-<col style="width: 20%;">
-<col style="width: 30%;">
-</colgroup>
-<thead>
-<tr>
-<th class="tableblock halign-left valign-top">Mailing list</th>
-<th class="tableblock halign-left valign-top">Email</th>
-<th class="tableblock halign-left valign-top">Mail archives</th>
-<th class="tableblock halign-left valign-top">Subscribe</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Users</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="mailto:users@isis.apache.org">users@isis.apache.org</a></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://lists.apache.org/list.html?users@isis.apache.org">Pony mail</a><br>
-<a href="http://markmail.org/search/isis-users+list:org.apache.incubator.isis-users">Markmail</a><br>
-<a href="http://mail-archives.apache.org/mod_mbox/isis-users/">mbox</a></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="mailto:users-subscribe@isis.apache.org">users-subscribe@isis.apache.org</a></p></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Contributors</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="mailto:dev@isis.apache.org">dev@isis.apache.org</a></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://lists.apache.org/list.html?dev@isis.apache.org">Pony mail</a><br>
-<a href="http://markmail.org/search/isis-dev+list:org.apache.incubator.isis-dev">Markmail</a><br>
-<a href="http://mail-archives.apache.org/mod_mbox/isis-dev/">mbox</a></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="mailto:dev-subscribe@isis.apache.org">dev-subscribe@isis.apache.org</a></p></td>
-</tr>
-</tbody>
-</table>
-<div class="paragraph">
-<p>The Markmail archives span both our current (TLP) mailing lists and also our original mailing lists while in the Apache incubator; the ASF archives span just our TLP mailing lists.</p>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="how-to-subscribe">How to subscribe</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>To subscribe to the <code>users</code> mailing list:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>send a blank email to <a href="mailto:users-subscribe@isis.apache.org">users-subscribe@isis.apache.org</a></p>
-</li>
-<li>
-<p>You’ll then get back a confirmation email.</p>
-</li>
-<li>
-<p>To confirm, all you generally need to do is to send a blank reply (there are more detailed instructions inside that confirmation mail if that doesn’t work)</p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>Then, to ask questions, simply mail to <a href="mailto:users@isis.apache.org">users@isis.apache.org</a> (nb: no <code>-subscribe</code> suffix this time).</p>
-</div>
-<div class="paragraph">
-<p>If you ever want to unsubscribe, then you can send a mail to the <code>users-unsubscribe</code> email address.</p>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="mailing-list-etiquette">Mailing list etiquette</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>Just a couple of rules/suggestions:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>if you are referencing links, then in the body of the mail, number then [1], [2], [3] etc and then list them at the end.</p>
-</li>
-<li>
-<p>reply to a previous post in the <a href="http://en.wikipedia.org/wiki/Posting_style#Interleaved_style">interleaved style</a> (adding your replies in-line). Try not to <a href="http://en.wikipedia.org/wiki/Posting_style#Top-posting)">top-post</a>.</p>
-</li>
-</ul>
-</div>
-</div>
-</div>
- </div>
-
- <footer>
- <hr>
- <p class="small">
- Copyright © 2010~2016 The Apache Software Foundation, licensed under the Apache License, v2.0.
- <br/>
- Apache, the Apache feather logo, Apache Isis, and the Apache Isis project logo are all trademarks of The Apache Software Foundation.
- </p>
- </footer>
-
- </div>
-
- <div id="doc-content-right" class="large-3 medium-3 xcolumns">
- <div id="toc" class="toc2">
- <div class="fallback-toc">
- <ul class="sectlevel1">
-<li><a href="#how-to-subscribe">How to subscribe</a></li>
-<li><a href="#mailing-list-etiquette">Mailing list etiquette</a></li>
-</ul>
- </div>
- </div>
- </div>
-
-</div>
-
-
-<script src="./js/foundation/5.5.1/vendor/jquery.js"></script>
-<script src="./js/foundation/5.5.1/foundation.min.js"></script>
-
-
-<link href="./css/jquery.tocify/1.9.0/jquery.tocify.css" rel="stylesheet">
-<script src="./js/jqueryui/1.11.4/jquery-ui.min.js"></script>
-<script src="./js/jquery.tocify/1.9.0/jquery.tocify.js"></script>
-
-
-
-<script type="text/javascript">
+ </style>
+ </head>
+ <body>
+ <div class="row">
+ <div class="fixed contain-to-grid header">
+ <nav class="top-bar" data-topbar role="navigation" style="max-width: 80rem">
+ <ul class="title-area">
+ <li class="name"> <h1> <a href="/index.html">Apache Isis\u2122</a> </h1> </li>
+ <!-- Remove the class "menu-icon" to get rid of menu icon. Take out "Menu" to just have icon alone -->
+ <li class="toggle-topbar menu-icon"><a href="#"><span>Menu</span></a></li>
+ </ul>
+ <section class="top-bar-section">
+ <ul class="right">
+ <li class="has-form">
+ <form class="searchbox navbar-form navbar-right" id="searchbox_012614087480249044419:dn-q5gtwxya" action="http://www.google.com/cse">
+ <div class="row collapse">
+ <input type="hidden" name="cx" value="012614087480249044419:dn-q5gtwxya">
+ <input type="hidden" name="cof" value="FORID:0">
+ <input class="form-control" name="q" type="text" placeholder="Search">
+ </div>
+ </form> </li>
+ </ul>
+ <!-- Left Nav Section -->
+ <ul class="left">
+ <li><a href="/documentation.html">Documentation</a></li>
+ <li><a href="/downloads.html">Downloads</a></li>
+ <li><a href="/help.html">Help</a></li>
+ <li><a href="/asf.html">@ASF</a></li>
+ </ul>
+ </section>
+ </nav>
+ </div>
+ </div>
+ <div class="row">
+ <div id="doc-content-left" class="large-9 medium-9 columns">
+ <div id="doc-content">
+ <button type="button" class="button secondary" onclick="window.location.href="https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/support.adoc"" style="float: right; font-size: small; padding: 6px; "><i class="fa fa-pencil-square-o"></i> Edit</button>
+ <div id="preamble">
+ <div class="sectionbody">
+ <div class="paragraph">
+ <p><br><br><br></p>
+ </div>
+ <div class="paragraph">
+ <p>Apache Isis has two public mailing lists.</p>
+ </div>
+ <table class="tableblock frame-all grid-all spread">
+ <caption class="title">
+ Table 1. Table caption
+ </caption>
+ <colgroup>
+ <col style="width: 20%;">
+ <col style="width: 30%;">
+ <col style="width: 20%;">
+ <col style="width: 30%;">
+ </colgroup>
+ <thead>
+ <tr>
+ <th class="tableblock halign-left valign-top">Mailing list</th>
+ <th class="tableblock halign-left valign-top">Email</th>
+ <th class="tableblock halign-left valign-top">Mail archives</th>
+ <th class="tableblock halign-left valign-top">Subscribe</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td class="tableblock halign-left valign-top"><p class="tableblock">Users</p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="mailto:users@isis.apache.org">users@isis.apache.org</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://lists.apache.org/list.html?users@isis.apache.org">Pony mail</a><br> <a href="http://markmail.org/search/isis-users+list:org.apache.incubator.isis-users">Markmail</a><br> <a href="http://mail-archives.apache.org/mod_mbox/isis-users/">mbox</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="mailto:users-subscribe@isis.apache.org">users-subscribe@isis.apache.org</a></p></td>
+ </tr>
+ <tr>
+ <td class="tableblock halign-left valign-top"><p class="tableblock">Contributors</p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="mailto:dev@isis.apache.org">dev@isis.apache.org</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://lists.apache.org/list.html?dev@isis.apache.org">Pony mail</a><br> <a href="http://markmail.org/search/isis-dev+list:org.apache.incubator.isis-dev">Markmail</a><br> <a href="http://mail-archives.apache.org/mod_mbox/isis-dev/">mbox</a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="mailto:dev-subscribe@isis.apache.org">dev-subscribe@isis.apache.org</a></p></td>
+ </tr>
+ </tbody>
+ </table>
+ <div class="paragraph">
+ <p>The Markmail archives span both our current (TLP) mailing lists and also our original mailing lists while in the Apache incubator; the ASF archives span just our TLP mailing lists.</p>
+ </div>
+ </div>
+ </div>
+ <div class="sect1">
+ <h2 id="how-to-subscribe">How to subscribe</h2>
+ <button type="button" class="button secondary" onclick="window.location.href="https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/how-to-subscribe.adoc"" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i> Edit</button>
+ <div class="sectionbody">
+ <div class="paragraph">
+ <p>To subscribe to the <code>users</code> mailing list:</p>
+ </div>
+ <div class="ulist">
+ <ul>
+ <li> <p>send a blank email to <a href="mailto:users-subscribe@isis.apache.org">users-subscribe@isis.apache.org</a></p> </li>
+ <li> <p>You\u2019ll then get back a confirmation email.</p> </li>
+ <li> <p>To confirm, all you generally need to do is to send a blank reply (there are more detailed instructions inside that confirmation mail if that doesn\u2019t work)</p> </li>
+ </ul>
+ </div>
+ <div class="paragraph">
+ <p>Then, to ask questions, simply mail to <a href="mailto:users@isis.apache.org">users@isis.apache.org</a> (nb: no <code>-subscribe</code> suffix this time).</p>
+ </div>
+ <div class="paragraph">
+ <p>If you ever want to unsubscribe, then you can send a mail to the <code>users-unsubscribe</code> email address.</p>
+ </div>
+ </div>
+ </div>
+ <div class="sect1">
+ <h2 id="mailing-list-etiquette">Mailing list etiquette</h2>
+ <button type="button" class="button secondary" onclick="window.location.href="https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/mailing-list-etiquette.adoc"" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i> Edit</button>
+ <div class="sectionbody">
+ <div class="paragraph">
+ <p>Just a couple of rules/suggestions:</p>
+ </div>
+ <div class="ulist">
+ <ul>
+ <li> <p>if you are referencing links, then in the body of the mail, number then [1], [2], [3] etc and then list them at the end.</p> </li>
+ <li> <p>reply to a previous post in the <a href="http://en.wikipedia.org/wiki/Posting_style#Interleaved_style">interleaved style</a> (adding your replies in-line). Try not to <a href="http://en.wikipedia.org/wiki/Posting_style#Top-posting)">top-post</a>.</p> </li>
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+ <footer>
+ <hr>
+ <p class="small"> Copyright � 2010~2016 The Apache Software Foundation, licensed under the Apache License, v2.0. <br> Apache, the Apache feather logo, Apache Isis, and the Apache Isis project logo are all trademarks of The Apache Software Foundation. </p>
+ </footer>
+ </div>
+ <div id="doc-content-right" class="large-3 medium-3 xcolumns">
+ <div id="toc" class="toc2">
+ <div class="fallback-toc">
+ <ul class="sectlevel1">
+ <li><a href="#how-to-subscribe">How to subscribe</a></li>
+ <li><a href="#mailing-list-etiquette">Mailing list etiquette</a></li>
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+ <script src="./js/foundation/5.5.1/vendor/jquery.js"></script>
+ <script src="./js/foundation/5.5.1/foundation.min.js"></script>
+ <link href="./css/jquery.tocify/1.9.0/jquery.tocify.css" rel="stylesheet">
+ <script src="./js/jqueryui/1.11.4/jquery-ui.min.js"></script>
+ <script src="./js/jquery.tocify/1.9.0/jquery.tocify.js"></script>
+ <script type="text/javascript">
$(function () {
$("#toc").tocify({
scrollTo: 50,
@@ -645,9 +576,8 @@ table.CodeRay td.code>pre{padding:0}
});
$(".fallback-toc").hide();
});
-</script>
-
-<script type="text/javascript">
+</script>
+ <script type="text/javascript">
/****
@@ -757,9 +687,8 @@ table.CodeRay td.code>pre{padding:0}
***/
-</script>
-
-<script type="text/javascript">
+</script>
+ <script type="text/javascript">
$(document).ready(function(){
if("Documentation" === "Mailing lists") {
@@ -771,10 +700,8 @@ $(document).ready(function(){
});
-</script>
-
-
-<script>
+</script>
+ <script>
$( document ).ready(function() {
@@ -865,7 +792,6 @@ $( document ).ready(function() {
});
-</script>
-
-</body>
+</script>
+ </body>
</html>
[41/44] isis-site git commit: ISIS-1594: provide an 'edit' button
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/83a3755a/content/guides/cgcom.html
----------------------------------------------------------------------
diff --git a/content/guides/cgcom.html b/content/guides/cgcom.html
index 90f050b..cdfb151 100644
--- a/content/guides/cgcom.html
+++ b/content/guides/cgcom.html
@@ -1,12 +1,10 @@
<!doctype html>
<html class="no-js" lang="en">
-<head>
- <meta charset="utf-8"/>
- <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-
- <title>Committers' Guide</title>
-
- <!--
+ <head>
+ <meta charset="utf-8">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+ <title>Committers' Guide</title>
+ <!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
@@ -23,31 +21,21 @@
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
- -->
-
- <!-- No caching headers -->
- <meta http-equiv="cache-control" content="no-cache" />
- <meta http-equiv="pragma" content="no-cache" />
- <meta http-equiv="expires" content="-1" />
-
-
- <!-- TODO: need to (re)instate CDN in the future (not using for now just so can develop off-line -->
- <link href="../css/foundation/5.5.1/foundation.css" rel="stylesheet" />
- <script src="../js/foundation/5.5.1/vendor/modernizr.js"></script>
- <link href="../css/asciidoctor/colony.css" rel="stylesheet">
- <link href="../css/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet">
-
-
-
-
- <link href="../css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.css" rel="stylesheet" />
- <!--[if lt IE 9]>
+ -->
+ <!-- No caching headers -->
+ <meta http-equiv="cache-control" content="no-cache">
+ <meta http-equiv="pragma" content="no-cache">
+ <meta http-equiv="expires" content="-1">
+ <!-- TODO: need to (re)instate CDN in the future (not using for now just so can develop off-line -->
+ <link href="../css/foundation/5.5.1/foundation.css" rel="stylesheet">
+ <script src="../js/foundation/5.5.1/vendor/modernizr.js"></script>
+ <link href="../css/asciidoctor/colony.css" rel="stylesheet">
+ <link href="../css/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet">
+ <link href="../css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.css" rel="stylesheet">
+ <!--[if lt IE 9]>
<link href="../css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.ie.css" rel="stylesheet" />
- <![endif]-->
-
-
-
- <style type="text/css">
+ <![endif]-->
+ <style type="text/css">
pre code {
background-color: inherit;
border-style: none;
@@ -192,9 +180,8 @@ table.CodeRay td.code>pre{padding:0}
color:#fff;
font-size: 1.1em;
}
- </style>
-
- <style>
+ </style>
+ <style>
@media only screen and (min-width: 40.063em) {
.top-bar {
.contain-to-grid .top-bar {
@@ -205,9 +192,8 @@ table.CodeRay td.code>pre{padding:0}
.row {
max-width: 80rem;
}
- </style>
-
- <style>
+ </style>
+ <style>
.extended-quote,
.extended-quote-first {
margin-left: 40px;
@@ -231,9 +217,8 @@ table.CodeRay td.code>pre{padding:0}
text-shadow: 0 1px 2px rgba(0, 0, 0, 0.1);
}
- </style>
-
- <style>
+ </style>
+ <style>
body {
position: relative;
}
@@ -255,6 +240,7 @@ table.CodeRay td.code>pre{padding:0}
div#doc-content {
margin-top: 30px;
+ padding-top: 30px;
}
div.documentation-page table.frame-all {
@@ -286,9 +272,8 @@ table.CodeRay td.code>pre{padding:0}
min-height: 2000px;
}
- </style>
-
- <style>
+ </style>
+ <style>
@media only screen and (min-width: 768px) {
#toc.toc2 ul ul { margin-left: -10px; }
@@ -316,15 +301,13 @@ table.CodeRay td.code>pre{padding:0}
body div#toc2 li.tocify-item.active a {
color: red;
}
- </style>
-
- <style>
+ </style>
+ <style>
footer {
margin-top: 1000px;
}
- </style>
-
- <style>
+ </style>
+ <style>
/* overriding colony.css stylesheet */
.literalblock pre, .literalblock pre[class], .listingblock pre, .listingblock pre[class] {
/*padding: 1.25em 1.5625em 1.125em 1.5625em;*/
@@ -372,9 +355,8 @@ table.CodeRay td.code>pre{padding:0}
.imageblock img {
margin-bottom: 10px;
}
- </style>
-
- <style>
+ </style>
+ <style>
/* from http://ben.balter.com/2014/03/13/pages-anchor-links/ */
.header-link {
position: absolute;
@@ -395,9 +377,8 @@ table.CodeRay td.code>pre{padding:0}
h6:hover .header-link {
opacity: 1;
}
- </style>
-
- <style>
+ </style>
+ <style>
.top-bar
{
-webkit-transition-duration: .5s;
@@ -425,273 +406,196 @@ table.CodeRay td.code>pre{padding:0}
-webkit-transition-property: -webkit-transform;
transition-property: transform;
}
- </style>
-
- <style>
+ </style>
+ <style>
#doc-content a.guide {
color: white;
}
- </style>
-
- <style>
+ </style>
+ <style>
+ .tocify {
+ margin-top: 80px;
+ }
+ </style>
+ <style>
.tocify {
margin-top: 80px;
}
- </style>
-
-
-</script>
-
-</head>
-<body>
-
-<<div class="github-fork-ribbon-wrapper right" style="position: fixed;">
- <div class="github-fork-ribbon">
- <a href="https://github.com/apache/isis#fork-destination-box">Fork me on GitHub</a>
- </div>
-</div>
-
-
-<div class="row">
-
- <div class="fixed contain-to-grid header">
- <nav class="top-bar" data-topbar role="navigation" style="max-width: 80rem">
- <ul class="title-area">
- <li class="name">
- <h1>
- <a href="/index.html">Apache Isis™</a>
- </h1>
- </li>
- <!-- Remove the class "menu-icon" to get rid of menu icon. Take out "Menu" to just have icon alone -->
- <li class="toggle-topbar menu-icon"><a href="#"><span>Menu</span></a></li>
- </ul>
-
- <section class="top-bar-section">
- <ul class="right">
-
- <li class="has-form">
- <FORM class="searchbox navbar-form navbar-right" id="searchbox_012614087480249044419:dn-q5gtwxya" action="http://www.google.com/cse">
- <div class="row collapse">
- <input type="hidden" name="cx" value="012614087480249044419:dn-q5gtwxya">
- <INPUT type="hidden" name="cof" value="FORID:0">
- <INPUT class="form-control" name="q" type="text" placeholder="Search">
- </div>
- </FORM>
- </li>
-
- </ul>
-
- <!-- Left Nav Section -->
- <ul class="left">
-
- <li><a href="/documentation.html">Documentation</a></li>
- <li><a href="/downloads.html">Downloads</a></li>
- <li><a href="/help.html">Help</a></li>
- <li><a href="/asf.html">@ASF</a></li>
-
- </ul>
-
- </section>
- </nav>
- </div>
-</div>
-
-<div class="row">
-
- <div id="doc-content-left" class="large-9 medium-9 columns">
-
-
- <div id="doc-content">
- <div class="sect1">
-<h2 id="_cgcom">1. Committers' Guide</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>This committers' guide is for committers of Apache Isis itself who want guidance on release process, publishing documents and other related procedures.</p>
-</div>
-<div class="sect2">
-<h3 id="_other_guides">1.1. Other Guides</h3>
-<div class="paragraph">
-<p>Apache Isis documentation is broken out into a number of user, reference and "supporting procedures" guides.</p>
-</div>
-<div class="paragraph">
-<p>The user guides available are:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="ugfun.html">Fundamentals</a></p>
-</li>
-<li>
-<p><a href="ugvw.html">Wicket viewer</a></p>
-</li>
-<li>
-<p><a href="ugvro.html">Restful Objects viewer</a></p>
-</li>
-<li>
-<p><a href="ugdno.html">DataNucleus object store</a></p>
-</li>
-<li>
-<p><a href="ugsec.html">Security</a></p>
-</li>
-<li>
-<p><a href="ugtst.html">Testing</a></p>
-</li>
-<li>
-<p><a href="ugbtb.html">Beyond the Basics</a></p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>The reference guides are:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="rgant.html">Annotations</a></p>
-</li>
-<li>
-<p><a href="rgsvc.html">Domain Services</a></p>
-</li>
-<li>
-<p><a href="rgcfg.html">Configuration Properties</a></p>
-</li>
-<li>
-<p><a href="rgcms.html">Classes, Methods and Schema</a></p>
-</li>
-<li>
-<p><a href="rgmvn.html">Apache Isis Maven plugin</a></p>
-</li>
-<li>
-<p><a href="rgfis.html">Framework Internal Services</a></p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>The remaining guides are:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="dg.html">Developers' Guide</a> (how to set up a development environment for Apache Isis and contribute back to the project)</p>
-</li>
-<li>
-<p><a href="#">Committers' Guide</a> (this guide)</p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>This guide provides guidance for Apache Isis' own committers.</p>
-</div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_cgcom_merging-a-pull-request">2. Merging a Pull Request</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>The process for merging in github pull requests (so that they can be tested locally before committing) has been scripted in the <code>github-pr.sh</code> script.</p>
-</div>
-<div class="paragraph">
-<p>The script will merge the fork into a temporary branch, and then run a build. Once you are happy, you can commit.</p>
-</div>
-<div class="sect2">
-<h3 id="_process_and_usage">2.1. Process and Usage</h3>
-<div class="paragraph">
-<p>The overall process is as follows:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>locate/raise corresponding JIRA ticket, eg ISIS-1162</p>
-</li>
-<li>
-<p>checkout branch from which PR was forked (usually just 'master')</p>
-</li>
-<li>
-<p>merge PR into temporary branch using the <code>github-pr.sh</code> script</p>
-</li>
-<li>
-<p>test the change locally (run the app, rebuild, manual regression tests etc)</p>
-</li>
-<li>
-<p>if required, tidy up/refactor code as required</p>
-</li>
-<li>
-<p>merge temporary branch into mainline, and commit</p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>This <a href="https://youtu.be/CKSLZBBHjME">screencast</a> also shows the process.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_prerequisites">2.2. Prerequisites</h3>
-<div class="paragraph">
-<p>The script uses 'jq' to parse JSON. To install:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>on Linux:<br></p>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="bash">aptitude install jq</code></pre>
-</div>
-</div>
-</li>
-<li>
-<p>on MacOS:<br></p>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="bash">brew install jq</code></pre>
-</div>
-</div>
-</li>
-<li>
-<p>on Windows:<br></p>
-<div class="paragraph">
-<p>Download exe from <a href="http://stedolan.github.io/jq/download/">website</a></p>
-</div>
-</li>
-</ul>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_syntax">2.3. Syntax</h3>
-<div class="paragraph">
-<p>The syntax is:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="bash">github-pr.sh isis 1162 31</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>where:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><code>isis</code> is the JIRA project and repo</p>
-</li>
-<li>
-<p><code>1162</code> is the JIRA ticket number</p>
-</li>
-<li>
-<p><code>31</code> is the gthub PR issue number</p>
-</li>
-</ul>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_example_transcript">2.4. Example transcript</h3>
-<div class="paragraph">
-<p>The listing below shows the steps taken by the script:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="bash">$ sh github-pr.sh isis 1162 31
+ </style>
+ </head>
+ <body>
+ <div class="row">
+ <div class="fixed contain-to-grid header">
+ <nav class="top-bar" data-topbar role="navigation" style="max-width: 80rem">
+ <ul class="title-area">
+ <li class="name"> <h1> <a href="/index.html">Apache Isis\u2122</a> </h1> </li>
+ <!-- Remove the class "menu-icon" to get rid of menu icon. Take out "Menu" to just have icon alone -->
+ <li class="toggle-topbar menu-icon"><a href="#"><span>Menu</span></a></li>
+ </ul>
+ <section class="top-bar-section">
+ <ul class="right">
+ <li class="has-form">
+ <form class="searchbox navbar-form navbar-right" id="searchbox_012614087480249044419:dn-q5gtwxya" action="http://www.google.com/cse">
+ <div class="row collapse">
+ <input type="hidden" name="cx" value="012614087480249044419:dn-q5gtwxya">
+ <input type="hidden" name="cof" value="FORID:0">
+ <input class="form-control" name="q" type="text" placeholder="Search">
+ </div>
+ </form> </li>
+ </ul>
+ <!-- Left Nav Section -->
+ <ul class="left">
+ <li><a href="/documentation.html">Documentation</a></li>
+ <li><a href="/downloads.html">Downloads</a></li>
+ <li><a href="/help.html">Help</a></li>
+ <li><a href="/asf.html">@ASF</a></li>
+ </ul>
+ </section>
+ </nav>
+ </div>
+ </div>
+ <div class="row">
+ <div id="doc-content-left" class="large-9 medium-9 columns">
+ <div id="doc-content">
+ <button type="button" class="button secondary" onclick="window.location.href="https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/cgcom.adoc"" style="float: right; font-size: small; padding: 6px; "><i class="fa fa-pencil-square-o"></i> Edit</button>
+ <div class="sect1">
+ <h2 id="_cgcom">1. Committers' Guide</h2>
+ <button type="button" class="button secondary" onclick="window.location.href="https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/_cgcom.adoc"" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i> Edit</button>
+ <div class="sectionbody">
+ <div class="paragraph">
+ <p>This committers' guide is for committers of Apache Isis itself who want guidance on release process, publishing documents and other related procedures.</p>
+ </div>
+ <div class="sect2">
+ <h3 id="_other_guides">1.1. Other Guides</h3>
+ <div class="paragraph">
+ <p>Apache Isis documentation is broken out into a number of user, reference and "supporting procedures" guides.</p>
+ </div>
+ <div class="paragraph">
+ <p>The user guides available are:</p>
+ </div>
+ <div class="ulist">
+ <ul>
+ <li> <p><a href="ugfun.html">Fundamentals</a></p> </li>
+ <li> <p><a href="ugvw.html">Wicket viewer</a></p> </li>
+ <li> <p><a href="ugvro.html">Restful Objects viewer</a></p> </li>
+ <li> <p><a href="ugdno.html">DataNucleus object store</a></p> </li>
+ <li> <p><a href="ugsec.html">Security</a></p> </li>
+ <li> <p><a href="ugtst.html">Testing</a></p> </li>
+ <li> <p><a href="ugbtb.html">Beyond the Basics</a></p> </li>
+ </ul>
+ </div>
+ <div class="paragraph">
+ <p>The reference guides are:</p>
+ </div>
+ <div class="ulist">
+ <ul>
+ <li> <p><a href="rgant.html">Annotations</a></p> </li>
+ <li> <p><a href="rgsvc.html">Domain Services</a></p> </li>
+ <li> <p><a href="rgcfg.html">Configuration Properties</a></p> </li>
+ <li> <p><a href="rgcms.html">Classes, Methods and Schema</a></p> </li>
+ <li> <p><a href="rgmvn.html">Apache Isis Maven plugin</a></p> </li>
+ <li> <p><a href="rgfis.html">Framework Internal Services</a></p> </li>
+ </ul>
+ </div>
+ <div class="paragraph">
+ <p>The remaining guides are:</p>
+ </div>
+ <div class="ulist">
+ <ul>
+ <li> <p><a href="dg.html">Developers' Guide</a> (how to set up a development environment for Apache Isis and contribute back to the project)</p> </li>
+ <li> <p><a href="#">Committers' Guide</a> (this guide)</p> </li>
+ </ul>
+ </div>
+ <div class="paragraph">
+ <p>This guide provides guidance for Apache Isis' own committers.</p>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="sect1">
+ <h2 id="_cgcom_merging-a-pull-request">2. Merging a Pull Request</h2>
+ <button type="button" class="button secondary" onclick="window.location.href="https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/_cgcom_merging-a-pull-request.adoc"" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i> Edit</button>
+ <div class="sectionbody">
+ <div class="paragraph">
+ <p>The process for merging in github pull requests (so that they can be tested locally before committing) has been scripted in the <code>github-pr.sh</code> script.</p>
+ </div>
+ <div class="paragraph">
+ <p>The script will merge the fork into a temporary branch, and then run a build. Once you are happy, you can commit.</p>
+ </div>
+ <div class="sect2">
+ <h3 id="_process_and_usage">2.1. Process and Usage</h3>
+ <div class="paragraph">
+ <p>The overall process is as follows:</p>
+ </div>
+ <div class="ulist">
+ <ul>
+ <li> <p>locate/raise corresponding JIRA ticket, eg ISIS-1162</p> </li>
+ <li> <p>checkout branch from which PR was forked (usually just 'master')</p> </li>
+ <li> <p>merge PR into temporary branch using the <code>github-pr.sh</code> script</p> </li>
+ <li> <p>test the change locally (run the app, rebuild, manual regression tests etc)</p> </li>
+ <li> <p>if required, tidy up/refactor code as required</p> </li>
+ <li> <p>merge temporary branch into mainline, and commit</p> </li>
+ </ul>
+ </div>
+ <div class="paragraph">
+ <p>This <a href="https://youtu.be/CKSLZBBHjME">screencast</a> also shows the process.</p>
+ </div>
+ </div>
+ <div class="sect2">
+ <h3 id="_prerequisites">2.2. Prerequisites</h3>
+ <div class="paragraph">
+ <p>The script uses 'jq' to parse JSON. To install:</p>
+ </div>
+ <div class="ulist">
+ <ul>
+ <li> <p>on Linux:<br></p>
+ <div class="listingblock">
+ <div class="content">
+ <pre class="CodeRay highlight"><code data-lang="bash">aptitude install jq</code></pre>
+ </div>
+ </div> </li>
+ <li> <p>on MacOS:<br></p>
+ <div class="listingblock">
+ <div class="content">
+ <pre class="CodeRay highlight"><code data-lang="bash">brew install jq</code></pre>
+ </div>
+ </div> </li>
+ <li> <p>on Windows:<br></p>
+ <div class="paragraph">
+ <p>Download exe from <a href="http://stedolan.github.io/jq/download/">website</a></p>
+ </div> </li>
+ </ul>
+ </div>
+ </div>
+ <div class="sect2">
+ <h3 id="_syntax">2.3. Syntax</h3>
+ <div class="paragraph">
+ <p>The syntax is:</p>
+ </div>
+ <div class="listingblock">
+ <div class="content">
+ <pre class="CodeRay highlight"><code data-lang="bash">github-pr.sh isis 1162 31</code></pre>
+ </div>
+ </div>
+ <div class="paragraph">
+ <p>where:</p>
+ </div>
+ <div class="ulist">
+ <ul>
+ <li> <p><code>isis</code> is the JIRA project and repo</p> </li>
+ <li> <p><code>1162</code> is the JIRA ticket number</p> </li>
+ <li> <p><code>31</code> is the gthub PR issue number</p> </li>
+ </ul>
+ </div>
+ </div>
+ <div class="sect2">
+ <h3 id="_example_transcript">2.4. Example transcript</h3>
+ <div class="paragraph">
+ <p>The listing below shows the steps taken by the script:</p>
+ </div>
+ <div class="listingblock">
+ <div class="content">
+ <pre class="CodeRay highlight"><code data-lang="bash">$ sh github-pr.sh isis 1162 31
Found JIRA ticket
Found github PR
@@ -716,97 +620,88 @@ Merge made by the 'recursive' strategy.
.../apache/isis/security/shiro/IsisLdapRealm.java | 198 +++++++++++++++++++--
2 files changed, 186 insertions(+), 15 deletions(-)
-Merged the PR; hit enter to build</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>The build now commences. Once done, the script continues:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="bash">If build successful and happy to merge, execute:
-
-git checkout master && git merge --no-ff ISIS-1162_pr-31 && git branch -d ISIS-1162_pr-31</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>The screenshot belows shows the history we end up with:</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<a class="image" href="images/committers/github-pr-history.png"><img src="images/committers/github-pr-history.png" alt="github pr history"></a>
-</div>
-</div>
-<div class="paragraph">
-<p>This shows the fork being merged into the temporary branch ("ISIS-1162_pr-31"), then some further tidy-up, and finally the merging of the temporary branch into mainline.</p>
-</div>
-<div class="paragraph">
-<p>Note that there is no rebasing in this model. This is intentional: when the merged branch is pushed, github will automatically close the original pull request.</p>
-</div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_cgcom_cutting-a-release">3. Cutting a Release</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>The release process consists of:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>the release manager cutting the release (documented below)</p>
-</li>
-<li>
-<p>Members of the Apache Isis PMC <a href="#_cgcom_verifying-releases">verifying</a> and voting on the release</p>
-</li>
-<li>
-<p>the release manager performing post-release tasks, for either a <a href="#_cgcom_post-release-successful">successful</a> or an <a href="#_cgcom_post-release-unsuccessful">unsuccessful</a> vote.</p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>Apache Isis itself consists of two separately releasable modules; relative to the <a href="https://git-wip-us.apache.org/repos/asf/isis/repo?p=isis.git;a=tree">source code root</a> there are:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><code>core</code></p>
-</li>
-<li>
-<p><code>component/example/archetypes/simpleapp</code></p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>This section details the process for formally releasing Isis modules. It describes the process for both <code>core</code> and then the archetype. The subsequent sections describe how other committers can <a href="#_cgcom_verifying-releases">verify a release</a> and how the release manager can then perform <a href="#_cgcom_post-release">post-release</a> activities and set up for the next development iteration.</p>
-</div>
-<div class="paragraph">
-<p>If you’ve not performed a release before, then note that there are some configuration <a href="#_cgcom_release-process-prereqs">prerequisites</a> that must be configured first. In particular, you’ll need signed public/private keys, and the ASF Nexus staging repo inlocal <code>~/.m2/settings.xml</code> file.</p>
-</div>
-<div class="paragraph">
-<p>These release notes using bash command line tools. They should work on Linux and MacOS; for Windows, use mSysGit.</p>
-</div>
-<div class="sect2">
-<h3 id="_cgcom_cutting-a-release_obtain-consensus">3.1. Obtain Consensus</h3>
-<div class="paragraph">
-<p>Before releasing <code>core</code>, ensure there is consensus on the <a href="../support.html">dev mailing list</a> that this is the right time for a release. The discussion should include confirming the version number to be used, and to confirm content.</p>
-</div>
-<div class="paragraph">
-<p>These discussions should also confirm the version number of the module being released. This should be in line with our <a href="#_cgcom_versioning-policy">semantic versioning policy</a>.</p>
-</div>
-<div class="paragraph">
-<p>Make sure you have a JIRA ticket open against which to perform all commits. In most cases a JIRA ticket will have been created at the beginning of the previous release cycle.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_cgcom_cutting-a-release_set-environment-variables">3.2. Set environment variables</h3>
-<div class="paragraph">
-<p>We use environment variables to parameterize as many of the steps as possible. For example:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="bash">cd core
+Merged the PR; hit enter to build</code></pre>
+ </div>
+ </div>
+ <div class="paragraph">
+ <p>The build now commences. Once done, the script continues:</p>
+ </div>
+ <div class="listingblock">
+ <div class="content">
+ <pre class="CodeRay highlight"><code data-lang="bash">If build successful and happy to merge, execute:
+
+git checkout master && git merge --no-ff ISIS-1162_pr-31 && git branch -d ISIS-1162_pr-31</code></pre>
+ </div>
+ </div>
+ <div class="paragraph">
+ <p>The screenshot belows shows the history we end up with:</p>
+ </div>
+ <div class="imageblock">
+ <div class="content">
+ <a class="image" href="images/committers/github-pr-history.png"><img src="images/committers/github-pr-history.png" alt="github pr history"></a>
+ </div>
+ </div>
+ <div class="paragraph">
+ <p>This shows the fork being merged into the temporary branch ("ISIS-1162_pr-31"), then some further tidy-up, and finally the merging of the temporary branch into mainline.</p>
+ </div>
+ <div class="paragraph">
+ <p>Note that there is no rebasing in this model. This is intentional: when the merged branch is pushed, github will automatically close the original pull request.</p>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="sect1">
+ <h2 id="_cgcom_cutting-a-release">3. Cutting a Release</h2>
+ <button type="button" class="button secondary" onclick="window.location.href="https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/_cgcom_cutting-a-release.adoc"" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i> Edit</button>
+ <div class="sectionbody">
+ <div class="paragraph">
+ <p>The release process consists of:</p>
+ </div>
+ <div class="ulist">
+ <ul>
+ <li> <p>the release manager cutting the release (documented below)</p> </li>
+ <li> <p>Members of the Apache Isis PMC <a href="#_cgcom_verifying-releases">verifying</a> and voting on the release</p> </li>
+ <li> <p>the release manager performing post-release tasks, for either a <a href="#_cgcom_post-release-successful">successful</a> or an <a href="#_cgcom_post-release-unsuccessful">unsuccessful</a> vote.</p> </li>
+ </ul>
+ </div>
+ <div class="paragraph">
+ <p>Apache Isis itself consists of two separately releasable modules; relative to the <a href="https://git-wip-us.apache.org/repos/asf/isis/repo?p=isis.git;a=tree">source code root</a> there are:</p>
+ </div>
+ <div class="ulist">
+ <ul>
+ <li> <p><code>core</code></p> </li>
+ <li> <p><code>component/example/archetypes/simpleapp</code></p> </li>
+ </ul>
+ </div>
+ <div class="paragraph">
+ <p>This section details the process for formally releasing Isis modules. It describes the process for both <code>core</code> and then the archetype. The subsequent sections describe how other committers can <a href="#_cgcom_verifying-releases">verify a release</a> and how the release manager can then perform <a href="#_cgcom_post-release">post-release</a> activities and set up for the next development iteration.</p>
+ </div>
+ <div class="paragraph">
+ <p>If you\u2019ve not performed a release before, then note that there are some configuration <a href="#_cgcom_release-process-prereqs">prerequisites</a> that must be configured first. In particular, you\u2019ll need signed public/private keys, and the ASF Nexus staging repo inlocal <code>~/.m2/settings.xml</code> file.</p>
+ </div>
+ <div class="paragraph">
+ <p>These release notes using bash command line tools. They should work on Linux and MacOS; for Windows, use mSysGit.</p>
+ </div>
+ <div class="sect2">
+ <h3 id="_cgcom_cutting-a-release_obtain-consensus">3.1. Obtain Consensus</h3>
+ <div class="paragraph">
+ <p>Before releasing <code>core</code>, ensure there is consensus on the <a href="../support.html">dev mailing list</a> that this is the right time for a release. The discussion should include confirming the version number to be used, and to confirm content.</p>
+ </div>
+ <div class="paragraph">
+ <p>These discussions should also confirm the version number of the module being released. This should be in line with our <a href="#_cgcom_versioning-policy">semantic versioning policy</a>.</p>
+ </div>
+ <div class="paragraph">
+ <p>Make sure you have a JIRA ticket open against which to perform all commits. In most cases a JIRA ticket will have been created at the beginning of the previous release cycle.</p>
+ </div>
+ </div>
+ <div class="sect2">
+ <h3 id="_cgcom_cutting-a-release_set-environment-variables">3.2. Set environment variables</h3>
+ <div class="paragraph">
+ <p>We use environment variables to parameterize as many of the steps as possible. For example:</p>
+ </div>
+ <div class="listingblock">
+ <div class="content">
+ <pre class="CodeRay highlight"><code data-lang="bash">cd core
export ISISTMP=/c/tmp <i class="conum" data-value="1"></i><b>(1)</b>
export ISISDEV=1.16.0-SNAPSHOT
export ISISREL=1.15.0
@@ -815,321 +710,309 @@ export ISISBRANCH=release-$ISISREL-$ISISRC
export ISISJIRA=ISIS-9999 <i class="conum" data-value="2"></i><b>(2)</b>
export CATALINA_HOME=/c/java/apache-tomcat-8.0.30 <i class="conum" data-value="3"></i><b>(3)</b>
-env | grep ISIS | sort</code></pre>
-</div>
-</div>
-<div class="colist arabic">
-<table>
-<tr>
-<td><i class="conum" data-value="1"></i><b>1</b></td>
-<td>adjust by platform</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="2"></i><b>2</b></td>
-<td>set to an "umbrella" ticket for all release activities. (One should exist already, <a href="#_cgcom_post-release-successful_update-jira_create-new-jira">created at</a> the beginning of the development cycle now completing).</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="3"></i><b>3</b></td>
-<td>adjust as required (Tomcat is used to smoke test the simpleapp archetype)</td>
-</tr>
-</table>
-</div>
-<div class="paragraph">
-<p>Obviously, alter <code>$ISISDEV</code> and <code>$ISISREL</code> as required, and bump <code>$ISISRC</code> for re-releasing following an <a href="#_cgcom_post-release-unsuccessful">unsuccessful</a> releases.</p>
-</div>
-<div class="admonitionblock important">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-important" title="Important"></i>
-</td>
-<td class="content">
-<div class="paragraph">
-<p>Note that the branch name is <strong>not</strong> the same any of the eventual tag names (eg <code>isis-1.15.0</code> or <code>simpleapp-archetype-1.15.0</code>).</p>
-</div>
-<div class="paragraph">
-<p>If they did have the same name, then what would happen is that the <code>maven-release-plugin</code> would checkout the (HEAD of the) branch and thus upload a SNAPSHOT to the snapshot repository. What it should of course do is checkout the tag and then upload that to the release staging repository.</p>
-</div>
-</td>
-</tr>
-</table>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_cgcom_cutting-a-release_pull-down-code-to-release">3.3. Pull down code to release</h3>
-<div class="paragraph">
-<p>Set the HEAD of your local git repo to the commit to be released. This will usually be the tip of the origin’s <code>master</code> branch. Then, create a release branch for the version number being released; eg:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="bash">git checkout master
+env | grep ISIS | sort</code></pre>
+ </div>
+ </div>
+ <div class="colist arabic">
+ <table>
+ <tbody>
+ <tr>
+ <td><i class="conum" data-value="1"></i><b>1</b></td>
+ <td>adjust by platform</td>
+ </tr>
+ <tr>
+ <td><i class="conum" data-value="2"></i><b>2</b></td>
+ <td>set to an "umbrella" ticket for all release activities. (One should exist already, <a href="#_cgcom_post-release-successful_update-jira_create-new-jira">created at</a> the beginning of the development cycle now completing).</td>
+ </tr>
+ <tr>
+ <td><i class="conum" data-value="3"></i><b>3</b></td>
+ <td>adjust as required (Tomcat is used to smoke test the simpleapp archetype)</td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ <div class="paragraph">
+ <p>Obviously, alter <code>$ISISDEV</code> and <code>$ISISREL</code> as required, and bump <code>$ISISRC</code> for re-releasing following an <a href="#_cgcom_post-release-unsuccessful">unsuccessful</a> releases.</p>
+ </div>
+ <div class="admonitionblock important">
+ <table>
+ <tbody>
+ <tr>
+ <td class="icon"> <i class="fa icon-important" title="Important"></i> </td>
+ <td class="content">
+ <div class="paragraph">
+ <p>Note that the branch name is <strong>not</strong> the same any of the eventual tag names (eg <code>isis-1.15.0</code> or <code>simpleapp-archetype-1.15.0</code>).</p>
+ </div>
+ <div class="paragraph">
+ <p>If they did have the same name, then what would happen is that the <code>maven-release-plugin</code> would checkout the (HEAD of the) branch and thus upload a SNAPSHOT to the snapshot repository. What it should of course do is checkout the tag and then upload that to the release staging repository.</p>
+ </div> </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ </div>
+ <div class="sect2">
+ <h3 id="_cgcom_cutting-a-release_pull-down-code-to-release">3.3. Pull down code to release</h3>
+ <div class="paragraph">
+ <p>Set the HEAD of your local git repo to the commit to be released. This will usually be the tip of the origin\u2019s <code>master</code> branch. Then, create a release branch for the version number being released; eg:</p>
+ </div>
+ <div class="listingblock">
+ <div class="content">
+ <pre class="CodeRay highlight"><code data-lang="bash">git checkout master
git pull --ff-only
-git checkout -b $ISISBRANCH</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>All release preparation is done locally; if we are successful, this branch will be merged back into master.</p>
-</div>
-<div class="paragraph">
-<p>Double check that the version number of the parent pom should reflect the branch name that you are now on (with a <code>-SNAPSHOT</code> suffix). his will normally have been done already during earlier development; but confirm that it has been updated. If it has not, make the change.</p>
-</div>
-<div class="paragraph">
-<p>Double check that the version number of the core POM (<code>core/pom.xml</code>) should reflect the branch name that you are now on. For example, if releasing version <code>1.15.0</code>, the POM should read:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="xml"><span class="tag"><groupId></span>org.apache.isis.core<span class="tag"></groupId></span>
+git checkout -b $ISISBRANCH</code></pre>
+ </div>
+ </div>
+ <div class="paragraph">
+ <p>All release preparation is done locally; if we are successful, this branch will be merged back into master.</p>
+ </div>
+ <div class="paragraph">
+ <p>Double check that the version number of the parent pom should reflect the branch name that you are now on (with a <code>-SNAPSHOT</code> suffix). his will normally have been done already during earlier development; but confirm that it has been updated. If it has not, make the change.</p>
+ </div>
+ <div class="paragraph">
+ <p>Double check that the version number of the core POM (<code>core/pom.xml</code>) should reflect the branch name that you are now on. For example, if releasing version <code>1.15.0</code>, the POM should read:</p>
+ </div>
+ <div class="listingblock">
+ <div class="content">
+ <pre class="CodeRay highlight"><code data-lang="xml"><span class="tag"><groupId></span>org.apache.isis.core<span class="tag"></groupId></span>
<span class="tag"><artifactId></span>isis<span class="tag"></artifactId></span>
-<span class="tag"><version></span>1.16.0-SNAPSHOT<span class="tag"></version></span></code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>Also, check that there are no snapshot dependencies:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="bash">grep SNAPSHOT `/bin/find . -name pom.xml | grep -v target | grep -v mothball | sort`</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>The only mention of <code>SNAPSHOT</code> should be for the Isis modules about to be released.</p>
-</div>
-<div class="admonitionblock tip">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-tip" title="Tip"></i>
-</td>
-<td class="content">
-<div class="paragraph">
-<p>Obviously, don’t update Apache Isis' <code>SNAPSHOT</code> references; these get updated by the <code>mvn release:prepare</code> command we run later.</p>
-</div>
-</td>
-</tr>
-</table>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_cgcom_cutting-a-release_releasing-core">3.4. Releasing Core</h3>
-<div class="paragraph">
-<p>First, we release <code>core</code>. Switch to the appropriate directory:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="bash">cd core</code></pre>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_cgcom_cutting-a-release_releasing-core_set-environment-variables">3.4.1. Set environment variables</h4>
-<div class="paragraph">
-<p>Set additional environment variables for the core "artifact":</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="bash">export ISISART=isis
-export ISISCOR="Y"
-
-env | grep ISIS | sort</code></pre>
-</div>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_cgcom_cutting-a-release_releasing-core_license-headers">3.4.2. License headers</h4>
-<div class="paragraph">
-<p>The Apache Release Audit Tool <code>RAT</code> (from the <a href="http://creadur.apache.org">Apache Creadur</a> project) checks for missing license header files. The parent <code>pom.xml</code> of each releasable module specifies the RAT Maven plugin, with a number of custom exclusions.</p>
-</div>
-<div class="paragraph">
-<p>To run the RAT tool, use:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="bash">mvn org.apache.rat:apache-rat-plugin:check -D rat.numUnapprovedLicenses=50 -o && \
+<span class="tag"><version></span>1.16.0-SNAPSHOT<span class="tag"></version></span></code></pre>
+ </div>
+ </div>
+ <div class="paragraph">
+ <p>Also, check that there are no snapshot dependencies:</p>
+ </div>
+ <div class="listingblock">
+ <div class="content">
+ <pre class="CodeRay highlight"><code data-lang="bash">grep SNAPSHOT `/bin/find . -name pom.xml | grep -v target | grep -v mothball | sort`</code></pre>
+ </div>
+ </div>
+ <div class="paragraph">
+ <p>The only mention of <code>SNAPSHOT</code> should be for the Isis modules about to be released.</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>Obviously, don\u2019t update Apache Isis' <code>SNAPSHOT</code> references; these get updated by the <code>mvn release:prepare</code> command we run later.</p>
+ </div> </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ </div>
+ <div class="sect2">
+ <h3 id="_cgcom_cutting-a-release_releasing-core">3.4. Releasing Core</h3>
+ <div class="paragraph">
+ <p>First, we release <code>core</code>. Switch to the appropriate directory:</p>
+ </div>
+ <div class="listingblock">
+ <div class="content">
+ <pre class="CodeRay highlight"><code data-lang="bash">cd core</code></pre>
+ </div>
+ </div>
+ <div class="sect3">
+ <h4 id="_cgcom_cutting-a-release_releasing-core_set-environment-variables">3.4.1. Set environment variables</h4>
+ <div class="paragraph">
+ <p>Set additional environment variables for the core "artifact":</p>
+ </div>
+ <div class="listingblock">
+ <div class="content">
+ <pre class="CodeRay highlight"><code data-lang="bash">export ISISART=isis
+export ISISCOR="Y"
+
+env | grep ISIS | sort</code></pre>
+ </div>
+ </div>
+ </div>
+ <div class="sect3">
+ <h4 id="_cgcom_cutting-a-release_releasing-core_license-headers">3.4.2. License headers</h4>
+ <div class="paragraph">
+ <p>The Apache Release Audit Tool <code>RAT</code> (from the <a href="http://creadur.apache.org">Apache Creadur</a> project) checks for missing license header files. The parent <code>pom.xml</code> of each releasable module specifies the RAT Maven plugin, with a number of custom exclusions.</p>
+ </div>
+ <div class="paragraph">
+ <p>To run the RAT tool, use:</p>
+ </div>
+ <div class="listingblock">
+ <div class="content">
+ <pre class="CodeRay highlight"><code data-lang="bash">mvn org.apache.rat:apache-rat-plugin:check -D rat.numUnapprovedLicenses=50 -o && \
for a in `/bin/find . -name rat.txt -print`; do grep '!???' $a; done || \
-for a in `/bin/find . -name rat.txt -print`; do grep '!AL' $a; done</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>where <code>rat.numUnapprovedLicenses</code> 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 <code>target\rat.txt</code> for each submodule. missing license notes are indicated using the key <code>!???</code>. The <code>for</code> command collates all the errors.</p>
-</div>
-<div class="paragraph">
-<p>Investigate and fix any reported violations, typically by either:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>adding genuinely missing license headers from Java (or other) source files, or</p>
-</li>
-<li>
-<p>updating the <code><excludes></code> element for the <code>apache-rat-plugin</code> plugin to ignore test files, log files and any other non-source code files</p>
-</li>
-<li>
-<p>also look to remove any stale <code><exclude></code> entries</p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>To add missing headers, use the groovy script <code>addmissinglicenses.groovy</code> (in the <code>scripts</code> directory) to automatically insert missing headers for certain file types. The actual files checked are those with extensions specified in the line <code>def fileEndings = [".java", ".htm"]</code>:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="bash">groovy ../scripts/addmissinglicenses.groovy -x</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>(If the <code>-x</code> is omitted then the script is run in "dry run" mode). Once you’ve fixed all issues, confirm once more that <code>apache-rat-plugin</code> no longer reports any license violations, this time leaving the <code>rat.numUnapprovedLicenses</code> property to its default, 0:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="bash">mvn org.apache.rat:apache-rat-plugin:check -D rat.numUnapprovedLicenses=0 -o && \
-for a in `find . -name rat.txt -print`; do grep '!???' $a; done</code></pre>
-</div>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_cgcom_cutting-a-release_releasing-core_missing-license-check">3.4.3. Missing License Check</h4>
-<div class="paragraph">
-<p>Although Apache Isis has no dependencies on artifacts with incompatible licenses, the POMs for some of these dependencies (in the Maven central repo) do not necessarily contain the required license information. Without appropriate additional configuration, this would result in the generated <code>DEPENDENCIES</code> file and generated Maven site indicating dependencies as having "unknown" licenses.</p>
-</div>
-<div class="paragraph">
-<p>Fortunately, Maven allows the missing information to be provided by configuring the <code>maven-remote-resources-plugin</code>. This is stored in the <code>src/main/appended-resources/supplemental-models.xml</code> file, relative to the root of each releasable module.</p>
-</div>
-<div class="paragraph">
-<p>To capture the missing license information, use:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="bash">mvn license:download-licenses && \
-groovy ../scripts/checkmissinglicenses.groovy</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>The Maven plugin creates a <code>license.xml</code> file in the <code>target/generated-resources</code> directory of each module. The script then searches for these <code>licenses.xml</code> files, and compares them against the contents of the <code>supplemental-models.xml</code> file.</p>
-</div>
-<div class="paragraph">
-<p>For example, the output could be something like:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="bash">licenses to add to supplemental-models.xml:
+for a in `/bin/find . -name rat.txt -print`; do grep '!AL' $a; done</code></pre>
+ </div>
+ </div>
+ <div class="paragraph">
+ <p>where <code>rat.numUnapprovedLicenses</code> 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 <code>target\rat.txt</code> for each submodule. missing license notes are indicated using the key <code>!???</code>. The <code>for</code> command collates all the errors.</p>
+ </div>
+ <div class="paragraph">
+ <p>Investigate and fix any reported violations, typically by either:</p>
+ </div>
+ <div class="ulist">
+ <ul>
+ <li> <p>adding genuinely missing license headers from Java (or other) source files, or</p> </li>
+ <li> <p>updating the <code><excludes></code> element for the <code>apache-rat-plugin</code> plugin to ignore test files, log files and any other non-source code files</p> </li>
+ <li> <p>also look to remove any stale <code><exclude></code> entries</p> </li>
+ </ul>
+ </div>
+ <div class="paragraph">
+ <p>To add missing headers, use the groovy script <code>addmissinglicenses.groovy</code> (in the <code>scripts</code> directory) to automatically insert missing headers for certain file types. The actual files checked are those with extensions specified in the line <code>def fileEndings = [".java", ".htm"]</code>:</p>
+ </div>
+ <div class="listingblock">
+ <div class="content">
+ <pre class="CodeRay highlight"><code data-lang="bash">groovy ../scripts/addmissinglicenses.groovy -x</code></pre>
+ </div>
+ </div>
+ <div class="paragraph">
+ <p>(If the <code>-x</code> is omitted then the script is run in "dry run" mode). Once you\u2019ve fixed all issues, confirm once more that <code>apache-rat-plugin</code> no longer reports any license violations, this time leaving the <code>rat.numUnapprovedLicenses</code> property to its default, 0:</p>
+ </div>
+ <div class="listingblock">
+ <div class="content">
+ <pre class="CodeRay highlight"><code data-lang="bash">mvn org.apache.rat:apache-rat-plugin:check -D rat.numUnapprovedLicenses=0 -o && \
+for a in `find . -name rat.txt -print`; do grep '!???' $a; done</code></pre>
+ </div>
+ </div>
+ </div>
+ <div class="sect3">
+ <h4 id="_cgcom_cutting-a-release_releasing-core_missing-license-check">3.4.3. Missing License Check</h4>
+ <div class="paragraph">
+ <p>Although Apache Isis has no dependencies on artifacts with incompatible licenses, the POMs for some of these dependencies (in the Maven central repo) do not necessarily contain the required license information. Without appropriate additional configuration, this would result in the generated <code>DEPENDENCIES</code> file and generated Maven site indicating dependencies as having "unknown" licenses.</p>
+ </div>
+ <div class="paragraph">
+ <p>Fortunately, Maven allows the missing information to be provided by configuring the <code>maven-remote-resources-plugin</code>. This is stored in the <code>src/main/appended-resources/supplemental-models.xml</code> file, relative to the root of each releasable module.</p>
+ </div>
+ <div class="paragraph">
+ <p>To capture the missing license information, use:</p>
+ </div>
+ <div class="listingblock">
+ <div class="content">
+ <pre class="CodeRay highlight"><code data-lang="bash">mvn license:download-licenses && \
+groovy ../scripts/checkmissinglicenses.groovy</code></pre>
+ </div>
+ </div>
+ <div class="paragraph">
+ <p>The Maven plugin creates a <code>license.xml</code> file in the <code>target/generated-resources</code> directory of each module. The script then searches for these <code>licenses.xml</code> files, and compares them against the contents of the <code>supplemental-models.xml</code> file.</p>
+ </div>
+ <div class="paragraph">
+ <p>For example, the output could be something like:</p>
+ </div>
+ <div class="listingblock">
+ <div class="content">
+ <pre class="CodeRay highlight"><code data-lang="bash">licenses to add to supplemental-models.xml:
[org.slf4j, slf4j-api, 1.5.7]
[org.codehaus.groovy, groovy-all, 1.7.2]
licenses to remove from supplemental-models.xml (are spurious):
-[org.slf4j, slf4j-api, 1.5.2]</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>If any missing entries are listed or are spurious, then update <code>supplemental-models.xml</code> and try again.</p>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_cgcom_cutting-a-release_releasing-core_commit-changes">3.4.4. Commit changes</h4>
-<div class="paragraph">
-<p>Commit any changes from the preceding steps:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="bash">git commit -am "$ISISJIRA: updates to pom.xml etc for release"</code></pre>
-</div>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_cgcom_cutting-a-release_releasing-core_sanity-check">3.4.5. Sanity check</h4>
-<div class="paragraph">
-<p>Perform one last sanity check on the codebase. Delete all Isis artifacts from your local Maven repo, then build using the <code>-o</code> offline flag:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="bash">rm -rf ~/.m2/repository/org/apache/isis
-mvn clean install -o</code></pre>
-</div>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_cgcom_cutting-a-release_releasing-core_release-prepare-dry-run">3.4.6. Release prepare "dry run"</h4>
-<div class="paragraph">
-<p>Most of the work is done using the <code>mvn release:prepare</code> 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.</p>
-</div>
-<div class="paragraph">
-<p>Run the dry-run as follows:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="bash">mvn release:prepare -P apache-release -D dryRun=true \
+[org.slf4j, slf4j-api, 1.5.2]</code></pre>
+ </div>
+ </div>
+ <div class="paragraph">
+ <p>If any missing entries are listed or are spurious, then update <code>supplemental-models.xml</code> and try again.</p>
+ </div>
+ </div>
+ <div class="sect3">
+ <h4 id="_cgcom_cutting-a-release_releasing-core_commit-changes">3.4.4. Commit changes</h4>
+ <div class="paragraph">
+ <p>Commit any changes from the preceding steps:</p>
+ </div>
+ <div class="listingblock">
+ <div class="content">
+ <pre class="CodeRay highlight"><code data-lang="bash">git commit -am "$ISISJIRA: updates to pom.xml etc for release"</code></pre>
+ </div>
+ </div>
+ </div>
+ <div class="sect3">
+ <h4 id="_cgcom_cutting-a-release_releasing-core_sanity-check">3.4.5. Sanity check</h4>
+ <div class="paragraph">
+ <p>Perform one last sanity check on the codebase. Delete all Isis artifacts from your local Maven repo, then build using the <code>-o</code> offline flag:</p>
+ </div>
+ <div class="listingblock">
+ <div class="content">
+ <pre class="CodeRay highlight"><code data-lang="bash">rm -rf ~/.m2/repository/org/apache/isis
+mvn clean install -o</code></pre>
+ </div>
+ </div>
+ </div>
+ <div class="sect3">
+ <h4 id="_cgcom_cutting-a-release_releasing-core_release-prepare-dry-run">3.4.6. Release prepare "dry run"</h4>
+ <div class="paragraph">
+ <p>Most of the work is done using the <code>mvn release:prepare</code> 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.</p>
+ </div>
+ <div class="paragraph">
+ <p>Run the dry-run as follows:</p>
+ </div>
+ <div class="listingblock">
+ <div class="content">
+ <pre class="CodeRay highlight"><code data-lang="bash">mvn release:prepare -P apache-release -D dryRun=true \
-DreleaseVersion=$ISISREL \
-Dtag=$ISISART-$ISISREL \
- -DdevelopmentVersion=$ISISDEV</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>You may be prompted for the gpg passphrase.</p>
-</div>
-<div class="admonitionblock note">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-note" title="Note"></i>
-</td>
-<td class="content">
-<div class="paragraph">
-<p>Experiments in using <code>--batch-mode -Dgpg.passphrase="…​"</code> to fully automate this didn’t work; for more info, see <a href="http://maven.apache.org/plugins/maven-gpg-plugin/sign-mojo.html">here</a> (maven release plugin docs) and <a href="http://maven.apache.org/maven-release/maven-release-plugin/examples/non-interactive-release.html">here</a> (maven gpg plugin docs).</p>
-</div>
-</td>
-</tr>
-</table>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_cgcom_cutting-a-release_releasing-core_release-prepare-proper">3.4.7. Release prepare "proper"</h4>
-<div class="paragraph">
-<p>Assuming this completes successfully, re-run the command, but without the <code>dryRun</code> flag and specifying <code>resume=false</code> (to ignore the generated <code>release.properties</code> file that gets generated as a side-effect of using <code>git</code>). You can also set the <code>skipTests</code> flag since they would have been run during the previous dry run:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="bash">mvn release:prepare -P apache-release -D resume=false -DskipTests=true \
+ -DdevelopmentVersion=$ISISDEV</code></pre>
+ </div>
+ </div>
+ <div class="paragraph">
+ <p>You may be prompted for the gpg passphrase.</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>Experiments in using <code>--batch-mode -Dgpg.passphrase="\u2026\u200b"</code> to fully automate this didn\u2019t work; for more info, see <a href="http://maven.apache.org/plugins/maven-gpg-plugin/sign-mojo.html">here</a> (maven release plugin docs) and <a href="http://maven.apache.org/maven-release/maven-release-plugin/examples/non-interactive-release.html">here</a> (maven gpg plugin docs).</p>
+ </div> </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ </div>
+ <div class="sect3">
+ <h4 id="_cgcom_cutting-a-release_releasing-core_release-prepare-proper">3.4.7. Release prepare "proper"</h4>
+ <div class="paragraph">
+ <p>Assuming this completes successfully, re-run the command, but without the <code>dryRun</code> flag and specifying <code>resume=false</code> (to ignore the generated <code>release.properties</code> file that gets generated as a side-effect of using <code>git</code>). You can also set the <code>skipTests</code> flag since they would have been run during the previous dry run:</p>
+ </div>
+ <div class="listingblock">
+ <div class="content">
+ <pre class="CodeRay highlight"><code data-lang="bash">mvn release:prepare -P apache-release -D resume=false -DskipTests=true \
-DreleaseVersion=$ISISREL \
-Dtag=$ISISART-$ISISREL \
- -DdevelopmentVersion=$ISISDEV</code></pre>
-</div>
-</div>
-<div class="admonitionblock tip">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-tip" title="Tip"></i>
-</td>
-<td class="content">
-<div class="paragraph">
-<p>If there are any snags at this stage, then explicitly delete the generated <code>release.properties</code> file first before trying again.</p>
-</div>
-</td>
-</tr>
-</table>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_cgcom_cutting-a-release_releasing-core_post-prepare-sanity-check">3.4.8. Post-prepare sanity check</h4>
-<div class="paragraph">
-<p>You should end up with artifacts in your local repo with the new version (eg <code>1.15.0</code>). This is a good time to do some quick sanity checks; nothing has yet been uploaded:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>unzip the source-release ZIP and check it builds.</p>
-</li>
-<li>
-<p>Inspect the <code>DEPENDENCIES</code> file, and check it looks correct.</p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>These steps can be performed using the following script:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code>rm -rf $ISISTMP/$ISISART-$ISISREL
+ -DdevelopmentVersion=$ISISDEV</code></pre>
+ </div>
+ </div>
+ <div class="admonitionblock tip">
+ <table>
+ <tbody>
+ <tr>
+ <td class="icon"> <i class="fa icon-tip" title="Tip"></i> </td>
+ <td class="content">
+ <div class="paragraph">
+ <p>If there are any snags at this stage, then explicitly delete the generated <code>release.properties</code> file first before trying again.</p>
+ </div> </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ </div>
+ <div class="sect3">
+ <h4 id="_cgcom_cutting-a-release_releasing-core_post-prepare-sanity-check">3.4.8. Post-prepare sanity check</h4>
+ <div class="paragraph">
+ <p>You should end up with artifacts in your local repo with the new version (eg <code>1.15.0</code>). This is a good time to do some quick sanity checks; nothing has yet been uploaded:</p>
+ </div>
+ <div class="ulist">
+ <ul>
+ <li> <p>unzip the source-release ZIP and check it builds.</p> </li>
+ <li> <p>Inspect the <code>DEPENDENCIES</code> file, and check it looks correct.</p> </li>
+ </ul>
+ </div>
+ <div class="paragraph">
+ <p>These steps can be performed using the following script:</p>
+ </div>
+ <div class="listingblock">
+ <div class="content">
+ <pre class="CodeRay highlight"><code>rm -rf $ISISTMP/$ISISART-$ISISREL
mkdir $ISISTMP/$ISISART-$ISISREL
if [ "$ISISCOR" == "Y" ]; then
@@ -1148,308 +1031,285 @@ mvn clean install
cat DEPENDENCIES
-popd</code></pre>
-</div>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_cgcom_cutting-a-release_releasing-core_release-perform-upload">3.4.9. Release perform (Upload)</h4>
-<div class="paragraph">
-<p>Once the release has been built locally, it should be uploaded for voting. This is done by deploying the Maven artifacts to a staging directory (this includes the source release ZIP file which will be voted upon).</p>
-</div>
-<div class="paragraph">
-<p>The Apache staging repository runs on Nexus server, hosted at <a href="https://repository.apache.org">repository.apache.org</a>. The process of uploading will create a staging repository that is associated with the host (IP address) performing the release. Once the repository is staged, the newly created staging repository is "closed" in order to make it available to others.</p>
-</div>
-<div class="paragraph">
-<p>Use:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="bash">mvn release:perform -P apache-release \
- -DworkingDirectory=$ISISTMP/$ISISART-$ISISREL/checkout</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>The custom <code>workingDirectory</code> prevents file path issues if releasing on Windows. The command checks out the codebase from the tag, then builds the artifacts, then uploads them to the Apache staging repository:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="bash">...
+popd</code></pre>
+ </div>
+ </div>
+ </div>
+ <div class="sect3">
+ <h4 id="_cgcom_cutting-a-release_releasing-core_release-perform-upload">3.4.9. Release perform (Upload)</h4>
+ <div class="paragraph">
+ <p>Once the release has been built locally, it should be uploaded for voting. This is done by deploying the Maven artifacts to a staging directory (this includes the source release ZIP file which will be voted upon).</p>
+ </div>
+ <div class="paragraph">
+ <p>The Apache staging repository runs on Nexus server, hosted at <a href="https://repository.apache.org">repository.apache.org</a>. The process of uploading will create a staging repository that is associated with the host (IP address) performing the release. Once the repository is staged, the newly created staging repository is "closed" in order to make it available to others.</p>
+ </div>
+ <div class="paragraph">
+ <p>Use:</p>
+ </div>
+ <div class="listingblock">
+ <div class="content">
+ <pre class="CodeRay highlight"><code data-lang="bash">mvn release:perform -P apache-release \
+ -DworkingDirectory=$ISISTMP/$ISISART-$ISISREL/checkout</code></pre>
+ </div>
+ </div>
+ <div class="paragraph">
+ <p>The custom <code>workingDirectory</code> prevents file path issues if releasing on Windows. The command checks out the codebase from the tag, then builds the artifacts, then uploads them to the Apache staging repository:</p>
+ </div>
+ <div class="listingblock">
+ <div class="content">
+ <pre class="CodeRay highlight"><code data-lang="bash">...
[INFO] --- maven-release-plugin:2.3.2:perform (default-cli) @ isis ---
[INFO] Performing a LOCAL checkout from scm:git:file:///C:\APACHE\isis-git-rw\co
re
[INFO] Checking out the project to perform the release ...
-[INFO] Executing: cmd.exe /X /C "git clone --branch release-1.15.0 file:///C:\APACHE\isis-git-rw\core C:\APACHE\isis-git-rw\core\target\checkout"
+[INFO] Executing: cmd.exe /X /C "git clone --branch release-1.15.0 file:///C:\APACHE\isis-git-rw\core C:\APACHE\isis-git-rw\core\target\checkout"
[INFO] Working directory: C:\APACHE\isis-git-rw\core\target
[INFO] Performing a LOCAL checkout from scm:git:file:///C:\APACHE\isis-git-rw
[INFO] Checking out the project to perform the release ...
-[INFO] Executing: cmd.exe /X /C "git clone --branch release-1.15.0 file:///C:\APACHE\isis-git-rw C:\APACHE\isis-git-rw\core\target\checkout"
+[INFO] Executing: cmd.exe /X /C "git clone --branch release-1.15.0 file:///C:\APACHE\isis-git-rw C:\APACHE\isis-git-rw\core\target\checkout"
[INFO] Working directory: C:\APACHE\isis-git-rw\core\target
-[INFO] Executing: cmd.exe /X /C "git ls-remote file:///C:\APACHE\isis-git-rw"
+[INFO] Executing: cmd.exe /X /C "git ls-remote file:///C:\APACHE\isis-git-rw"
[INFO] Working directory: C:\Users\ADMINI~1\AppData\Local\Temp
-[INFO] Executing: cmd.exe /X /C "git fetch file:///C:\APACHE\isis-git-rw"
+[INFO] Executing: cmd.exe /X /C "git fetch file:///C:\APACHE\isis-git-rw"
[INFO] Working directory: C:\APACHE\isis-git-rw\core\target\checkout
-[INFO] Executing: cmd.exe /X /C "git checkout release-1.15.0"
+[INFO] Executing: cmd.exe /X /C "git checkout release-1.15.0"
[INFO] Working directory: C:\APACHE\isis-git-rw\core\target\checkout
-[INFO] Executing: cmd.exe /X /C "git ls-files"
+[INFO] Executing: cmd.exe /X /C "git ls-files"
[INFO] Working directory: C:\APACHE\isis-git-rw\core\target\checkout
[INFO] Invoking perform goals in directory C:\APACHE\isis-git-rw\core\target\checkout\core
[INFO] Executing goals 'deploy'...
-...</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>You may (again) be prompted for gpg passphrase. All being well this command will complete successfully. Given that it is uploading code artifacts, it could take a while to complete.</p>
-</div>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_cgcom_cutting-a-release_releasing-the-archetype">3.5. Releasing the Archetype</h3>
-<div class="paragraph">
-<p>Apache Isis archetypes are reverse engineered from example applications.
-Once reverse engineered, the source is checked into git (replacing any earlier version of the archetype) and released.</p>
-</div>
-<div class="admonitionblock note">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-note" title="Note"></i>
-</td>
-<td class="content">
-<div class="paragraph">
-<p>If releasing using Windows and Maven >= 3.3.3, then there is an issue that requires a small workaround.</p>
-</div>
-<div class="paragraph">
-<p>In Maven 3.3.3 the <code>mvn.bat</code> file was removed, replaced instead with <code>mvn.cmd</code>.
-However, <code>maven-archetype-plugin:2.4</code> only uses <code>mvn.bat</code>; this causes the <code>archetype:create-from-project</code> goal to fail.
-The fix is to simple: just copy <code>mvn.cmd</code> to <code>mvn.bat</code>.</p>
-</div>
-</td>
-</tr>
-</table>
-</div>
-<div class="paragraph">
-<p>Switch to the directory containing the <code>simpleapp</code> example:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="bash">cd ../example/application/simpleapp</code></pre>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_cgcom_cutting-a-release_releasing-the-archetype_setup-environment-variables">3.5.1. Setup environment variables</h4>
-<div class="paragraph">
-<p>Set additional environment variables for the <code>simpleapp-archetype</code> artifact:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="bash">export ISISART=simpleapp-archetype
+...</code></pre>
+ </div>
+ </div>
+ <div class="paragraph">
+ <p>You may (again) be prompted for gpg passphrase. All being well this command will complete successfully. Given that it is uploading code artifacts, it could take a while to complete.</p>
+ </div>
+ </div>
+ </div>
+ <div class="sect2">
+ <h3 id="_cgcom_cutting-a-release_releasing-the-archetype">3.5. Releasing the Archetype</h3>
+ <div class="paragraph">
+ <p>Apache Isis archetypes are reverse engineered from example applications. Once reverse engineered, the source is checked into git (replacing any earlier version of the archetype) and released.</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>If releasing using Windows and Maven >= 3.3.3, then there is an issue that requires a small workaround.</p>
+ </div>
+ <div class="paragraph">
+ <p>In Maven 3.3.3 the <code>mvn.bat</code> file was removed, replaced instead with <code>mvn.cmd</code>. However, <code>maven-archetype-plugin:2.4</code> only uses <code>mvn.bat</code>; this causes the <code>archetype:create-from-project</code> goal to fail. The fix is to simple: just copy <code>mvn.cmd</code> to <code>mvn.bat</code>.</p>
+ </div> </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ <div class="paragraph">
+ <p>Switch to the directory containing the <code>simpleapp</code> example:</p>
+ </div>
+ <div class="listingblock">
+ <div class="content">
+ <pre class="CodeRay highlight"><code data-lang="bash">cd ../example/application/simpleapp</code></pre>
+ </div>
+ </div>
+ <div class="sect3">
+ <h4 id="_cgcom_cutting-a-release_releasing-the-archetype_setup-environment-variables">3.5.1. Setup environment variables</h4>
+ <div class="paragraph">
+ <p>Set additional environment variables for the <code>simpleapp-archetype</code> artifact:</p>
+ </div>
+ <div class="listingblock">
+ <div class="content">
+ <pre class="CodeRay highlight"><code data-lang="bash">export ISISART=simpleapp-archetype
export ISISPAR=$ISISREL <i class="conum" data-value="1"></i><b>(1)</b>
export ISISCPT=$(echo $ISISART | cut -d- -f2)
export ISISCPN=$(echo $ISISART | cut -d- -f1)
-env | grep ISIS | sort</code></pre>
-</div>
-</div>
-<div class="colist arabic">
-<table>
-<tr>
-<td><i class="conum" data-value="1"></i><b>1</b></td>
-<td><code>$ISISPAR</code> is the version of the Apache Isis core that will act as the archetype’s parent. Usually this is the same as <code>$ISISREL</code>.</td>
-</tr>
-</table>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_cgcom_cutting-a-release_releasing-the-archetype_check-the-example-app">3.5.2. Check the example app</h4>
-<div class="paragraph">
-<p>Update the parent <code>pom.xml</code> to reference the <em>released</em> version of Apache Isis core, eg:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="xml"><span class="tag"><properties></span>
+env | grep ISIS | sort</code></pre>
+ </div>
+ </div>
+ <div class="colist arabic">
+ <table>
+ <tbody>
+ <tr>
+ <td><i class="conum" data-value="1"></i><b>1</b></td>
+ <td><code>$ISISPAR</code> is the version of the Apache Isis core that will act as the archetype\u2019s parent. Usually this is the same as <code>$ISISREL</code>.</td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ </div>
+ <div class="sect3">
+ <h4 id="_cgcom_cutting-a-release_releasing-the-archetype_check-the-example-app">3.5.2. Check the example app</h4>
+ <div class="paragraph">
+ <p>Update the parent <code>pom.xml</code> to reference the <em>released</em> version of Apache Isis core, eg:</p>
+ </div>
+ <div class="listingblock">
+ <div class="content">
+ <pre class="CodeRay highlight"><code data-lang="xml"><span class="tag"><properties></span>
<span class="tag"><isis.version></span>1.15.0<span class="tag"></isis.version></span>
...
-<span class="tag"></properties></span></code></pre>
-</div>
-</div>
-<div class="admonitionblock note">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-note" title="Note"></i>
-</td>
-<td class="content">
-<div class="paragraph">
-<p>Previously at this point we used to check for and fix any missing license header notices; however it doesn’t make sense for the archetype to include the Apache rat-plugin, so this has been removed.</p>
-</div>
-</td>
-</tr>
-</table>
-</div>
-<div class="paragraph">
-<p>Finally, double check that the app</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>builds:</p>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="bash">mvn clean install</code></pre>
-</div>
-</div>
-</li>
-<li>
-<p>can be run from an IDE</p>
-<div class="ulist">
-<ul>
-<li>
-<p>mainClass=<code>org.apache.isis.WebServer</code></p>
-</li>
-<li>
-<p>args=<code>-m domainapp.application.manifest.DomainAppAppManifestWithFixtures</code></p>
-</li>
-<li>
-<p>run before: <code>mvn -f pom-jdo-enhance-all.xml datanucleus:enhance -o</code> in the root module</p>
-</li>
-</ul>
-</div>
-</li>
-<li>
-<p>can be run using the mvn jetty plugin:</p>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="bash">mvn -pl webapp jetty:run</code></pre>
-</div>
-</div>
-</li>
-<li>
-<p>can be packaged and run using the mvn jetty-console plugin:</p>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="bash">mvn install -Dmavenmixin-jettyconsole
-mvn antrun:run -Dmavenmixin-jettyconsole</code></pre>
-</div>
-</div>
-</li>
-<li>
-<p>can be deployed as a WAR</p>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="bash">cp webapp/target/simpleapp.war $CATALINA_HOME/webapps/ROOT.war
+<span class="tag"></properties></span></code></pre>
+ </div>
+ </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>Previously at this point we used to check for and fix any missing license header notices; however it doesn\u2019t make sense for the archetype to include the Apache rat-plugin, so this has been removed.</p>
+ </div> </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ <div class="paragraph">
+ <p>Finally, double check that the app</p>
+ </div>
+ <div class="ulist">
+ <ul>
+ <li> <p>builds:</p>
+ <div class="listingblock">
+ <div class="content">
+ <pre class="CodeRay highlight"><code data-lang="bash">mvn clean install</code></pre>
+ </div>
+ </div> </li>
+ <li> <p>can be run from an IDE</p>
+ <div class="ulist">
+ <ul>
+ <li> <p>mainClass=<code>org.apache.isis.WebServer</code></p> </li>
+ <li> <p>args=<code>-m domainapp.application.manifest.DomainAppAppManifestWithFixtures</code></p> </li>
+ <li> <p>run before: <code>mvn -f pom-jdo-enhance-all.xml datanucleus:enhance -o</code> in the root module</p> </li>
+ </ul>
+ </div> </li>
+ <li> <p>can be run using the mvn jetty plugin:</p>
+ <div class="listingblock">
+ <div class="content">
+ <pre class="CodeRay highlight"><code data-lang="bash">mvn -pl webapp jetty:run</code></pre>
+ </div>
+ </div> </li>
+ <li> <p>can be packaged and run using the mvn jetty-console plugin:</p>
+ <div class="listingblock">
+ <div class="content">
+ <pre class="CodeRay highlight"><code data-lang="bash">mvn install -Dmavenmixin-jettyconsole
+mvn antrun:run -Dmavenmixin-jettyconsole</code></pre>
+ </div>
+ </div> </li>
+ <li> <p>can be deployed as a WAR</p>
+ <div class="listingblock">
+ <div class="content">
+ <pre class="CodeRay highlight"><code data-lang="bash">cp webapp/target/simpleapp.war $CATALINA_HOME/webapps/ROOT.war
pushd $CATALINA_HOME/bin
sh startup.sh
-tail -f ../logs/catalina.out</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>quit using:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="bash">sh shutdown.sh
-popd</code></pre>
-</div>
-</div>
-</li>
-<li>
-<p>can be packaged and run using Docker:</p>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="bash">mvn install -Dmavenmixin-docker -D docker-plugin.imageName=test/simpleapp
-docker container run -p 8080:8080 -d test/simpleapp</code></pre>
-</div>
-</div>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>This too should be accessed at <a href="http://localhost:8080">localhost:8080</a>.</p>
-</div>
-<div class="admonitionblock tip">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-tip" title="Tip"></i>
-</td>
-<td class="content">
-<div class="paragraph">
-<p>The Kitematic UI tool is handy for viewing and interacting with running containers.</p>
-</div>
-</td>
-</tr>
-</table>
-</div>
-<div class="paragraph">
-<p>In each case, check the about page and confirm has been built against non-SNAPSHOT versions of the Apache Isis jars.</p>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_cgcom_cutting-a-release_releasing-the-archetype_create-the-archetype">3.5.3. Create the archetype</h4>
-<div class="paragraph">
-<p>Make sure you are in the correct directory and environment variables are correct.</p>
-</div>
-<div class="paragraph">
-<p>To recreate the <strong>simpleapp</strong> archetype:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="bash">cd example/application/simpleapp
-env | grep ISIS | sort</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>Then, run the script:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="bash">sh ../../../scripts/recreate-archetype.sh $ISISJIRA</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>The script automatically commits changes; if you wish use <code>git log</code> and
-<code>git diff</code> (or a tool such as SourceTree) to review changes made.</p>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_cgcom_cutting-a-release_releasing-the-archetype_release-prepare">3.5.4. Release prepare</h4>
-<div class="paragraph">
-<p>Switch to the <strong>archetype</strong> directory and execute the <code>release:prepare</code>:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code>cd ../../../example/archetype/$ISISCPN
+tail -f ../logs/catalina.out</code></pre>
+ </div>
+ </div>
+ <div class="paragraph">
+ <p>quit using:</p>
+ </div>
+ <div class="listingblock">
+ <div class="content">
+ <pre class="CodeRay highlight"><code data-lang="bash">sh shutdown.sh
+popd</code></pre>
+ </div>
+ </div> </li>
+ <li> <p>can be packaged and run using Docker:</p>
+ <div class="listingblock">
+ <div class="content">
+ <pre class="CodeRay highlight"><code data-lang="bash">mvn install -Dmavenmixin-docker -D docker-plugin.imageName=test/simpleapp
+docker container run -p 8080:8080 -d test/simpleapp</code></pre>
+ </div>
+ </div> </li>
+ </ul>
+ </div>
+ <div class="paragraph">
+ <p>This too should be accessed at <a href="http://localhost:8080">localhost:8080</a>.</p>
+ </div>
+ <div class="admonitionblock tip">
+ <table>
+ <tbody>
+ <tr>
+ <td class="icon"> <i class="fa icon-tip" title="Tip"></i> </td>
+ <td class="content">
+ <div class="paragraph">
+ <p>The Kitematic UI tool is handy for viewing and interacting with running containers.</p>
+ </div> </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ <div class="paragraph">
+ <p>In each case, check the about page and confirm has been built against non-SNAPSHOT versions of the Apache Isis jars.</p>
+ </div>
+ </div>
+ <div class="sect3">
+ <h4 id="_cgcom_cutting-a-release_releasing-the-archetype_create-the-archetype">3.5.3. Create the archetype</h4>
+ <div class="paragraph">
+ <p>Make sure you are in the correct directory and environment variables are correct.</p>
+ </div>
+ <div class="paragraph">
+ <p>To recreate the <strong>simpleapp</strong> archetype:</p>
+ </div>
+ <div class="listingblock">
+ <div class="content">
+ <pre class="CodeRay highlight"><code data-lang="bash">cd example/application/simpleapp
+env | grep ISIS | sort</code></pre>
+ </div>
+ </div>
+ <div class="paragraph">
+ <p>Then, run the script:</p>
+ </div>
+ <div class="listingblock">
+ <div class="content">
+ <pre class="CodeRay highlight"><code data-lang="bash">sh ../../../scripts/recreate-archetype.sh $ISISJIRA</code></pre>
+ </div>
+ </div>
+ <div class="paragraph">
+ <p>The script automatically commits changes; if you wish use <code>git log</code> and <code>git diff</code> (or a tool such as SourceTree) to review changes made.</p>
+ </div>
+ </div>
+ <div class="sect3">
+ <h4 id="_cgcom_cutting-a-release_releasing-the-archetype_release-prepare">3.5.4. Release prepare</h4>
+ <div class="paragraph">
+ <p>Switch to the <strong>archetype</strong> directory and execute the <code>release:prepare</code>:</p>
+ </div>
+ <div class="listingblock">
+ <div class="content">
+ <pre class="CodeRay highlight"><code>cd ../../../example/archetype/$ISISCPN
rm -rf $ISISTMP/checkout
mvn release:prepare -P apache-release \
-DreleaseVersion=$ISISREL \
-DdevelopmentVersion=$ISISDEV \
- -Dtag=$ISISART-$ISISREL</code></pre>
-</div>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_cgcom_cutting-a-release_releasing-the-archetype_post-prepare-sanity-check">3.5.5. Post-prepare sanity check</h4>
-<div class="paragraph">
-<p>This is a good point to test the archetype; nothing has yet been uploaded.</p>
-</div>
-<div class="paragraph">
-<p><em>In a different session</em>, create a new app from the archetype. First set up environment variables:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="bash">export ISISTMP=/c/tmp # or as required
+ -Dtag=$ISISART-$ISISREL</code></pre>
+ </div>
+ </div>
+ </div>
+ <div class="sect3">
+ <h4 id="_cgcom_cutting-a-release_releasing-the-archetype_post-prepare-sanity-check">3.5.5. Post-prepare sanity check</h4>
+ <div class="paragraph">
+ <p>This is a good point to test the archetype; nothing has yet been uploaded.</p>
+ </div>
+ <div class="paragraph">
+ <p><em>In a different session</em>, create a new app from the archetype. First set up environment variables:</p>
+ </div>
+ <div class="listingblock">
+ <div class="content">
+ <pre class="CodeRay highlight"><code data-lang="bash">export ISISTMP=/c/tmp # or as required
export ISISCPN=simpleapp
-env | grep ISIS | sort</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>Then generate a new app from the archetype:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="bash">rm -rf $ISISTMP/test-$ISISCPN
+env | grep ISIS | sort</code></pre>
+ </div>
+ </div>
+ <div class="paragraph">
+ <p>Then generate a new app from the archetype:</p>
+ </div>
+ <div class="listingblock">
+ <div class="content">
+ <pre class="CodeRay highlight"><code data-lang="bash">rm -rf $ISISTMP/test-$ISISCPN
mkdir $ISISTMP/test-$ISISCPN
cd $ISISTMP/test-$ISISCPN
@@ -1458,181 +1318,179 @@ mvn archetype:generate \
-D groupId=com.mycompany \
-D artifactId=myapp \
-D archetypeGroupId=org.apache.isis.archetype \
- -D archetypeArtifactId=$ISISCPN-archetype</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>Build the newly generated app and test:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="bash">cd myapp
+ -D archetypeArtifactId=$ISISCPN-archetype</code></pre>
+ </div>
+ </div>
+ <div class="paragraph">
+ <p>Build the newly generated app and test:</p>
+ </div>
+ <div class="listingblock">
+ <div class="content">
+ <pre class="CodeRay highlight"><code data-lang="bash">cd myapp
mvn clean install -o
-mvn -pl webapp jetty:run # runs as mvn jetty plugin</code></pre>
-</d
<TRUNCATED>
[14/44] isis-site git commit: ISIS-1594: provide an 'edit' button
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/83a3755a/content/guides/ugtst.pdf
----------------------------------------------------------------------
diff --git a/content/guides/ugtst.pdf b/content/guides/ugtst.pdf
index e0a2f09..242b553 100644
--- a/content/guides/ugtst.pdf
+++ b/content/guides/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:20170219155351+00'00')
-/ModDate (D:20170219155351+00'00')
+/CreationDate (D:20170307234531+00'00')
+/ModDate (D:20170307234531+00'00')
>>
endobj
2 0 obj
<< /Type /Catalog
/Pages 3 0 R
/Names 14 0 R
-/Outlines 367 0 R
-/PageLabels 400 0 R
+/Outlines 366 0 R
+/PageLabels 399 0 R
/PageMode /UseOutlines
/OpenAction [7 0 R /FitH 842.89]
/ViewerPreferences << /DisplayDocTitle true
@@ -23,7 +23,7 @@ endobj
3 0 obj
<< /Type /Pages
/Count 51
-/Kids [7 0 R 10 0 R 12 0 R 34 0 R 45 0 R 51 0 R 57 0 R 65 0 R 72 0 R 80 0 R 85 0 R 91 0 R 100 0 R 106 0 R 109 0 R 116 0 R 118 0 R 123 0 R 126 0 R 134 0 R 139 0 R 143 0 R 145 0 R 149 0 R 154 0 R 165 0 R 170 0 R 175 0 R 178 0 R 184 0 R 198 0 R 204 0 R 212 0 R 217 0 R 229 0 R 231 0 R 236 0 R 243 0 R 248 0 R 252 0 R 257 0 R 262 0 R 266 0 R 269 0 R 271 0 R 273 0 R 278 0 R 285 0 R 292 0 R 297 0 R 302 0 R]
+/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 115 0 R 117 0 R 122 0 R 125 0 R 133 0 R 138 0 R 142 0 R 144 0 R 148 0 R 153 0 R 164 0 R 169 0 R 174 0 R 177 0 R 183 0 R 197 0 R 203 0 R 211 0 R 216 0 R 228 0 R 230 0 R 235 0 R 242 0 R 247 0 R 251 0 R 256 0 R 261 0 R 265 0 R 268 0 R 270 0 R 272 0 R 277 0 R 284 0 R 291 0 R 296 0 R 301 0 R]
>>
endobj
4 0 obj
@@ -78,13 +78,13 @@ endobj
endobj
8 0 obj
<< /Type /Font
-/BaseFont /AAAAEG+NotoSerif
+/BaseFont /AAAADT+NotoSerif
/Subtype /TrueType
-/FontDescriptor 402 0 R
+/FontDescriptor 401 0 R
/FirstChar 32
/LastChar 255
-/Widths 404 0 R
-/ToUnicode 403 0 R
+/Widths 403 0 R
+/ToUnicode 402 0 R
>>
endobj
9 0 obj
@@ -1353,7 +1353,7 @@ endobj
/F6.0 43 0 R
>>
>>
-/Annots [303 0 R 304 0 R 305 0 R 306 0 R 307 0 R 308 0 R 309 0 R 310 0 R 311 0 R 312 0 R 313 0 R 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]
+/Annots [302 0 R 303 0 R 304 0 R 305 0 R 306 0 R 307 0 R 308 0 R 309 0 R 310 0 R 311 0 R 312 0 R 313 0 R 314 0 R 315 0 R 316 0 R 317 0 R 318 0 R 319 0 R 320 0 R 321 0 R 322 0 R 323 0 R 324 0 R 325 0 R 326 0 R 327 0 R 328 0 R 329 0 R 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]
>>
endobj
11 0 obj
@@ -1986,7 +1986,7 @@ endobj
/Font << /F2.0 16 0 R
/F1.0 8 0 R
>>
-/XObject << /Stamp1 366 0 R
+/XObject << /Stamp1 365 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 +2001,18 @@ endobj
>>
endobj
15 0 obj
-<< /Kids [111 0 R 180 0 R 112 0 R]
+<< /Kids [110 0 R 179 0 R 111 0 R]
>>
endobj
16 0 obj
<< /Type /Font
-/BaseFont /AAAAEH+NotoSerif-Bold
+/BaseFont /AAAADU+NotoSerif-Bold
/Subtype /TrueType
-/FontDescriptor 406 0 R
+/FontDescriptor 405 0 R
/FirstChar 32
/LastChar 255
-/Widths 408 0 R
-/ToUnicode 407 0 R
+/Widths 407 0 R
+/ToUnicode 406 0 R
>>
endobj
17 0 obj
@@ -2820,7 +2820,7 @@ endobj
/F5.0 40 0 R
/F6.0 43 0 R
>>
-/XObject << /Stamp1 366 0 R
+/XObject << /Stamp1 365 0 R
>>
>>
/Annots [41 0 R]
@@ -2834,24 +2834,24 @@ endobj
endobj
37 0 obj
<< /Type /Font
-/BaseFont /AAAAEI+FontAwesome
+/BaseFont /AAAADV+FontAwesome
/Subtype /TrueType
-/FontDescriptor 410 0 R
+/FontDescriptor 409 0 R
/FirstChar 32
/LastChar 255
-/Widths 412 0 R
-/ToUnicode 411 0 R
+/Widths 411 0 R
+/ToUnicode 410 0 R
>>
endobj
38 0 obj
<< /Type /Font
-/BaseFont /AAAAEJ+NotoSerif-BoldItalic
+/BaseFont /AAAADW+NotoSerif-BoldItalic
/Subtype /TrueType
-/FontDescriptor 414 0 R
+/FontDescriptor 413 0 R
/FirstChar 32
/LastChar 255
-/Widths 416 0 R
-/ToUnicode 415 0 R
+/Widths 415 0 R
+/ToUnicode 414 0 R
>>
endobj
39 0 obj
@@ -2859,13 +2859,13 @@ endobj
endobj
40 0 obj
<< /Type /Font
-/BaseFont /AAAAEK+NotoSerif-Italic
+/BaseFont /AAAADX+NotoSerif-Italic
/Subtype /TrueType
-/FontDescriptor 418 0 R
+/FontDescriptor 417 0 R
/FirstChar 32
/LastChar 255
-/Widths 420 0 R
-/ToUnicode 419 0 R
+/Widths 419 0 R
+/ToUnicode 418 0 R
>>
endobj
41 0 obj
@@ -2884,13 +2884,13 @@ endobj
endobj
43 0 obj
<< /Type /Font
-/BaseFont /AAAAEL+mplus1mn-regular
+/BaseFont /AAAADY+mplus1mn-regular
/Subtype /TrueType
-/FontDescriptor 422 0 R
+/FontDescriptor 421 0 R
/FirstChar 32
/LastChar 255
-/Widths 424 0 R
-/ToUnicode 423 0 R
+/Widths 423 0 R
+/ToUnicode 422 0 R
>>
endobj
44 0 obj
@@ -3288,8 +3288,8 @@ f
h
S
Q
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
BT
59.24 158.1111494903738 Td
@@ -3310,8 +3310,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
97.74000000000001 158.1111494903738 Td
@@ -3332,8 +3332,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
136.24 158.1111494903738 Td
@@ -3493,7 +3493,7 @@ endobj
/F2.0 16 0 R
>>
/XObject << /I1 48 0 R
-/Stamp1 366 0 R
+/Stamp1 365 0 R
>>
>>
/Annots [46 0 R 47 0 R]
@@ -3602,7 +3602,7 @@ endobj
[45 0 R /XYZ 0 308.13614949037384 null]
endobj
50 0 obj
-<< /Length 16564
+<< /Length 17092
>>
stream
q
@@ -3646,12 +3646,12 @@ f
h
S
Q
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
59.24 756.035 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<7075626c6963> Tj
ET
@@ -3668,12 +3668,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
BT
97.74000000000001 756.035 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<766f6964> Tj
ET
@@ -3690,12 +3690,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.400 0.733 scn
-0.000 0.400 0.733 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
125.24000000000001 756.035 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<736574437573746f6d65725265706f7369746f7279> Tj
ET
@@ -3795,7 +3795,29 @@ ET
BT
422.24 756.035 Td
/F6.0 11 Tf
-<2e2e2e> Tj
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+427.74 756.035 Td
+/F6.0 11 Tf
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+433.24 756.035 Td
+/F6.0 11 Tf
+<2e> Tj
ET
0.000 0.000 0.000 SCN
@@ -3860,12 +3882,12 @@ f
h
S
Q
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
59.24 679.515 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<7075626c6963> Tj
ET
@@ -3882,12 +3904,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
BT
97.74000000000001 679.515 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<766f6964> Tj
ET
@@ -3904,12 +3926,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.400 0.733 scn
-0.000 0.400 0.733 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
125.24000000000001 679.515 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<696e6a656374437573746f6d65725265706f7369746f7279> Tj
ET
@@ -4009,7 +4031,29 @@ ET
BT
438.74 679.515 Td
/F6.0 11 Tf
-<2e2e2e> Tj
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+444.24 679.515 Td
+/F6.0 11 Tf
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+449.74 679.515 Td
+/F6.0 11 Tf
+<2e> Tj
ET
0.000 0.000 0.000 SCN
@@ -4550,35 +4594,23 @@ endobj
/Contents 50 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/Font << /F1.0 8 0 R
-/F7.0 52 0 R
/F6.0 43 0 R
/F3.1 37 0 R
/F2.0 16 0 R
>>
-/XObject << /Stamp1 366 0 R
+/XObject << /Stamp1 365 0 R
>>
>>
-/Annots [55 0 R]
+/Annots [54 0 R]
>>
endobj
52 0 obj
-<< /Type /Font
-/BaseFont /AAAAEM+mplus1mn-bold
-/Subtype /TrueType
-/FontDescriptor 426 0 R
-/FirstChar 32
-/LastChar 255
-/Widths 428 0 R
-/ToUnicode 427 0 R
->>
-endobj
-53 0 obj
[51 0 R /XYZ 0 586.26 null]
endobj
-54 0 obj
+53 0 obj
[51 0 R /XYZ 0 241.26000000000016 null]
endobj
-55 0 obj
+54 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -4589,7 +4621,7 @@ endobj
/Type /Annot
>>
endobj
-56 0 obj
+55 0 obj
<< /Length 11197
>>
stream
@@ -5114,26 +5146,26 @@ Q
endstream
endobj
-57 0 obj
+56 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 56 0 R
+/Contents 55 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/Font << /F1.0 8 0 R
/F2.0 16 0 R
/F3.1 37 0 R
>>
-/XObject << /Stamp1 366 0 R
+/XObject << /Stamp1 365 0 R
>>
>>
-/Annots [59 0 R 61 0 R 62 0 R 63 0 R]
+/Annots [58 0 R 60 0 R 61 0 R 62 0 R]
>>
endobj
-58 0 obj
-[57 0 R /XYZ 0 778.86 null]
+57 0 obj
+[56 0 R /XYZ 0 778.86 null]
endobj
-59 0 obj
+58 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -5144,10 +5176,10 @@ endobj
/Type /Annot
>>
endobj
-60 0 obj
-[57 0 R /XYZ 0 418.3000000000002 null]
+59 0 obj
+[56 0 R /XYZ 0 418.3000000000002 null]
endobj
-61 0 obj
+60 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -5158,7 +5190,7 @@ endobj
/Type /Annot
>>
endobj
-62 0 obj
+61 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -5169,7 +5201,7 @@ endobj
/Type /Annot
>>
endobj
-63 0 obj
+62 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -5180,8 +5212,8 @@ endobj
/Type /Annot
>>
endobj
-64 0 obj
-<< /Length 22063
+63 0 obj
+<< /Length 23527
>>
stream
q
@@ -5515,12 +5547,12 @@ f
h
S
Q
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
59.24 478.9650000000003 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<7075626c6963> Tj
ET
@@ -5537,12 +5569,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
BT
97.74000000000001 478.9650000000003 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<636c617373> Tj
ET
@@ -5559,12 +5591,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
BT
130.74 478.9650000000003 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<4465706172746d656e74> Tj
ET
@@ -5603,12 +5635,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
81.24000000000001 464.2250000000003 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<70726976617465> Tj
ET
@@ -5625,8 +5657,8 @@ 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 464.2250000000003 Td
@@ -5724,12 +5756,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
301.24 464.2250000000003 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<6e6577> Tj
ET
@@ -5746,8 +5778,8 @@ 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
323.24 464.2250000000003 Td
@@ -5785,7 +5817,40 @@ ET
BT
411.24 464.2250000000003 Td
/F6.0 11 Tf
-<3e28293b> Tj
+<3e> 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
+416.74 464.2250000000003 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
+422.24 464.2250000000003 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
+427.74 464.2250000000003 Td
+/F6.0 11 Tf
+<3b> Tj
ET
0.000 0.000 0.000 SCN
@@ -5807,7 +5872,29 @@ ET
BT
81.24000000000001 449.4850000000003 Td
/F6.0 11 Tf
-<2e2e2e> Tj
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+86.74000000000001 449.4850000000003 Td
+/F6.0 11 Tf
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+92.24000000000001 449.4850000000003 Td
+/F6.0 11 Tf
+<2e> Tj
ET
0.000 0.000 0.000 SCN
@@ -5861,12 +5948,12 @@ f
h
S
Q
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
59.24 358.2250000000003 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<7075626c6963> Tj
ET
@@ -5883,12 +5970,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
BT
97.74000000000001 358.2250000000003 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<636c617373> Tj
ET
@@ -5905,12 +5992,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
BT
130.74 358.2250000000003 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<536f6d65446f6d61696e4f626a656374> Tj
ET
@@ -5949,12 +6036,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
81.24000000000001 343.4850000000003 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<70726976617465> Tj
ET
@@ -5971,8 +6058,8 @@ 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 343.4850000000003 Td
@@ -6070,12 +6157,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
273.74 343.4850000000003 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<6e6577> Tj
ET
@@ -6092,8 +6179,8 @@ 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
295.74 343.4850000000003 Td
@@ -6131,7 +6218,40 @@ ET
BT
394.74 343.4850000000003 Td
/F6.0 11 Tf
-<3e28293b> Tj
+<3e> 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
+400.24 343.4850000000003 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
+405.74 343.4850000000003 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
+411.24 343.4850000000003 Td
+/F6.0 11 Tf
+<3b> Tj
ET
0.000 0.000 0.000 SCN
@@ -6153,7 +6273,29 @@ ET
BT
81.24000000000001 328.7450000000003 Td
/F6.0 11 Tf
-<2e2e2e> Tj
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+86.74000000000001 328.7450000000003 Td
+/F6.0 11 Tf
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+92.24000000000001 328.7450000000003 Td
+/F6.0 11 Tf
+<2e> Tj
ET
0.000 0.000 0.000 SCN
@@ -6623,30 +6765,29 @@ Q
endstream
endobj
-65 0 obj
+64 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 64 0 R
+/Contents 63 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/Font << /F2.0 16 0 R
/F1.0 8 0 R
/F6.0 43 0 R
-/F7.0 52 0 R
>>
-/XObject << /Stamp1 366 0 R
+/XObject << /Stamp1 365 0 R
>>
>>
-/Annots [68 0 R 70 0 R]
+/Annots [67 0 R 69 0 R]
>>
endobj
+65 0 obj
+[64 0 R /XYZ 0 841.89 null]
+endobj
66 0 obj
-[65 0 R /XYZ 0 841.89 null]
+[64 0 R /XYZ 0 721.6100000000001 null]
endobj
67 0 obj
-[65 0 R /XYZ 0 721.6100000000001 null]
-endobj
-68 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -6657,10 +6798,10 @@ endobj
/Type /Annot
>>
endobj
-69 0 obj
-[65 0 R /XYZ 0 622.1900000000002 null]
+68 0 obj
+[64 0 R /XYZ 0 622.1900000000002 null]
endobj
-70 0 obj
+69 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -6671,8 +6812,8 @@ endobj
/Type /Annot
>>
endobj
-71 0 obj
-<< /Length 28324
+70 0 obj
+<< /Length 30742
>>
stream
q
@@ -6727,12 +6868,12 @@ f
h
S
Q
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
59.24 728.255 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<7075626c6963> Tj
ET
@@ -6749,12 +6890,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
BT
97.74000000000001 728.255 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<636c617373> Tj
ET
@@ -6771,12 +6912,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
BT
130.74 728.255 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<536f7274656453657473436f6e747261637454657374416c6c> Tj
ET
@@ -6793,12 +6934,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
273.74 728.255 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<657874656e6473> Tj
ET
@@ -6859,12 +7000,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
81.24000000000001 698.7750000000001 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<7075626c6963> Tj
ET
@@ -6898,7 +7039,18 @@ ET
BT
257.24 698.7750000000001 Td
/F6.0 11 Tf
-<2829> 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
+
+BT
+262.74 698.7750000000001 Td
+/F6.0 11 Tf
+<29> Tj
ET
0.000 0.000 0.000 SCN
@@ -6936,12 +7088,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
103.24000000000001 684.0350000000001 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<7375706572> Tj
ET
@@ -6958,13 +7110,35 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
BT
136.24 684.0350000000001 Td
/F6.0 11 Tf
-<226f72672e6573746174696f2e646f6d22> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+141.74 684.0350000000001 Td
+/F6.0 11 Tf
+<6f72672e6573746174696f2e646f6d> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+224.24 684.0350000000001 Td
+/F6.0 11 Tf
+<22> Tj
ET
0.000 0.000 0.000 SCN
@@ -6975,7 +7149,18 @@ ET
BT
229.74 684.0350000000001 Td
/F6.0 11 Tf
-<293b> Tj
+<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
+235.24 684.0350000000001 Td
+/F6.0 11 Tf
+<3b> Tj
ET
0.000 0.000 0.000 SCN
@@ -7013,8 +7198,8 @@ 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
180.24 669.2950000000001 Td
@@ -7035,8 +7220,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
218.74 669.2950000000001 Td
@@ -7052,7 +7237,18 @@ ET
BT
235.24 669.2950000000001 Td
/F6.0 11 Tf
-<293b> Tj
+<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
+240.74 669.2950000000001 Td
+/F6.0 11 Tf
+<3b> Tj
ET
0.000 0.000 0.000 SCN
@@ -7567,12 +7763,12 @@ f
h
S
Q
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
59.24000000000001 343.9950000000003 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<7075626c6963> Tj
ET
@@ -7589,12 +7785,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
BT
97.74000000000001 343.9950000000003 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<636c617373> Tj
ET
@@ -7611,12 +7807,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
BT
130.74 343.9950000000003 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<4269646972656374696f6e616c52656c6174696f6e73686970436f6e747261637454657374416c6c> Tj
ET
@@ -7633,12 +7829,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
103.24000000000001 329.2550000000003 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<657874656e6473> Tj
ET
@@ -7699,12 +7895,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
81.24000000000001 299.77500000000026 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<7075626c6963> Tj
ET
@@ -7738,7 +7934,18 @@ ET
BT
339.74 299.77500000000026 Td
/F6.0 11 Tf
-<2829> 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
+
+BT
+345.24 299.77500000000026 Td
+/F6.0 11 Tf
+<29> Tj
ET
0.000 0.000 0.000 SCN
@@ -7776,12 +7983,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
103.24000000000001 285.03500000000025 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<7375706572> Tj
ET
@@ -7798,13 +8005,35 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
BT
136.24 285.03500000000025 Td
/F6.0 11 Tf
-<226f72672e6170616368652e697369732e636f72652e756e697474657374737570706f72742e626964697222> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+141.74 285.03500000000025 Td
+/F6.0 11 Tf
+<6f72672e6170616368652e697369732e636f72652e756e697474657374737570706f72742e6269646972> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+372.74 285.03500000000025 Td
+/F6.0 11 Tf
+<22> Tj
ET
0.000 0.000 0.000 SCN
@@ -7848,7 +8077,7 @@ ET
BT
213.24 270.2950000000003 Td
/F6.0 11 Tf
-<2e3c> Tj
+<2e> Tj
ET
0.000 0.000 0.000 SCN
@@ -7857,6 +8086,17 @@ ET
0.200 0.200 0.200 SCN
BT
+218.74 270.2950000000003 Td
+/F6.0 11 Tf
+<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
224.24 270.2950000000003 Td
/F6.0 11 Tf
<436c617373> Tj
@@ -7870,7 +8110,40 @@ ET
BT
251.74 270.2950000000003 Td
/F6.0 11 Tf
-<3c3f3e2c> 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
+
+BT
+257.24 270.2950000000003 Td
+/F6.0 11 Tf
+<3f> 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
+262.74 270.2950000000003 Td
+/F6.0 11 Tf
+<3e> 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 270.2950000000003 Td
+/F6.0 11 Tf
+<2c> Tj
ET
0.000 0.000 0.000 SCN
@@ -7952,8 +8225,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
268.24 255.5550000000003 Td
@@ -7985,12 +8258,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
306.74 255.5550000000003 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<6e6577> Tj
ET
@@ -8024,7 +8297,29 @@ ET
BT
504.74 255.5550000000003 Td
/F6.0 11 Tf
-<28292c> 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
+
+BT
+510.24 255.5550000000003 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
+515.74 255.5550000000003 Td
+/F6.0 11 Tf
+<2c> Tj
ET
0.000 0.000 0.000 SCN
@@ -8062,8 +8357,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
262.74 240.81500000000028 Td
@@ -8095,12 +8390,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
301.24 240.81500000000028 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<6e6577> Tj
ET
@@ -8161,8 +8456,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
213.24 226.07500000000027 Td
@@ -8200,7 +8495,29 @@ ET
BT
147.24 211.3350000000003 Td
/F6.0 11 Tf
-<29293b> Tj
+<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
+152.74 211.3350000000003 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
+158.24 211.3350000000003 Td
+/F6.0 11 Tf
+<3b> Tj
ET
0.000 0.000 0.000 SCN
@@ -8238,8 +8555,8 @@ 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
180.24 196.59500000000028 Td
@@ -8260,8 +8577,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
218.74 196.59500000000028 Td
@@ -8277,7 +8594,18 @@ ET
BT
235.24 196.59500000000028 Td
/F6.0 11 Tf
-<293b> Tj
+<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
+240.74 196.59500000000028 Td
+/F6.0 11 Tf
+<3b> Tj
ET
0.000 0.000 0.000 SCN
@@ -8522,28 +8850,27 @@ Q
endstream
endobj
-72 0 obj
+71 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 71 0 R
+/Contents 70 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/Font << /F1.0 8 0 R
-/F7.0 52 0 R
/F6.0 43 0 R
/F2.0 16 0 R
/F3.1 37 0 R
>>
-/XObject << /Stamp1 366 0 R
+/XObject << /Stamp1 365 0 R
>>
>>
-/Annots [74 0 R 75 0 R 76 0 R 77 0 R 78 0 R]
+/Annots [73 0 R 74 0 R 75 0 R 76 0 R 77 0 R]
>>
endobj
-73 0 obj
-[72 0 R /XYZ 0 613.9000000000001 null]
+72 0 obj
+[71 0 R /XYZ 0 613.9000000000001 null]
endobj
-74 0 obj
+73 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -8554,7 +8881,7 @@ endobj
/Type /Annot
>>
endobj
-75 0 obj
+74 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -8565,7 +8892,7 @@ endobj
/Type /Annot
>>
endobj
-76 0 obj
+75 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -8576,7 +8903,7 @@ endobj
/Type /Annot
>>
endobj
-77 0 obj
+76 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -8587,7 +8914,7 @@ endobj
/Type /Annot
>>
endobj
-78 0 obj
+77 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -8598,8 +8925,8 @@ endobj
/Type /Annot
>>
endobj
-79 0 obj
-<< /Length 23221
+78 0 obj
+<< /Length 23936
>>
stream
q
@@ -9027,12 +9354,12 @@ f
h
S
Q
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
59.24 516.9550000000002 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<7075626c6963> Tj
ET
@@ -9049,12 +9376,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
97.74000000000001 516.9550000000002 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<6162737472616374> Tj
ET
@@ -9071,12 +9398,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
BT
147.24 516.9550000000002 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<636c617373> Tj
ET
@@ -9093,12 +9420,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
BT
180.24 516.9550000000002 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<4573746174696f446f6d61696e4f626a656374> Tj
ET
@@ -9137,8 +9464,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
BT
81.24000000000001 502.2150000000002 Td
@@ -9159,8 +9486,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
119.74000000000001 502.2150000000002 Td
@@ -9181,8 +9508,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
158.24 502.2150000000002 Td
@@ -9203,12 +9530,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
81.24000000000001 487.4750000000002 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<70726f746563746564> Tj
ET
@@ -9418,7 +9745,7 @@ ET
BT
338.5999053485577 375.51600000000013 Td
-/F8.0 10.5 Tf
+/F7.0 10.5 Tf
<c9> Tj
ET
@@ -9713,12 +10040,12 @@ f
h
S
Q
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
59.24000000000001 182.41500000000013 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<7075626c6963> Tj
ET
@@ -9735,12 +10062,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
BT
97.74000000000001 182.41500000000013 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<636c617373> Tj
ET
@@ -9757,12 +10084,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
BT
130.74 182.41500000000013 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<496e6a656374536572766963654d6574686f644d757374426546696e616c436f6e747261637454657374416c6c> Tj
ET
@@ -9779,12 +10106,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
383.74 182.41500000000013 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<657874656e6473> Tj
ET
@@ -9843,12 +10170,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
81.24000000000001 138.19500000000014 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<7075626c6963> Tj
ET
@@ -9882,7 +10209,18 @@ ET
BT
367.24 138.19500000000014 Td
/F6.0 11 Tf
-<2829> 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
+
+BT
+372.74 138.19500000000014 Td
+/F6.0 11 Tf
+<29> Tj
ET
0.000 0.000 0.000 SCN
@@ -9920,12 +10258,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
103.24000000000001 123.45500000000014 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<7375706572> Tj
ET
@@ -9942,13 +10280,35 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
BT
136.24 123.45500000000014 Td
/F6.0 11 Tf
-<226f72672e6573746174696f2e646f6d22> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+141.74 123.45500000000014 Td
+/F6.0 11 Tf
+<6f72672e6573746174696f2e646f6d> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+224.24 123.45500000000014 Td
+/F6.0 11 Tf
+<22> Tj
ET
0.000 0.000 0.000 SCN
@@ -9959,7 +10319,18 @@ ET
BT
229.74 123.45500000000014 Td
/F6.0 11 Tf
-<293b> Tj
+<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
+235.24 123.45500000000014 Td
+/F6.0 11 Tf
+<3b> Tj
ET
0.000 0.000 0.000 SCN
@@ -9997,8 +10368,8 @@ 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
180.24 108.71500000000015 Td
@@ -10019,8 +10390,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
218.74 108.71500000000015 Td
@@ -10036,7 +10407,18 @@ ET
BT
235.24 108.71500000000015 Td
/F6.0 11 Tf
-<293b> Tj
+<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
+240.74 108.71500000000015 Td
+/F6.0 11 Tf
+<3b> Tj
ET
0.000 0.000 0.000 SCN
@@ -10098,26 +10480,25 @@ Q
endstream
endobj
-80 0 obj
+79 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 79 0 R
+/Contents 78 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/Font << /F6.0 43 0 R
/F1.0 8 0 R
/F2.0 16 0 R
-/F7.0 52 0 R
-/F8.0 83 0 R
+/F7.0 82 0 R
/F3.1 37 0 R
>>
-/XObject << /Stamp1 366 0 R
+/XObject << /Stamp1 365 0 R
>>
>>
-/Annots [81 0 R]
+/Annots [80 0 R]
>>
endobj
-81 0 obj
+80 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -10128,22 +10509,22 @@ endobj
/Type /Annot
>>
endobj
-82 0 obj
-[80 0 R /XYZ 0 616.62 null]
+81 0 obj
+[79 0 R /XYZ 0 616.62 null]
endobj
-83 0 obj
+82 0 obj
<< /Type /Font
-/BaseFont /AAAAEN+mplus-1p-regular
+/BaseFont /AAAADZ+mplus-1p-regular
/Subtype /TrueType
-/FontDescriptor 430 0 R
+/FontDescriptor 425 0 R
/FirstChar 32
/LastChar 255
-/Widths 432 0 R
-/ToUnicode 431 0 R
+/Widths 427 0 R
+/ToUnicode 426 0 R
>>
endobj
-84 0 obj
-<< /Length 20014
+83 0 obj
+<< /Length 21860
>>
stream
q
@@ -10309,12 +10690,12 @@ f
h
S
Q
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
59.24 683.2450000000001 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<7075626c6963> Tj
ET
@@ -10331,12 +10712,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
BT
97.74000000000001 683.2450000000001 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<636c617373> Tj
ET
@@ -10353,12 +10734,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
BT
130.74 683.2450000000001 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<56616c756554797065436f6e74726163745465737441627374726163745f426967496e746567657254657374> Tj
ET
@@ -10375,12 +10756,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
378.24 683.2450000000001 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<657874656e6473> Tj
ET
@@ -10417,8 +10798,8 @@ 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 668.5050000000001 Td
@@ -10472,8 +10853,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
BT
81.24000000000001 639.0250000000002 Td
@@ -10494,12 +10875,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
81.24000000000001 624.2850000000002 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<70726f746563746564> Tj
ET
@@ -10516,8 +10897,8 @@ 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
136.24 624.2850000000002 Td
@@ -10538,8 +10919,8 @@ 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
163.74 624.2850000000002 Td
@@ -10588,7 +10969,18 @@ ET
BT
356.24 624.2850000000002 Td
/F6.0 11 Tf
-<2829> 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
+
+BT
+361.74 624.2850000000002 Td
+/F6.0 11 Tf
+<29> Tj
ET
0.000 0.000 0.000 SCN
@@ -10626,12 +11018,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
103.24000000000001 609.5450000000002 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<72657475726e> Tj
ET
@@ -10648,8 +11040,8 @@ 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
141.74 609.5450000000002 Td
@@ -10670,8 +11062,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
180.24 609.5450000000002 Td
@@ -10692,12 +11084,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
218.74 609.5450000000002 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<6e6577> Tj
ET
@@ -10714,8 +11106,8 @@ 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 609.5450000000002 Td
@@ -10736,13 +11128,35 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
BT
301.24 609.5450000000002 Td
/F6.0 11 Tf
-<223122> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+306.74 609.5450000000002 Td
+/F6.0 11 Tf
+<31> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+312.24 609.5450000000002 Td
+/F6.0 11 Tf
+<22> Tj
ET
0.000 0.000 0.000 SCN
@@ -10753,7 +11167,18 @@ ET
BT
317.74 609.5450000000002 Td
/F6.0 11 Tf
-<292c> Tj
+<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
+323.24 609.5450000000002 Td
+/F6.0 11 Tf
+<2c> Tj
ET
0.000 0.000 0.000 SCN
@@ -10769,12 +11194,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
334.24 609.5450000000002 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<6e6577> Tj
ET
@@ -10791,8 +11216,8 @@ 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
356.24 609.5450000000002 Td
@@ -10813,13 +11238,35 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
BT
416.74 609.5450000000002 Td
/F6.0 11 Tf
-<223122> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+422.24 609.5450000000002 Td
+/F6.0 11 Tf
+<31> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+427.74 609.5450000000002 Td
+/F6.0 11 Tf
+<22> Tj
ET
0.000 0.000 0.000 SCN
@@ -10830,7 +11277,29 @@ ET
BT
433.24 609.5450000000002 Td
/F6.0 11 Tf
-<29293b> Tj
+<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
+438.74 609.5450000000002 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
+444.24 609.5450000000002 Td
+/F6.0 11 Tf
+<3b> Tj
ET
0.000 0.000 0.000 SCN
@@ -10868,8 +11337,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
BT
81.24000000000001 565.3250000000002 Td
@@ -10890,12 +11359,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
81.24000000000001 550.5850000000002 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<70726f746563746564> Tj
ET
@@ -10912,8 +11381,8 @@ 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
136.24 550.5850000000002 Td
@@ -10934,8 +11403,8 @@ 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
163.74 550.5850000000002 Td
@@ -10984,7 +11453,18 @@ ET
BT
383.74 550.5850000000002 Td
/F6.0 11 Tf
-<2829> 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
+
+BT
+389.24 550.5850000000002 Td
+/F6.0 11 Tf
+<29> Tj
ET
0.000 0.000 0.000 SCN
@@ -11022,12 +11502,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
103.24000000000001 535.8450000000001 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<72657475726e> Tj
ET
@@ -11044,8 +11524,8 @@ 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
141.74 535.8450000000001 Td
@@ -11066,8 +11546,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
180.24 535.8450000000001 Td
@@ -11088,12 +11568,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
218.74 535.8450000000001 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<6e6577> Tj
ET
@@ -11110,8 +11590,8 @@ 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 535.8450000000001 Td
@@ -11132,13 +11612,35 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
BT
301.24 535.8450000000001 Td
/F6.0 11 Tf
-<223222> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+306.74 535.8450000000001 Td
+/F6.0 11 Tf
+<32> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+312.24 535.8450000000001 Td
+/F6.0 11 Tf
+<22> Tj
ET
0.000 0.000 0.000 SCN
@@ -11149,7 +11651,29 @@ ET
BT
317.74 535.8450000000001 Td
/F6.0 11 Tf
-<29293b> Tj
+<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
+323.24 535.8450000000001 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
+328.74 535.8450000000001 Td
+/F6.0 11 Tf
+<3b> Tj
ET
0.000 0.000 0.000 SCN
@@ -11485,27 +12009,26 @@ Q
endstream
endobj
-85 0 obj
+84 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 84 0 R
+/Contents 83 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/Font << /F2.0 16 0 R
/F1.0 8 0 R
/F6.0 43 0 R
-/F7.0 52 0 R
>>
-/XObject << /Stamp1 366 0 R
+/XObject << /Stamp1 365 0 R
>>
>>
-/Annots [87 0 R 89 0 R]
+/Annots [86 0 R 88 0 R]
>>
endobj
-86 0 obj
-[85 0 R /XYZ 0 841.89 null]
+85 0 obj
+[84 0 R /XYZ 0 841.89 null]
endobj
-87 0 obj
+86 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -11516,10 +12039,10 @@ endobj
/Type /Annot
>>
endobj
-88 0 obj
-[85 0 R /XYZ 0 452.6700000000002 null]
+87 0 obj
+[84 0 R /XYZ 0 452.6700000000002 null]
endobj
-89 0 obj
+88 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -11530,8 +12053,8 @@ endobj
/Type /Annot
>>
endobj
-90 0 obj
-<< /Length 23100
+89 0 obj
+<< /Length 24094
>>
stream
q
@@ -11716,7 +12239,7 @@ ET
BT
519.29 663.466 Td
-/F8.0 10.5 Tf
+/F7.0 10.5 Tf
<c9> Tj
ET
@@ -12024,12 +12547,12 @@ f
h
S
Q
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
59.24000000000001 474.3650000000001 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<7075626c6963> Tj
ET
@@ -12046,12 +12569,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
BT
97.74000000000001 474.3650000000001 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<636c617373> Tj
ET
@@ -12068,12 +12591,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
BT
130.74 474.3650000000001 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<4a556e697452756c654d6f636b65727932546573745f6175746f576972696e675f736574746572496e6a656374696f6e5f686170707943617365> Tj
ET
@@ -12112,8 +12635,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
BT
81.24000000000001 444.8850000000001 Td
@@ -12134,12 +12657,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
81.24000000000001 430.1450000000001 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<7075626c6963> Tj
ET
@@ -12244,8 +12767,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
372.74 430.1450000000001 Td
@@ -12288,8 +12811,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
64.74000000000001 415.4050000000001 Td
@@ -12305,7 +12828,18 @@ ET
BT
185.74 415.4050000000001 Td
/F6.0 11 Tf
-<293b> Tj
+<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
+191.24 415.4050000000001 Td
+/F6.0 11 Tf
+<3b> Tj
ET
0.000 0.000 0.000 SCN
@@ -12321,8 +12855,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
BT
81.24000000000001 385.9250000000001 Td
@@ -12343,12 +12877,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
81.24000000000001 371.1850000000001 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<70726976617465> Tj
ET
@@ -12420,8 +12954,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
BT
81.24000000000001 341.70500000000015 Td
@@ -12442,12 +12976,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
81.24000000000001 326.96500000000015 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<70726976617465> Tj
ET
@@ -12519,8 +13053,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
BT
81.24000000000001 297.4850000000001 Td
@@ -12541,12 +13075,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
81.24000000000001 282.7450000000001 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<7075626c6963> Tj
ET
@@ -12563,12 +13097,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
BT
119.74000000000001 282.7450000000001 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<766f6964> Tj
ET
@@ -12602,7 +13136,18 @@ ET
BT
180.24 282.7450000000001 Td
/F6.0 11 Tf
-<2829> 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
+
+BT
+185.74 282.7450000000001 Td
+/F6.0 11 Tf
+<29> Tj
ET
0.000 0.000 0.000 SCN
@@ -12684,8 +13229,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
240.74 268.0050000000001 Td
@@ -12778,7 +13323,62 @@ ET
BT
405.74 268.0050000000001 Td
/F6.0 11 Tf
-<28292929293b> 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
+
+BT
+411.24 268.0050000000001 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
+416.74 268.0050000000001 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
+422.24 268.0050000000001 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
+427.74 268.0050000000001 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
+433.24 268.0050000000001 Td
+/F6.0 11 Tf
+<3b> Tj
ET
0.000 0.000 0.000 SCN
@@ -13022,26 +13622,25 @@ Q
endstream
endobj
-91 0 obj
+90 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 90 0 R
+/Contents 89 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/Font << /F3.1 37 0 R
/F5.0 40 0 R
/F1.0 8 0 R
/F6.0 43 0 R
-/F8.0 83 0 R
-/F7.0 52 0 R
+/F7.0 82 0 R
>>
-/XObject << /Stamp1 366 0 R
+/XObject << /Stamp1 365 0 R
>>
>>
-/Annots [92 0 R 93 0 R 94 0 R 95 0 R 96 0 R 97 0 R 98 0 R]
+/Annots [91 0 R 92 0 R 93 0 R 94 0 R 95 0 R 96 0 R 97 0 R]
>>
endobj
-92 0 obj
+91 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -13052,7 +13651,7 @@ endobj
/Type /Annot
>>
endobj
-93 0 obj
+92 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -13063,7 +13662,7 @@ endobj
/Type /Annot
>>
endobj
-94 0 obj
+93 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -13074,7 +13673,7 @@ endobj
/Type /Annot
>>
endobj
-95 0 obj
+94 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -13085,7 +13684,7 @@ endobj
/Type /Annot
>>
endobj
-96 0 obj
+95 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -13096,7 +13695,7 @@ endobj
/Type /Annot
>>
endobj
-97 0 obj
+96 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -13107,7 +13706,7 @@ endobj
/Type /Annot
>>
endobj
-98 0 obj
+97 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -13118,7 +13717,7 @@ endobj
/Type /Annot
>>
endobj
-99 0 obj
+98 0 obj
<< /Length 10666
>>
stream
@@ -13610,27 +14209,27 @@ Q
endstream
endobj
-100 0 obj
+99 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 99 0 R
+/Contents 98 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/Font << /F2.0 16 0 R
/F1.0 8 0 R
/F6.0 43 0 R
/F3.1 37 0 R
>>
-/XObject << /Stamp1 366 0 R
+/XObject << /Stamp1 365 0 R
>>
>>
-/Annots [102 0 R 103 0 R]
+/Annots [101 0 R 102 0 R]
>>
endobj
-101 0 obj
-[100 0 R /XYZ 0 841.89 null]
+100 0 obj
+[99 0 R /XYZ 0 841.89 null]
endobj
-102 0 obj
+101 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -13641,7 +14240,7 @@ endobj
/Type /Annot
>>
endobj
-103 0 obj
+102 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -13652,11 +14251,11 @@ endobj
/Type /Annot
>>
endobj
-104 0 obj
-[100 0 R /XYZ 0 556.8100000000002 null]
+103 0 obj
+[99 0 R /XYZ 0 556.8100000000002 null]
endobj
-105 0 obj
-<< /Length 44609
+104 0 obj
+<< /Length 49066
>>
stream
q
@@ -13690,13 +14289,13 @@ h
S
Q
/DeviceRGB cs
-0.000 0.533 0.000 scn
+0.000 0.400 0.600 scn
/DeviceRGB CS
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 SCN
BT
59.24 783.0649999999999 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<7075626c6963> Tj
ET
@@ -13713,12 +14312,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
BT
97.74000000000001 783.0649999999999 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<636c617373> Tj
ET
@@ -13735,12 +14334,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
BT
130.74 783.0649999999999 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<46616b6545787465726e616c53797374656d456e64706f696e7452756c6554657374> Tj
ET
@@ -13779,8 +14378,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
BT
81.24000000000001 768.3249999999999 Td
@@ -13801,12 +14400,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
81.24000000000001 753.585 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<7075626c6963> Tj
ET
@@ -13889,12 +14488,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
103.24000000000001 738.845 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<6e6577> Tj
ET
@@ -13955,8 +14554,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
422.24 738.845 Td
@@ -13972,7 +14571,18 @@ ET
BT
449.74 738.845 Td
/F6.0 11 Tf
-<293b> Tj
+<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
+455.24 738.845 Td
+/F6.0 11 Tf
+<3b> Tj
ET
0.000 0.000 0.000 SCN
@@ -14010,12 +14620,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
81.24000000000001 724.105 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<70726976617465> Tj
ET
@@ -14087,12 +14697,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
81.24000000000001 709.365 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<70726976617465> Tj
ET
@@ -14186,8 +14796,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
BT
81.24000000000001 694.625 Td
@@ -14208,12 +14818,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
81.24000000000001 679.885 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<7075626c6963> Tj
ET
@@ -14230,12 +14840,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
BT
119.74000000000001 679.885 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<766f6964> Tj
ET
@@ -14269,7 +14879,18 @@ ET
BT
174.74 679.885 Td
/F6.0 11 Tf
-<2829> 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
+
+BT
+180.24 679.885 Td
+/F6.0 11 Tf
+<29> Tj
ET
0.000 0.000 0.000 SCN
@@ -14285,12 +14906,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
191.24 679.885 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<7468726f7773> Tj
ET
@@ -14417,8 +15038,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
185.74 650.405 Td
@@ -14461,8 +15082,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
460.74 650.405 Td
@@ -14478,7 +15099,18 @@ ET
BT
488.24 650.405 Td
/F6.0 11 Tf
-<293b> Tj
+<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
+493.74 650.405 Td
+/F6.0 11 Tf
+<3b> Tj
ET
0.000 0.000 0.000 SCN
@@ -14516,12 +15148,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
103.24000000000001 635.665 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<66696e616c> Tj
ET
@@ -14538,8 +15170,8 @@ 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
136.24 635.665 Td
@@ -14626,8 +15258,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
185.74 620.925 Td
@@ -14670,8 +15302,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
438.74 620.925 Td
@@ -14687,7 +15319,18 @@ ET
BT
466.24 620.925 Td
/F6.0 11 Tf
-<293b> Tj
+<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
+471.74 620.925 Td
+/F6.0 11 Tf
+<3b> Tj
ET
0.000 0.000 0.000 SCN
@@ -14725,12 +15368,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
103.24000000000001 606.185 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<66696e616c> Tj
ET
@@ -14835,12 +15478,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
147.24 591.4449999999999 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<6e6577> Tj
ET
@@ -14901,8 +15544,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
372.74 591.4449999999999 Td
@@ -14918,7 +15561,40 @@ ET
BT
411.24 591.4449999999999 Td
/F6.0 11 Tf
-<2829293b> 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
+
+BT
+416.74 591.4449999999999 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
+422.24 591.4449999999999 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
+427.74 591.4449999999999 Td
+/F6.0 11 Tf
+<3b> Tj
ET
0.000 0.000 0.000 SCN
@@ -15022,8 +15698,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
361.74 576.7049999999999 Td
@@ -15039,7 +15715,29 @@ ET
BT
477.24 576.7049999999999 Td
/F6.0 11 Tf
-<28293b> 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
+
+BT
+482.74 576.7049999999999 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
+488.24 576.7049999999999 Td
+/F6.0 11 Tf
+<3b> Tj
ET
0.000 0.000 0.000 SCN
@@ -15220,8 +15918,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
152.74 547.2249999999999 Td
@@ -15237,13 +15935,35 @@ ET
BT
246.24 547.2249999999999 Td
/F6.0 11 Tf
-<28292e> 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
+
+BT
+251.74 547.2249999999999 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.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+257.24 547.2249999999999 Td
+/F6.0 11 Tf
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
262.74 547.2249999999999 Td
@@ -15297,8 +16017,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
235.24 532.4849999999999 Td
@@ -15369,7 +16089,18 @@ ET
BT
103.24000000000001 503.00499999999994 Td
/F6.0 11 Tf
-<293b> Tj
+<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
+108.74000000000001 503.00499999999994 Td
+/F6.0 11 Tf
+<3b> Tj
ET
0.000 0.000 0.000 SCN
@@ -15407,8 +16138,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
BT
81.24000000000001 473.5249999999999 Td
@@ -15429,12 +16160,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
81.24000000000001 458.7849999999999 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<7075626c6963> Tj
ET
@@ -15451,12 +16182,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
BT
119.74000000000001 458.7849999999999 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<766f6964> Tj
ET
@@ -15490,7 +16221,18 @@ ET
BT
202.24 458.7849999999999 Td
/F6.0 11 Tf
-<2829> 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
+
+BT
+207.74 458.7849999999999 Td
+/F6.0 11 Tf
+<29> Tj
ET
0.000 0.000 0.000 SCN
@@ -15506,12 +16248,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
218.74 458.7849999999999 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<7468726f7773> Tj
ET
@@ -15572,8 +16314,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.600 0.600 0.600 scn
+0.600 0.600 0.600 SCN
BT
103.24000000000001 444.0449999999999 Td
@@ -15594,12 +16336,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
103.24000000000001 429.3049999999999 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<66696e616c> Tj
ET
@@ -15682,12 +16424,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
224.24 429.3049999999999 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<6e6577> Tj
ET
@@ -15721,7 +16463,29 @@ ET
BT
279.24 429.3049999999999 Td
/F6.0 11 Tf
-<28293b> 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
+
+BT
+284.74 429.3049999999999 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
+290.24 429.3049999999999 Td
+/F6.0 11 Tf
+<3b> Tj
ET
0.000 0.000 0.000 SCN
@@ -15765,7 +16529,29 @@ ET
BT
103.24000000000001 414.5649999999999 Td
/F6.0 11 Tf
-<2e2e2e> Tj
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+108.74000000000001 414.5649999999999 Td
+/F6.0 11 Tf
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+114.24000000000001 414.5649999999999 Td
+/F6.0 11 Tf
+<2e> Tj
ET
0.000 0.000 0.000 SCN
@@ -15781,8 +16567,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.600 0.600 0.600 scn
+0.600 0.600 0.600 SCN
BT
103.24000000000001 399.8249999999999 Td
@@ -15803,12 +16589,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
103.24000000000001 385.08499999999987 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<66696e616c> Tj
ET
@@ -15891,12 +16677,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
279.24 385.08499999999987 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<6e6577> Tj
ET
@@ -15930,7 +16716,29 @@ ET
BT
378.24 385.08499999999987 Td
/F6.0 11 Tf
-<28293b> 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
+
+BT
+383.74 385.08499999999987 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
+389.24 385.08499999999987 Td
+/F6.0 11 Tf
+<3b> Tj
ET
0.000 0.000 0.000 SCN
@@ -15974,7 +16782,29 @@ ET
BT
103.24000000000001 370.34499999999986 Td
/F6.0 11 Tf
-<2e2e2e> Tj
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+108.74000000000001 370.34499999999986 Td
+/F6.0 11 Tf
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+114.24000000000001 370.34499999999986 Td
+/F6.0 11 Tf
+<2e> Tj
ET
0.000 0.000 0.000 SCN
@@ -16012,8 +16842,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
207.74 355.60499999999985 Td
@@ -16029,13 +16859,35 @@ ET
BT
246.24 355.60499999999985 Td
/F6.0 11 Tf
-<28292e> Tj
+<28> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+251.74 355.60499999999985 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
+257.24 355.60499999999985 Td
+/F6.0 11 Tf
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
262.74 355.60499999999985 Td
@@ -16073,7 +16925,18 @@ ET
BT
405.74 355.60499999999985 Td
/F6.0 11 Tf
-<293b> Tj
+<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
+411.24 355.60499999999985 Td
+/F6.0 11 Tf
+<3b> Tj
ET
0.000 0.000 0.000 SCN
@@ -16089,8 +16952,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.600 0.600 0.600 scn
+0.600 0.600 0.600 SCN
BT
103.24000000000001 340.86499999999984 Td
@@ -16199,8 +17062,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
361.74 326.12499999999983 Td
@@ -16238,7 +17101,18 @@ ET
BT
422.24 326.12499999999983 Td
/F6.0 11 Tf
-<293b> Tj
+<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
+427.74 326.12499999999983 Td
+/F6.0 11 Tf
+<3b> Tj
ET
0.000 0.000 0.000 SCN
@@ -16276,8 +17150,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.600 0.600 0.600 scn
+0.600 0.600 0.600 SCN
BT
103.24000000000001 311.3849999999998 Td
@@ -16298,12 +17172,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
103.24000000000001 296.6449999999998 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<66696e616c> Tj
ET
@@ -16320,8 +17194,8 @@ 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
136.24 296.6449999999998 Td
@@ -16463,8 +17337,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
229.74 281.9049999999998 Td
@@ -16480,13 +17354,35 @@ ET
BT
268.24 281.9049999999998 Td
/F6.0 11 Tf
-<28292e> Tj
+<28> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+273.74 281.9049999999998 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
+279.24 281.9049999999998 Td
+/F6.0 11 Tf
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
284.74 281.9049999999998 Td
@@ -16502,7 +17398,29 @@ ET
BT
339.74 281.9049999999998 Td
/F6.0 11 Tf
-<28293b> 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
+
+BT
+345.24 281.9049999999998 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
+350.74 281.9049999999998 Td
+/F6.0 11 Tf
+<3b> Tj
ET
0.000 0.000 0.000 SCN
@@ -16524,7 +17442,29 @@ ET
BT
103.24000000000001 267.16499999999985 Td
/F6.0 11 Tf
-<2e2e2e> Tj
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+108.74000000000001 267.16499999999985 Td
+/F6.0 11 Tf
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+114.24000000000001 267.16499999999985 Td
+/F6.0 11 Tf
+<2e> Tj
ET
0.000 0.000 0.000 SCN
@@ -16773,35 +17713,34 @@ Q
endstream
endobj
-106 0 obj
+105 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 105 0 R
+/Contents 104 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F7.0 52 0 R
-/F6.0 43 0 R
-/F6.1 107 0 R
+/Font << /F6.0 43 0 R
+/F6.1 106 0 R
/F1.0 8 0 R
>>
-/XObject << /Stamp1 366 0 R
+/XObject << /Stamp1 365 0 R
>>
>>
>>
endobj
-107 0 obj
+106 0 obj
<< /Type /Font
-/BaseFont /AAAAEO+mplus1mn-regular
+/BaseFont /AAAAEA+mplus1mn-regular
/Subtype /TrueType
-/FontDescriptor 434 0 R
+/FontDescriptor 429 0 R
/FirstChar 32
/LastChar 255
-/Widths 436 0 R
-/ToUnicode 435 0 R
+/Widths 431 0 R
+/ToUnicode 430 0 R
>>
endobj
-108 0 obj
-<< /Length 19537
+107 0 obj
+<< /Length 19821
>>
stream
q
@@ -16889,8 +17828,8 @@ f
h
S
Q
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
BT
59.239999999999995 705.725 Td
@@ -16900,12 +17839,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
59.239999999999995 690.985 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<7075626c6963> Tj
ET
@@ -16988,12 +17927,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
147.24 676.2450000000001 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<6e6577> Tj
ET
@@ -17065,8 +18004,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
290.24 661.5050000000001 Td
@@ -17120,8 +18059,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
273.74 646.7650000000001 Td
@@ -17175,8 +18114,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
284.74 632.0250000000001 Td
@@ -17192,7 +18131,18 @@ ET
BT
312.24 632.0250000000001 Td
/F6.0 11 Tf
-<293b> Tj
+<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
+317.74 632.0250000000001 Td
+/F6.0 11 Tf
+<3b> Tj
ET
0.000 0.000 0.000 SCN
@@ -17323,8 +18273,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
185.74 540.7650000000001 Td
@@ -17367,8 +18317,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
416.74 540.7650000000001 Td
@@ -17384,7 +18334,18 @@ ET
BT
444.24 540.7650000000001 Td
/F6.0 11 Tf
-<293b> Tj
+<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
+449.74 540.7650000000001 Td
+/F6.0 11 Tf
+<3b> Tj
ET
0.000 0.000 0.000 SCN
@@ -17710,12 +18671,12 @@ f
h
S
Q
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
BT
59.239999999999995 256.42499999999995 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<3c646570656e64656e63793e> Tj
ET
@@ -17732,12 +18693,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
BT
81.24 241.68499999999995 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<3c67726f757049643e> Tj
ET
@@ -17754,12 +18715,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
BT
240.74 241.68499999999995 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<3c2f67726f757049643e> Tj
ET
@@ -17776,12 +18737,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
BT
81.24 226.94499999999994 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<3c617274696661637449643e> Tj
ET
@@ -17798,12 +18759,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
BT
284.74 226.94499999999994 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<3c2f617274696661637449643e> Tj
ET
@@ -17820,12 +18781,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
BT
81.24 212.20499999999993 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<3c73636f70653e> Tj
ET
@@ -17842,12 +18803,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
BT
141.74 212.20499999999993 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<3c2f73636f70653e> Tj
ET
@@ -17875,12 +18836,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
BT
59.239999999999995 197.46499999999992 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<3c2f646570656e64656e63793e> Tj
ET
@@ -18010,41 +18971,40 @@ Q
endstream
endobj
-109 0 obj
+108 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 108 0 R
+/Contents 107 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F6.1 107 0 R
+/Font << /F6.1 106 0 R
/F1.0 8 0 R
/F6.0 43 0 R
-/F7.0 52 0 R
/F2.0 16 0 R
>>
-/XObject << /Stamp1 366 0 R
+/XObject << /Stamp1 365 0 R
>>
>>
-/Annots [114 0 R]
+/Annots [113 0 R]
>>
endobj
-110 0 obj
-[109 0 R /XYZ 0 455.51 null]
+109 0 obj
+[108 0 R /XYZ 0 455.51 null]
endobj
-111 0 obj
+110 0 obj
<< /Limits [(1-13-0-improved-intent) (_ugtst_integ-test-support_typical-usage)]
-/Names [(1-13-0-improved-intent) 136 0 R (1-8-0-and-earlier) 141 0 R (1-9-0-code-appmanifest-code) 137 0 R (_ugtst) 13 0 R (_ugtst_aaa) 35 0 R (_ugtst_bdd-spec-support) 185 0 R (_ugtst_bdd-spec-support_bdd-tooling) 221 0 R (_ugtst_bdd-spec-support_how-it-works) 189 0 R (_ugtst_bdd-spec-support_key-classes) 194 0 R (_ugtst_bdd-spec-support_maven-configuration) 226 0 R (_ugtst_bdd-spec-support_writing-a-bdd-spec) 202 0 R (_ugtst_fixture-scripts) 232 0 R (_ugtst_fixture-scripts_api-and-usage) 237 0 R (_ugtst_fixture-scripts_api-and-usage_organizing) 279 0 R (_ugtst_fixture-scripts_sudo-service) 299 0 R (_ugtst_integ-test-support) 119 0 R (_ugtst_integ-test-support_bootstrapping) 130 0 R (_ugtst_integ-test-support_bootstrapping_IntegrationTestAbstract) 152 0 R (_ugtst_integ-test-support_maven-configuration) 179 0 R (_ugtst_integ-test-support_typical-usage) 120 0 R]
+/Names [(1-13-0-improved-intent) 135 0 R (1-8-0-and-earlier) 140 0 R (1-9-0-code-appmanifest-code) 136 0 R (_ugtst) 13 0 R (_ugtst_aaa) 35 0 R (_ugtst_bdd-spec-support) 184 0 R (_ugtst_bdd-spec-support_bdd-tooling) 220 0 R (_ugtst_bdd-spec-support_how-it-works) 188 0 R (_ugtst_bdd-spec-support_key-classes) 193 0 R (_ugtst_bdd-spec-support_maven-configuration) 225 0 R (_ugtst_bdd-spec-support_writing-a-bdd-spec) 201 0 R (_ugtst_fixture-scripts) 231 0 R (_ugtst_fixture-scripts_api-and-usage) 236 0 R (_ugtst_fixture-scripts_api-and-usage_organizing) 278 0 R (_ugtst_fixture-scripts_sudo-service) 298 0 R (_ugtst_integ-test-support) 118 0 R (_ugtst_integ-test-support_bootstrapping) 129 0 R (_ugtst_integ-test-support_bootstrapping_IntegrationTestAbstract) 151 0 R (_ugtst_integ-test-support_maven-configuration) 178 0 R (_ugtst_integ-test-support_typical-usage) 119 0 R]
>>
endobj
-112 0 obj
+111 0 obj
<< /Limits [(fake-data) (xml-marshalling-support)]
-/Names [(fake-data) 58 0 R (feature-toggles) 60 0 R (firing-domain-events) 173 0 R (fixture-management) 54 0 R (further-approaches) 295 0 R (given-when-then) 53 0 R (injected-services-method) 82 0 R (integ-tests-vs-bdd-specs) 39 0 R (isisconfigurationforjdointegtests) 146 0 R (other-guides) 17 0 R (simulated-ui-code-wrapperfactory-code) 42 0 R (system-initializer) 135 0 R (unit-tests-vs-integ-tests) 36 0 R (using-the-wrapper) 171 0 R (using-within-tests) 275 0 R (value-objects) 86 0 R (wrapping-and-unwrapping) 167 0 R (xml-marshalling-support) 110 0 R]
+/Names [(fake-data) 57 0 R (feature-toggles) 59 0 R (firing-domain-events) 172 0 R (fixture-management) 53 0 R (further-approaches) 294 0 R (given-when-then) 52 0 R (injected-services-method) 81 0 R (integ-tests-vs-bdd-specs) 39 0 R (isisconfigurationforjdointegtests) 145 0 R (other-guides) 17 0 R (simulated-ui-code-wrapperfactory-code) 42 0 R (system-initializer) 134 0 R (unit-tests-vs-integ-tests) 36 0 R (using-the-wrapper) 170 0 R (using-within-tests) 274 0 R (value-objects) 85 0 R (wrapping-and-unwrapping) 166 0 R (xml-marshalling-support) 109 0 R]
>>
endobj
-113 0 obj
-[109 0 R /XYZ 0 362.89 null]
+112 0 obj
+[108 0 R /XYZ 0 362.89 null]
endobj
-114 0 obj
+113 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -18055,7 +19015,7 @@ endobj
/Type /Annot
>>
endobj
-115 0 obj
+114 0 obj
<< /Length 10913
>>
stream
@@ -18090,13 +19050,13 @@ h
S
Q
/DeviceRGB cs
-0.733 0.000 0.400 scn
+0.184 0.435 0.624 scn
/DeviceRGB CS
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 SCN
BT
59.24 783.0649999999999 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<3c706c7567696e3e> Tj
ET
@@ -18113,12 +19073,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
BT
81.24000000000001 768.3249999999999 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<3c67726f757049643e> Tj
ET
@@ -18135,12 +19095,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
BT
262.74 768.3249999999999 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<3c2f67726f757049643e> Tj
ET
@@ -18157,12 +19117,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
BT
81.24000000000001 753.585 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<3c617274696661637449643e> Tj
ET
@@ -18179,12 +19139,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
BT
262.74 753.585 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<3c2f617274696661637449643e> Tj
ET
@@ -18201,12 +19161,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
BT
81.24000000000001 738.845 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<3c76657273696f6e3e> Tj
ET
@@ -18223,12 +19183,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
BT
152.74 738.845 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<3c2f76657273696f6e3e> Tj
ET
@@ -18245,12 +19205,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
BT
81.24000000000001 724.105 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<3c636f6e66696775726174696f6e3e> Tj
ET
@@ -18267,12 +19227,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
BT
103.24000000000001 709.365 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<3c696e636c756465733e> Tj
ET
@@ -18289,12 +19249,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
BT
125.24000000000001 694.625 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<3c696e636c7564653e> Tj
ET
@@ -18311,12 +19271,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
BT
246.24 694.625 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<3c2f696e636c7564653e> Tj
ET
@@ -18333,12 +19293,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
BT
125.24000000000001 679.885 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<3c696e636c7564653e> Tj
ET
@@ -18355,12 +19315,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
BT
257.24 679.885 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<3c2f696e636c7564653e> Tj
ET
@@ -18377,12 +19337,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
BT
125.24000000000001 665.145 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<3c696e636c7564653e> Tj
ET
@@ -18399,12 +19359,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
BT
251.74 665.145 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<3c2f696e636c7564653e> Tj
ET
@@ -18421,12 +19381,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
BT
103.24000000000001 650.405 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<3c2f696e636c756465733e> Tj
ET
@@ -18443,12 +19403,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
BT
103.24000000000001 635.665 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<3c6578636c756465733e> Tj
ET
@@ -18465,12 +19425,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
BT
125.24000000000001 620.925 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<3c6578636c7564653e> Tj
ET
@@ -18487,12 +19447,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
BT
246.24 620.925 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<3c2f6578636c7564653e> Tj
ET
@@ -18509,12 +19469,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
BT
125.24000000000001 606.185 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<3c6578636c7564653e> Tj
ET
@@ -18531,12 +19491,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
BT
279.24 606.185 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<3c2f6578636c7564653e> Tj
ET
@@ -18553,12 +19513,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
BT
125.24000000000001 591.4449999999999 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<3c6578636c7564653e> Tj
ET
@@ -18575,12 +19535,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
BT
273.74 591.4449999999999 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<3c2f6578636c7564653e> Tj
ET
@@ -18597,12 +19557,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
BT
103.24000000000001 576.7049999999999 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<3c2f6578636c756465733e> Tj
ET
@@ -18619,12 +19579,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
BT
103.24000000000001 561.9649999999999 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<3c75736546696c653e> Tj
ET
@@ -18641,12 +19601,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
BT
174.74 561.9649999999999 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<3c2f75736546696c653e> Tj
ET
@@ -18663,12 +19623,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
BT
103.24000000000001 547.2249999999999 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<3c7072696e7453756d6d6172793e> Tj
ET
@@ -18685,12 +19645,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
BT
202.24 547.2249999999999 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<3c2f7072696e7453756d6d6172793e> Tj
ET
@@ -18707,12 +19667,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
BT
103.24000000000001 532.4849999999999 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<3c6f75747075744469726563746f72793e> Tj
ET
@@ -18729,12 +19689,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
BT
433.24 532.4849999999999 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<3c2f6f75747075744469726563746f72793e> Tj
ET
@@ -18751,23 +19711,23 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
BT
81.24000000000001 517.7449999999999 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<3c2f636f6e66696775726174696f6e3e> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
BT
59.24 503.00499999999994 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<3c2f706c7567696e3e> Tj
ET
@@ -18797,23 +19757,22 @@ Q
endstream
endobj
-116 0 obj
+115 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 115 0 R
+/Contents 114 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F7.0 52 0 R
-/F6.0 43 0 R
+/Font << /F6.0 43 0 R
/F1.0 8 0 R
>>
-/XObject << /Stamp1 366 0 R
+/XObject << /Stamp1 365 0 R
>>
>>
>>
endobj
-117 0 obj
-<< /Length 26834
+116 0 obj
+<< /Length 28890
>>
stream
q
@@ -19102,12 +20061,12 @@ f
h
S
Q
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
59.24000000000001 478.46500000000043 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<7075626c6963> Tj
ET
@@ -19124,12 +20083,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
BT
97.74000000000001 478.46500000000043 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<636c617373> Tj
ET
@@ -19146,12 +20105,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
BT
130.74 478.46500000000043 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<546f446f4974656d> Tj
ET
@@ -19174,7 +20133,29 @@ ET
BT
180.24 478.46500000000043 Td
/F6.0 11 Tf
-<2e2e2e> Tj
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+185.74 478.46500000000043 Td
+/F6.0 11 Tf
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+191.24 478.46500000000043 Td
+/F6.0 11 Tf
+<2e> Tj
ET
0.000 0.000 0.000 SCN
@@ -19212,12 +20193,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
81.24000000000001 448.9850000000004 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<70726976617465> Tj
ET
@@ -19234,12 +20215,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
BT
125.24000000000001 448.9850000000004 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
<626f6f6c65616e> Tj
ET
@@ -19289,8 +20270,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
BT
81.24000000000001 434.2450000000004 Td
@@ -19388,8 +20369,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200
<TRUNCATED>
[33/44] isis-site git commit: ISIS-1594: provide an 'edit' button
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/83a3755a/content/guides/rgcms.html
----------------------------------------------------------------------
diff --git a/content/guides/rgcms.html b/content/guides/rgcms.html
index 9153f9d..dea4eb3 100644
--- a/content/guides/rgcms.html
+++ b/content/guides/rgcms.html
@@ -1,12 +1,10 @@
<!doctype html>
<html class="no-js" lang="en">
-<head>
- <meta charset="utf-8"/>
- <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-
- <title>Classes, Methods and Schema</title>
-
- <!--
+ <head>
+ <meta charset="utf-8">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+ <title>Classes, Methods and Schema</title>
+ <!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
@@ -23,31 +21,21 @@
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
- -->
-
- <!-- No caching headers -->
- <meta http-equiv="cache-control" content="no-cache" />
- <meta http-equiv="pragma" content="no-cache" />
- <meta http-equiv="expires" content="-1" />
-
-
- <!-- TODO: need to (re)instate CDN in the future (not using for now just so can develop off-line -->
- <link href="../css/foundation/5.5.1/foundation.css" rel="stylesheet" />
- <script src="../js/foundation/5.5.1/vendor/modernizr.js"></script>
- <link href="../css/asciidoctor/colony.css" rel="stylesheet">
- <link href="../css/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet">
-
-
-
-
- <link href="../css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.css" rel="stylesheet" />
- <!--[if lt IE 9]>
+ -->
+ <!-- No caching headers -->
+ <meta http-equiv="cache-control" content="no-cache">
+ <meta http-equiv="pragma" content="no-cache">
+ <meta http-equiv="expires" content="-1">
+ <!-- TODO: need to (re)instate CDN in the future (not using for now just so can develop off-line -->
+ <link href="../css/foundation/5.5.1/foundation.css" rel="stylesheet">
+ <script src="../js/foundation/5.5.1/vendor/modernizr.js"></script>
+ <link href="../css/asciidoctor/colony.css" rel="stylesheet">
+ <link href="../css/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet">
+ <link href="../css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.css" rel="stylesheet">
+ <!--[if lt IE 9]>
<link href="../css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.ie.css" rel="stylesheet" />
- <![endif]-->
-
-
-
- <style type="text/css">
+ <![endif]-->
+ <style type="text/css">
pre code {
background-color: inherit;
border-style: none;
@@ -192,9 +180,8 @@ table.CodeRay td.code>pre{padding:0}
color:#fff;
font-size: 1.1em;
}
- </style>
-
- <style>
+ </style>
+ <style>
@media only screen and (min-width: 40.063em) {
.top-bar {
.contain-to-grid .top-bar {
@@ -205,9 +192,8 @@ table.CodeRay td.code>pre{padding:0}
.row {
max-width: 80rem;
}
- </style>
-
- <style>
+ </style>
+ <style>
.extended-quote,
.extended-quote-first {
margin-left: 40px;
@@ -231,9 +217,8 @@ table.CodeRay td.code>pre{padding:0}
text-shadow: 0 1px 2px rgba(0, 0, 0, 0.1);
}
- </style>
-
- <style>
+ </style>
+ <style>
body {
position: relative;
}
@@ -255,6 +240,7 @@ table.CodeRay td.code>pre{padding:0}
div#doc-content {
margin-top: 30px;
+ padding-top: 30px;
}
div.documentation-page table.frame-all {
@@ -286,9 +272,8 @@ table.CodeRay td.code>pre{padding:0}
min-height: 2000px;
}
- </style>
-
- <style>
+ </style>
+ <style>
@media only screen and (min-width: 768px) {
#toc.toc2 ul ul { margin-left: -10px; }
@@ -316,15 +301,13 @@ table.CodeRay td.code>pre{padding:0}
body div#toc2 li.tocify-item.active a {
color: red;
}
- </style>
-
- <style>
+ </style>
+ <style>
footer {
margin-top: 1000px;
}
- </style>
-
- <style>
+ </style>
+ <style>
/* overriding colony.css stylesheet */
.literalblock pre, .literalblock pre[class], .listingblock pre, .listingblock pre[class] {
/*padding: 1.25em 1.5625em 1.125em 1.5625em;*/
@@ -372,9 +355,8 @@ table.CodeRay td.code>pre{padding:0}
.imageblock img {
margin-bottom: 10px;
}
- </style>
-
- <style>
+ </style>
+ <style>
/* from http://ben.balter.com/2014/03/13/pages-anchor-links/ */
.header-link {
position: absolute;
@@ -395,9 +377,8 @@ table.CodeRay td.code>pre{padding:0}
h6:hover .header-link {
opacity: 1;
}
- </style>
-
- <style>
+ </style>
+ <style>
.top-bar
{
-webkit-transition-duration: .5s;
@@ -425,510 +406,487 @@ table.CodeRay td.code>pre{padding:0}
-webkit-transition-property: -webkit-transform;
transition-property: transform;
}
- </style>
-
- <style>
+ </style>
+ <style>
#doc-content a.guide {
color: white;
}
- </style>
-
- <style>
+ </style>
+ <style>
+ .tocify {
+ margin-top: 80px;
+ }
+ </style>
+ <style>
.tocify {
margin-top: 80px;
}
- </style>
-
-
-</script>
-
-</head>
-<body>
-
-<<div class="github-fork-ribbon-wrapper right" style="position: fixed;">
- <div class="github-fork-ribbon">
- <a href="https://github.com/apache/isis#fork-destination-box">Fork me on GitHub</a>
- </div>
-</div>
-
-
-<div class="row">
-
- <div class="fixed contain-to-grid header">
- <nav class="top-bar" data-topbar role="navigation" style="max-width: 80rem">
- <ul class="title-area">
- <li class="name">
- <h1>
- <a href="/index.html">Apache Isis™</a>
- </h1>
- </li>
- <!-- Remove the class "menu-icon" to get rid of menu icon. Take out "Menu" to just have icon alone -->
- <li class="toggle-topbar menu-icon"><a href="#"><span>Menu</span></a></li>
- </ul>
-
- <section class="top-bar-section">
- <ul class="right">
-
- <li class="has-form">
- <FORM class="searchbox navbar-form navbar-right" id="searchbox_012614087480249044419:dn-q5gtwxya" action="http://www.google.com/cse">
- <div class="row collapse">
- <input type="hidden" name="cx" value="012614087480249044419:dn-q5gtwxya">
- <INPUT type="hidden" name="cof" value="FORID:0">
- <INPUT class="form-control" name="q" type="text" placeholder="Search">
- </div>
- </FORM>
- </li>
-
- </ul>
-
- <!-- Left Nav Section -->
- <ul class="left">
-
- <li><a href="/documentation.html">Documentation</a></li>
- <li><a href="/downloads.html">Downloads</a></li>
- <li><a href="/help.html">Help</a></li>
- <li><a href="/asf.html">@ASF</a></li>
-
- </ul>
-
- </section>
- </nav>
- </div>
-</div>
-
-<div class="row">
-
- <div id="doc-content-left" class="large-9 medium-9 columns">
-
-
- <div id="doc-content">
- <div class="sect1">
-<h2 id="_rgcms">1. Classes, Methods and Schema</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>This reference guide lists and describes various elements of the the Apache Isis Programming Model, specifically
-reserved and prefix <a href="#_rgcms_methods">methods</a> (such as <code>title()</code> and <code>validate…​()</code>) and various utility and
-supporting <a href="#_rgcms_classes">classes</a>.</p>
-</div>
-<div class="paragraph">
-<p>It also describes the <a href="#_rgcms_schema">XSD schema</a> defined by Apache Isis. One use case is for the
-JAXB serialization of view models.</p>
-</div>
-<div class="sect2">
-<h3 id="_other_guides">1.1. Other Guides</h3>
-<div class="paragraph">
-<p>Apache Isis documentation is broken out into a number of user, reference and "supporting procedures" guides.</p>
-</div>
-<div class="paragraph">
-<p>The user guides available are:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="ugfun.html">Fundamentals</a></p>
-</li>
-<li>
-<p><a href="ugvw.html">Wicket viewer</a></p>
-</li>
-<li>
-<p><a href="ugvro.html">Restful Objects viewer</a></p>
-</li>
-<li>
-<p><a href="ugdno.html">DataNucleus object store</a></p>
-</li>
-<li>
-<p><a href="ugsec.html">Security</a></p>
-</li>
-<li>
-<p><a href="ugtst.html">Testing</a></p>
-</li>
-<li>
-<p><a href="ugbtb.html">Beyond the Basics</a></p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>The reference guides are:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="rgant.html">Annotations</a></p>
-</li>
-<li>
-<p><a href="rgsvc.html">Domain Services</a></p>
-</li>
-<li>
-<p><a href="rgcfg.html">Configuration Properties</a></p>
-</li>
-<li>
-<p><a href="#">Classes, Methods and Schema</a> (this guide)</p>
-</li>
-<li>
-<p><a href="rgmvn.html">Apache Isis Maven plugin</a></p>
-</li>
-<li>
-<p><a href="rgfis.html">Framework Internal Services</a></p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>The remaining guides are:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="dg.html">Developers' Guide</a> (how to set up a development environment
-for Apache Isis and contribute back to the project)</p>
-</li>
-<li>
-<p><a href="cgcom.html">Committers' Guide</a> (release procedures and related practices)</p>
-</li>
-</ul>
-</div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_rgcms_methods">2. Methods</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>The Apache Isis metamodel is built up from declaratively (ie, <a href="rgant.html#_rgant">annotations</a>) and imperatively, from "supporting" methods and other reserved methods.</p>
-</div>
-<div class="paragraph">
-<p>This chapter documents the supporting methods and the reserved methods. It also documents (separately) the reserved methods that act as callback hooks into the persistence lifecycle of domain entities.</p>
-</div>
-<div class="sect2">
-<h3 id="_rgcms_methods_prefixes">2.1. Supporting Method Prefixes</h3>
-<div class="paragraph">
-<p>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.</p>
-</div>
-<div class="paragraph">
-<p>This association is performed by name matching. Thus, a property called "firstName", derived from a method <code>getFirstName()</code> may have supporting methods <code>hideFirstName()</code>, <code>disableFirstName()</code> and <code>validateFirstName()</code>. Supporting methods are, therefore, each characterized by their own particular prefix.</p>
-</div>
-<div class="admonitionblock note">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-note" title="Note"></i>
-</td>
-<td class="content">
-<div class="paragraph">
-<p>Using name matching to associate supporting methods generally works very well, but of course if an object member’s method is renamed, there’s always the risk that the developer forgets to rename the supporting method; the supporting methods become "orphaned".</p>
-</div>
-<div class="paragraph">
-<p>Apache Isis checks for this automatically, and will fail-fast (fail to boot) if any orphaned methods are located. A suitable error message is logged so that the issue can be easily diagnosed.</p>
-</div>
-</td>
-</tr>
-</table>
-</div>
-<div class="paragraph">
-<p>The table below lists the method prefixes that are recognized as part of Apache Isis' default programming model.</p>
-</div>
-<table class="tableblock frame-all grid-all spread">
-<caption class="title">Table 1. Recognized Method Prefixes</caption>
-<colgroup>
-<col style="width: 18.1818%;">
-<col style="width: 9.0909%;">
-<col style="width: 9.0909%;">
-<col style="width: 9.0909%;">
-<col style="width: 9.0909%;">
-<col style="width: 9.0909%;">
-<col style="width: 36.3637%;">
-</colgroup>
-<thead>
-<tr>
-<th class="tableblock halign-left valign-top">Prefix</th>
-<th class="tableblock halign-left valign-top">Object</th>
-<th class="tableblock halign-left valign-top">Property</th>
-<th class="tableblock halign-left valign-top">Collection</th>
-<th class="tableblock halign-left valign-top">Action</th>
-<th class="tableblock halign-left valign-top">Action<br>
-Param</th>
-<th class="tableblock halign-left valign-top">Description</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgcms_methods_prefixes_addTo"><code>addTo…​()</code></a></p></td>
-<td class="tableblock halign-left valign-top"></td>
-<td class="tableblock halign-left valign-top"></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Y</p></td>
-<td class="tableblock halign-left valign-top"></td>
-<td class="tableblock halign-left valign-top"></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>add object to a collection <br></p>
-</div>
-<div class="admonitionblock note">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-note" title="Note"></i>
-</td>
-<td class="content">
-<div class="paragraph">
-<p>Directly mutable collections are not currently supported by the <a href="ugvw.html">Wicket viewer</a>.</p>
-</div>
-</td>
-</tr>
-</table>
-</div>
-<div class="paragraph">
-<p>See also <a href="#_rgcms_methods_prefixes_removeFrom"><code>removeFrom…​()</code></a>`</p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgcms_methods_prefixes_autoComplete"><code>autoComplete…​()</code></a></p></td>
-<td class="tableblock halign-left valign-top"></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Y</p></td>
-<td class="tableblock halign-left valign-top"></td>
-<td class="tableblock halign-left valign-top"></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Y</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Return a list of matching elements for a property or an action parameter.<br></p>
-</div>
-<div class="paragraph">
-<p>Alternatively, can specify for a class using <a href="rgant.html#_rgant-DomainObject_autoCompleteRepository"><code>@DomainObject</code><br>
-<code>#autoCompleteRepository</code></a><br></p>
-</div>
-<div class="paragraph">
-<p>See also <a href="#_rgcms_methods_prefixes_choices"><code>choices…​()</code></a></p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgcms_methods_prefixes_choices"><code>choices…​()</code></a></p></td>
-<td class="tableblock halign-left valign-top"></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Y</p></td>
-<td class="tableblock halign-left valign-top"></td>
-<td class="tableblock halign-left valign-top"></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Y</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Provide list of choices for a property or action parameter.<br></p>
-</div>
-<div class="paragraph">
-<p>See also <a href="#_rgcms_methods_prefixes_autoComplete"><code>autoComplete…​()</code></a>.</p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgcms_methods_prefixes_clear"><code>clear…​()</code></a></p></td>
-<td class="tableblock halign-left valign-top"></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Y</p></td>
-<td class="tableblock halign-left valign-top"></td>
-<td class="tableblock halign-left valign-top"></td>
-<td class="tableblock halign-left valign-top"></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Clear a property (set it to null).<br></p>
-</div>
-<div class="paragraph">
-<p>Allows business logic to be placed apart from the setter.<br></p>
-</div>
-<div class="paragraph">
-<p>See also <a href="#_rgcms_methods_prefixes_modify"><code>modify…​()</code></a></p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgcms_methods_prefixes_default"><code>default…​()</code></a></p></td>
-<td class="tableblock halign-left valign-top"></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Y</p></td>
-<td class="tableblock halign-left valign-top"></td>
-<td class="tableblock halign-left valign-top"></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Y</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Default value for a property or an action parameter.</p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgcms_methods_prefixes_disable"><code>disable…​()</code></a></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Y</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Y</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Y</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Y</p></td>
-<td class="tableblock halign-left valign-top"></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Disables (makes read-only) a property, a collection or an action.</p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgcms_methods_prefixes_get"><code>get…​()</code></a></p></td>
-<td class="tableblock halign-left valign-top"></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Y</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Y</p></td>
-<td class="tableblock halign-left valign-top"></td>
-<td class="tableblock halign-left valign-top"></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Access the value of a property or collection.<br></p>
-</div>
-<div class="paragraph">
-<p>See also <a href="#_rgcms_methods_prefixes_set"><code>set…​()</code></a>.</p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgcms_methods_prefixes_hide"><code>hide…​()</code></a></p></td>
-<td class="tableblock halign-left valign-top"></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Y</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Y</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Y</p></td>
-<td class="tableblock halign-left valign-top"></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Hides a property, a collection or an action.</p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgcms_methods_prefixes_modify"><code>modify…​()</code></a></p></td>
-<td class="tableblock halign-left valign-top"></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Y</p></td>
-<td class="tableblock halign-left valign-top"></td>
-<td class="tableblock halign-left valign-top"></td>
-<td class="tableblock halign-left valign-top"></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Modify a property (set it to a non-null) value.<br></p>
-</div>
-<div class="paragraph">
-<p>Allows business logic to be placed apart from the setter.<br></p>
-</div>
-<div class="paragraph">
-<p>See also <a href="#_rgcms_methods_prefixes_clear"><code>clear…​()</code></a>`.</p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgcms_methods_prefixes_removeFrom"><code>removeFrom…​()</code></a></p></td>
-<td class="tableblock halign-left valign-top"></td>
-<td class="tableblock halign-left valign-top"></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Y</p></td>
-<td class="tableblock halign-left valign-top"></td>
-<td class="tableblock halign-left valign-top"></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>remove object from a collection.<br></p>
-</div>
-<div class="admonitionblock note">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-note" title="Note"></i>
-</td>
-<td class="content">
-<div class="paragraph">
-<p>Directly mutable collections are not currently supported by the <a href="ugvw.html">Wicket viewer</a>.</p>
-</div>
-</td>
-</tr>
-</table>
-</div>
-<div class="paragraph">
-<p>See also <a href="#_rgcms_methods_prefixes_addTo"><code>addTo…​()</code></a>`</p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgcms_methods_prefixes_set"><code>set…​()</code></a></p></td>
-<td class="tableblock halign-left valign-top"></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Y</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Y</p></td>
-<td class="tableblock halign-left valign-top"></td>
-<td class="tableblock halign-left valign-top"></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Sets the value of a property or a collection.</p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgcms_methods_prefixes_validate"><code>validate…​()</code></a></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Y</p></td>
-<td class="tableblock halign-left valign-top"></td>
-<td class="tableblock halign-left valign-top"></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Y</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Y</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Check that a proposed value of a property or a set of action parameters or a single action parameter is valid.<br></p>
-</div>
-<div class="paragraph">
-<p>See also <a href="#_rgcms_methods_prefixes_validateAddTo"><code>validateAddTo…​()</code></a> and <a href="#_rgcms_methods_prefixes_validateRemoveFrom"><code>validateRemoveFrom…​()</code></a> to validate modifications to collections.</p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgcms_methods_prefixes_validateAddTo"><code>validate<br>
-AddTo…​()</code></a></p></td>
-<td class="tableblock halign-left valign-top"></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Y</p></td>
-<td class="tableblock halign-left valign-top"></td>
-<td class="tableblock halign-left valign-top"></td>
-<td class="tableblock halign-left valign-top"></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Check that a proposed object to add to a collection is valid.<br></p>
-</div>
-<div class="admonitionblock note">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-note" title="Note"></i>
-</td>
-<td class="content">
-<div class="paragraph">
-<p>Directly mutable collections are not currently supported by the <a href="ugvw.html">Wicket viewer</a>.</p>
-</div>
-</td>
-</tr>
-</table>
-</div>
-<div class="paragraph">
-<p>See also <a href="#_rgcms_methods_prefixes_validateRemoveFrom"><code>validateRemoveFrom…​()</code></a>, and <a href="#_rgcms_methods_prefixes_validate"><code>validate…​()</code></a> for properties and actions.</p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgcms_methods_prefixes_validateRemoveFrom"><code>validate<br>
-RemoveFrom…​()</code></a></p></td>
-<td class="tableblock halign-left valign-top"></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Y</p></td>
-<td class="tableblock halign-left valign-top"></td>
-<td class="tableblock halign-left valign-top"></td>
-<td class="tableblock halign-left valign-top"></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Check that a proposed object to remove from a collection is valid.<br></p>
-</div>
-<div class="admonitionblock note">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-note" title="Note"></i>
-</td>
-<td class="content">
-<div class="paragraph">
-<p>Directly mutable collections are not currently supported by the <a href="ugvw.html">Wicket viewer</a>.</p>
-</div>
-</td>
-</tr>
-</table>
-</div>
-<div class="paragraph">
-<p>See also <a href="#_rgcms_methods_prefixes_validateAddTo"><code>validateAddTo…​()</code></a>, and <a href="#_rgcms_methods_prefixes_validate"><code>validate…​()</code></a> for properties and actions.</p>
-</div></div></td>
-</tr>
-</tbody>
-</table>
-<div class="sect3">
-<h4 id="_rgcms_methods_prefixes_addTo">2.1.1. <code>addTo…​()</code></h4>
-<div class="paragraph">
-<p>The <code>addTo…​()</code> supporting method is called whenever an object is added to a collection. Its purpose is to allow additional business logic to be performed.</p>
-</div>
-<div class="admonitionblock note">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-note" title="Note"></i>
-</td>
-<td class="content">
-<div class="paragraph">
-<p>Directly mutable collections are not currently supported by the <a href="ugvw.html">Wicket viewer</a>. The suggested workaround is to simply define an action.</p>
-</div>
-</td>
-</tr>
-</table>
-</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">LibraryMember</span> {
+ </style>
+ </head>
+ <body>
+ <div class="row">
+ <div class="fixed contain-to-grid header">
+ <nav class="top-bar" data-topbar role="navigation" style="max-width: 80rem">
+ <ul class="title-area">
+ <li class="name"> <h1> <a href="/index.html">Apache Isis\u2122</a> </h1> </li>
+ <!-- Remove the class "menu-icon" to get rid of menu icon. Take out "Menu" to just have icon alone -->
+ <li class="toggle-topbar menu-icon"><a href="#"><span>Menu</span></a></li>
+ </ul>
+ <section class="top-bar-section">
+ <ul class="right">
+ <li class="has-form">
+ <form class="searchbox navbar-form navbar-right" id="searchbox_012614087480249044419:dn-q5gtwxya" action="http://www.google.com/cse">
+ <div class="row collapse">
+ <input type="hidden" name="cx" value="012614087480249044419:dn-q5gtwxya">
+ <input type="hidden" name="cof" value="FORID:0">
+ <input class="form-control" name="q" type="text" placeholder="Search">
+ </div>
+ </form> </li>
+ </ul>
+ <!-- Left Nav Section -->
+ <ul class="left">
+ <li><a href="/documentation.html">Documentation</a></li>
+ <li><a href="/downloads.html">Downloads</a></li>
+ <li><a href="/help.html">Help</a></li>
+ <li><a href="/asf.html">@ASF</a></li>
+ </ul>
+ </section>
+ </nav>
+ </div>
+ </div>
+ <div class="row">
+ <div id="doc-content-left" class="large-9 medium-9 columns">
+ <div id="doc-content">
+ <button type="button" class="button secondary" onclick="window.location.href="https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/rgcms.adoc"" style="float: right; font-size: small; padding: 6px; "><i class="fa fa-pencil-square-o"></i> Edit</button>
+ <div class="sect1">
+ <h2 id="_rgcms">1. Classes, Methods and Schema</h2>
+ <button type="button" class="button secondary" onclick="window.location.href="https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/_rgcms.adoc"" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i> Edit</button>
+ <div class="sectionbody">
+ <div class="paragraph">
+ <p>This reference guide lists and describes various elements of the the Apache Isis Programming Model, specifically reserved and prefix <a href="#_rgcms_methods">methods</a> (such as <code>title()</code> and <code>validate\u2026\u200b()</code>) and various utility and supporting <a href="#_rgcms_classes">classes</a>.</p>
+ </div>
+ <div class="paragraph">
+ <p>It also describes the <a href="#_rgcms_schema">XSD schema</a> defined by Apache Isis. One use case is for the JAXB serialization of view models.</p>
+ </div>
+ <div class="sect2">
+ <h3 id="_other_guides">1.1. Other Guides</h3>
+ <div class="paragraph">
+ <p>Apache Isis documentation is broken out into a number of user, reference and "supporting procedures" guides.</p>
+ </div>
+ <div class="paragraph">
+ <p>The user guides available are:</p>
+ </div>
+ <div class="ulist">
+ <ul>
+ <li> <p><a href="ugfun.html">Fundamentals</a></p> </li>
+ <li> <p><a href="ugvw.html">Wicket viewer</a></p> </li>
+ <li> <p><a href="ugvro.html">Restful Objects viewer</a></p> </li>
+ <li> <p><a href="ugdno.html">DataNucleus object store</a></p> </li>
+ <li> <p><a href="ugsec.html">Security</a></p> </li>
+ <li> <p><a href="ugtst.html">Testing</a></p> </li>
+ <li> <p><a href="ugbtb.html">Beyond the Basics</a></p> </li>
+ </ul>
+ </div>
+ <div class="paragraph">
+ <p>The reference guides are:</p>
+ </div>
+ <div class="ulist">
+ <ul>
+ <li> <p><a href="rgant.html">Annotations</a></p> </li>
+ <li> <p><a href="rgsvc.html">Domain Services</a></p> </li>
+ <li> <p><a href="rgcfg.html">Configuration Properties</a></p> </li>
+ <li> <p><a href="#">Classes, Methods and Schema</a> (this guide)</p> </li>
+ <li> <p><a href="rgmvn.html">Apache Isis Maven plugin</a></p> </li>
+ <li> <p><a href="rgfis.html">Framework Internal Services</a></p> </li>
+ </ul>
+ </div>
+ <div class="paragraph">
+ <p>The remaining guides are:</p>
+ </div>
+ <div class="ulist">
+ <ul>
+ <li> <p><a href="dg.html">Developers' Guide</a> (how to set up a development environment for Apache Isis and contribute back to the project)</p> </li>
+ <li> <p><a href="cgcom.html">Committers' Guide</a> (release procedures and related practices)</p> </li>
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="sect1">
+ <h2 id="_rgcms_methods">2. Methods</h2>
+ <button type="button" class="button secondary" onclick="window.location.href="https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/_rgcms_methods.adoc"" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i> Edit</button>
+ <div class="sectionbody">
+ <div class="paragraph">
+ <p>The Apache Isis metamodel is built up from declaratively (ie, <a href="rgant.html#_rgant">annotations</a>) and imperatively, from "supporting" methods and other reserved methods.</p>
+ </div>
+ <div class="paragraph">
+ <p>This chapter documents the supporting methods and the reserved methods. It also documents (separately) the reserved methods that act as callback hooks into the persistence lifecycle of domain entities.</p>
+ </div>
+ <div class="sect2">
+ <h3 id="_rgcms_methods_prefixes">2.1. Supporting Method Prefixes</h3>
+ <div class="paragraph">
+ <p>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.</p>
+ </div>
+ <div class="paragraph">
+ <p>This association is performed by name matching. Thus, a property called "firstName", derived from a method <code>getFirstName()</code> may have supporting methods <code>hideFirstName()</code>, <code>disableFirstName()</code> and <code>validateFirstName()</code>. Supporting methods are, therefore, each characterized by their own particular prefix.</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>Using name matching to associate supporting methods generally works very well, but of course if an object member\u2019s method is renamed, there\u2019s always the risk that the developer forgets to rename the supporting method; the supporting methods become "orphaned".</p>
+ </div>
+ <div class="paragraph">
+ <p>Apache Isis checks for this automatically, and will fail-fast (fail to boot) if any orphaned methods are located. A suitable error message is logged so that the issue can be easily diagnosed.</p>
+ </div> </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ <div class="paragraph">
+ <p>The table below lists the method prefixes that are recognized as part of Apache Isis' default programming model.</p>
+ </div>
+ <table class="tableblock frame-all grid-all spread">
+ <caption class="title">
+ Table 1. Recognized Method Prefixes
+ </caption>
+ <colgroup>
+ <col style="width: 18.1818%;">
+ <col style="width: 9.0909%;">
+ <col style="width: 9.0909%;">
+ <col style="width: 9.0909%;">
+ <col style="width: 9.0909%;">
+ <col style="width: 9.0909%;">
+ <col style="width: 36.3637%;">
+ </colgroup>
+ <thead>
+ <tr>
+ <th class="tableblock halign-left valign-top">Prefix</th>
+ <th class="tableblock halign-left valign-top">Object</th>
+ <th class="tableblock halign-left valign-top">Property</th>
+ <th class="tableblock halign-left valign-top">Collection</th>
+ <th class="tableblock halign-left valign-top">Action</th>
+ <th class="tableblock halign-left valign-top">Action<br> Param</th>
+ <th class="tableblock halign-left valign-top">Description</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgcms_methods_prefixes_addTo"><code>addTo\u2026\u200b()</code></a></p></td>
+ <td class="tableblock halign-left valign-top"></td>
+ <td class="tableblock halign-left valign-top"></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock">Y</p></td>
+ <td class="tableblock halign-left valign-top"></td>
+ <td class="tableblock halign-left valign-top"></td>
+ <td class="tableblock halign-left valign-top">
+ <div>
+ <div class="paragraph">
+ <p>add object to a collection <br></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>Directly mutable collections are not currently supported by the <a href="ugvw.html">Wicket viewer</a>.</p>
+ </div> </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ <div class="paragraph">
+ <p>See also <a href="#_rgcms_methods_prefixes_removeFrom"><code>removeFrom\u2026\u200b()</code></a>`</p>
+ </div>
+ </div></td>
+ </tr>
+ <tr>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgcms_methods_prefixes_autoComplete"><code>autoComplete\u2026\u200b()</code></a></p></td>
+ <td class="tableblock halign-left valign-top"></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock">Y</p></td>
+ <td class="tableblock halign-left valign-top"></td>
+ <td class="tableblock halign-left valign-top"></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock">Y</p></td>
+ <td class="tableblock halign-left valign-top">
+ <div>
+ <div class="paragraph">
+ <p>Return a list of matching elements for a property or an action parameter.<br></p>
+ </div>
+ <div class="paragraph">
+ <p>Alternatively, can specify for a class using <a href="rgant.html#_rgant-DomainObject_autoCompleteRepository"><code>@DomainObject</code><br> <code>#autoCompleteRepository</code></a><br></p>
+ </div>
+ <div class="paragraph">
+ <p>See also <a href="#_rgcms_methods_prefixes_choices"><code>choices\u2026\u200b()</code></a></p>
+ </div>
+ </div></td>
+ </tr>
+ <tr>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgcms_methods_prefixes_choices"><code>choices\u2026\u200b()</code></a></p></td>
+ <td class="tableblock halign-left valign-top"></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock">Y</p></td>
+ <td class="tableblock halign-left valign-top"></td>
+ <td class="tableblock halign-left valign-top"></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock">Y</p></td>
+ <td class="tableblock halign-left valign-top">
+ <div>
+ <div class="paragraph">
+ <p>Provide list of choices for a property or action parameter.<br></p>
+ </div>
+ <div class="paragraph">
+ <p>See also <a href="#_rgcms_methods_prefixes_autoComplete"><code>autoComplete\u2026\u200b()</code></a>.</p>
+ </div>
+ </div></td>
+ </tr>
+ <tr>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgcms_methods_prefixes_clear"><code>clear\u2026\u200b()</code></a></p></td>
+ <td class="tableblock halign-left valign-top"></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock">Y</p></td>
+ <td class="tableblock halign-left valign-top"></td>
+ <td class="tableblock halign-left valign-top"></td>
+ <td class="tableblock halign-left valign-top"></td>
+ <td class="tableblock halign-left valign-top">
+ <div>
+ <div class="paragraph">
+ <p>Clear a property (set it to null).<br></p>
+ </div>
+ <div class="paragraph">
+ <p>Allows business logic to be placed apart from the setter.<br></p>
+ </div>
+ <div class="paragraph">
+ <p>See also <a href="#_rgcms_methods_prefixes_modify"><code>modify\u2026\u200b()</code></a></p>
+ </div>
+ </div></td>
+ </tr>
+ <tr>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgcms_methods_prefixes_default"><code>default\u2026\u200b()</code></a></p></td>
+ <td class="tableblock halign-left valign-top"></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock">Y</p></td>
+ <td class="tableblock halign-left valign-top"></td>
+ <td class="tableblock halign-left valign-top"></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock">Y</p></td>
+ <td class="tableblock halign-left valign-top">
+ <div>
+ <div class="paragraph">
+ <p>Default value for a property or an action parameter.</p>
+ </div>
+ </div></td>
+ </tr>
+ <tr>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgcms_methods_prefixes_disable"><code>disable\u2026\u200b()</code></a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock">Y</p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock">Y</p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock">Y</p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock">Y</p></td>
+ <td class="tableblock halign-left valign-top"></td>
+ <td class="tableblock halign-left valign-top">
+ <div>
+ <div class="paragraph">
+ <p>Disables (makes read-only) a property, a collection or an action.</p>
+ </div>
+ </div></td>
+ </tr>
+ <tr>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgcms_methods_prefixes_get"><code>get\u2026\u200b()</code></a></p></td>
+ <td class="tableblock halign-left valign-top"></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock">Y</p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock">Y</p></td>
+ <td class="tableblock halign-left valign-top"></td>
+ <td class="tableblock halign-left valign-top"></td>
+ <td class="tableblock halign-left valign-top">
+ <div>
+ <div class="paragraph">
+ <p>Access the value of a property or collection.<br></p>
+ </div>
+ <div class="paragraph">
+ <p>See also <a href="#_rgcms_methods_prefixes_set"><code>set\u2026\u200b()</code></a>.</p>
+ </div>
+ </div></td>
+ </tr>
+ <tr>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgcms_methods_prefixes_hide"><code>hide\u2026\u200b()</code></a></p></td>
+ <td class="tableblock halign-left valign-top"></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock">Y</p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock">Y</p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock">Y</p></td>
+ <td class="tableblock halign-left valign-top"></td>
+ <td class="tableblock halign-left valign-top">
+ <div>
+ <div class="paragraph">
+ <p>Hides a property, a collection or an action.</p>
+ </div>
+ </div></td>
+ </tr>
+ <tr>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgcms_methods_prefixes_modify"><code>modify\u2026\u200b()</code></a></p></td>
+ <td class="tableblock halign-left valign-top"></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock">Y</p></td>
+ <td class="tableblock halign-left valign-top"></td>
+ <td class="tableblock halign-left valign-top"></td>
+ <td class="tableblock halign-left valign-top"></td>
+ <td class="tableblock halign-left valign-top">
+ <div>
+ <div class="paragraph">
+ <p>Modify a property (set it to a non-null) value.<br></p>
+ </div>
+ <div class="paragraph">
+ <p>Allows business logic to be placed apart from the setter.<br></p>
+ </div>
+ <div class="paragraph">
+ <p>See also <a href="#_rgcms_methods_prefixes_clear"><code>clear\u2026\u200b()</code></a>`.</p>
+ </div>
+ </div></td>
+ </tr>
+ <tr>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgcms_methods_prefixes_removeFrom"><code>removeFrom\u2026\u200b()</code></a></p></td>
+ <td class="tableblock halign-left valign-top"></td>
+ <td class="tableblock halign-left valign-top"></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock">Y</p></td>
+ <td class="tableblock halign-left valign-top"></td>
+ <td class="tableblock halign-left valign-top"></td>
+ <td class="tableblock halign-left valign-top">
+ <div>
+ <div class="paragraph">
+ <p>remove object from a collection.<br></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>Directly mutable collections are not currently supported by the <a href="ugvw.html">Wicket viewer</a>.</p>
+ </div> </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ <div class="paragraph">
+ <p>See also <a href="#_rgcms_methods_prefixes_addTo"><code>addTo\u2026\u200b()</code></a>`</p>
+ </div>
+ </div></td>
+ </tr>
+ <tr>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgcms_methods_prefixes_set"><code>set\u2026\u200b()</code></a></p></td>
+ <td class="tableblock halign-left valign-top"></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock">Y</p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock">Y</p></td>
+ <td class="tableblock halign-left valign-top"></td>
+ <td class="tableblock halign-left valign-top"></td>
+ <td class="tableblock halign-left valign-top">
+ <div>
+ <div class="paragraph">
+ <p>Sets the value of a property or a collection.</p>
+ </div>
+ </div></td>
+ </tr>
+ <tr>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgcms_methods_prefixes_validate"><code>validate\u2026\u200b()</code></a></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock">Y</p></td>
+ <td class="tableblock halign-left valign-top"></td>
+ <td class="tableblock halign-left valign-top"></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock">Y</p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock">Y</p></td>
+ <td class="tableblock halign-left valign-top">
+ <div>
+ <div class="paragraph">
+ <p>Check that a proposed value of a property or a set of action parameters or a single action parameter is valid.<br></p>
+ </div>
+ <div class="paragraph">
+ <p>See also <a href="#_rgcms_methods_prefixes_validateAddTo"><code>validateAddTo\u2026\u200b()</code></a> and <a href="#_rgcms_methods_prefixes_validateRemoveFrom"><code>validateRemoveFrom\u2026\u200b()</code></a> to validate modifications to collections.</p>
+ </div>
+ </div></td>
+ </tr>
+ <tr>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgcms_methods_prefixes_validateAddTo"><code>validate<br> AddTo\u2026\u200b()</code></a></p></td>
+ <td class="tableblock halign-left valign-top"></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock">Y</p></td>
+ <td class="tableblock halign-left valign-top"></td>
+ <td class="tableblock halign-left valign-top"></td>
+ <td class="tableblock halign-left valign-top"></td>
+ <td class="tableblock halign-left valign-top">
+ <div>
+ <div class="paragraph">
+ <p>Check that a proposed object to add to a collection is valid.<br></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>Directly mutable collections are not currently supported by the <a href="ugvw.html">Wicket viewer</a>.</p>
+ </div> </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ <div class="paragraph">
+ <p>See also <a href="#_rgcms_methods_prefixes_validateRemoveFrom"><code>validateRemoveFrom\u2026\u200b()</code></a>, and <a href="#_rgcms_methods_prefixes_validate"><code>validate\u2026\u200b()</code></a> for properties and actions.</p>
+ </div>
+ </div></td>
+ </tr>
+ <tr>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgcms_methods_prefixes_validateRemoveFrom"><code>validate<br> RemoveFrom\u2026\u200b()</code></a></p></td>
+ <td class="tableblock halign-left valign-top"></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock">Y</p></td>
+ <td class="tableblock halign-left valign-top"></td>
+ <td class="tableblock halign-left valign-top"></td>
+ <td class="tableblock halign-left valign-top"></td>
+ <td class="tableblock halign-left valign-top">
+ <div>
+ <div class="paragraph">
+ <p>Check that a proposed object to remove from a collection is valid.<br></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>Directly mutable collections are not currently supported by the <a href="ugvw.html">Wicket viewer</a>.</p>
+ </div> </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ <div class="paragraph">
+ <p>See also <a href="#_rgcms_methods_prefixes_validateAddTo"><code>validateAddTo\u2026\u200b()</code></a>, and <a href="#_rgcms_methods_prefixes_validate"><code>validate\u2026\u200b()</code></a> for properties and actions.</p>
+ </div>
+ </div></td>
+ </tr>
+ </tbody>
+ </table>
+ <div class="sect3">
+ <h4 id="_rgcms_methods_prefixes_addTo">2.1.1. <code>addTo\u2026\u200b()</code></h4>
+ <div class="paragraph">
+ <p>The <code>addTo\u2026\u200b()</code> supporting method is called whenever an object is added to a collection. Its purpose is to allow additional business logic to be performed.</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>Directly mutable collections are not currently supported by the <a href="ugvw.html">Wicket viewer</a>. The suggested workaround is to simply define an action.</p>
+ </div> </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ <div class="paragraph">
+ <p>For example:</p>
+ </div>
+ <div class="listingblock">
+ <div class="content">
+ <pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">class</span> <span class="class">LibraryMember</span> {
<span class="directive">public</span> <span class="predefined-type">SortedSet</span><<span class="predefined-type">Book</span>> getBorrowed() { ... }
<span class="directive">public</span> <span class="type">void</span> setBorrowed(<span class="predefined-type">SortedSet</span><<span class="predefined-type">Book</span>> borrowed) { ... }
<span class="directive">public</span> <span class="type">void</span> addToBorrowed(<span class="predefined-type">Book</span> book) {
@@ -937,66 +895,67 @@ RemoveFrom…​()</code></a></p></td>
}
<span class="directive">public</span> <span class="type">void</span> removeFromBorrowed(<span class="predefined-type">Book</span> book) { ... }
...
-}</code></pre>
-</div>
-</div>
-<div class="colist arabic">
-<table>
-<tr>
-<td><i class="conum" data-value="1"></i><b>1</b></td>
-<td>update the collection</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="2"></i><b>2</b></td>
-<td>perform some additional business logic</td>
-</tr>
-</table>
-</div>
-<div class="paragraph">
-<p>See also <a href="#_rgcms_methods_prefixes_removeFrom"><code>removeFrom…​()</code></a>`</p>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_rgcms_methods_prefixes_autoComplete">2.1.2. <code>autoComplete…​()</code></h4>
-<div class="paragraph">
-<p>The <code>autoComplete…​()</code> supporting method is called for action parameters and for properties to find objects from a drop-down list box. The use case is when the number of candidate objects is expected to be large, so the user is required to enter some characters to narrow the search down.</p>
-</div>
-<div class="admonitionblock tip">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-tip" title="Tip"></i>
-</td>
-<td class="content">
-<div class="paragraph">
-<p>If the number of candidate objects is comparatively small, then use <a href="#_rgcms_methods_prefixes_choices"><code>choices…​()</code></a> supporting method instead.</p>
-</div>
-</td>
-</tr>
-</table>
-</div>
-<div class="paragraph">
-<p>The signature of the supporting method depends on whether it is for a parameter or a property.</p>
-</div>
-<div class="sect4">
-<h5 id="_parameters">Parameters</h5>
-<div class="paragraph">
-<p>For an action parameter in (0-based) position <em>N</em>, and of type <code>T</code>, the signature is:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="predefined-type">List</span><T> autoCompleteNXxx(<span class="predefined-type">String</span> search) { ... }</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>It is also valid to return <code>T[]</code>, a <code>Set<T></code> or a <code>Collection<T></code>.</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">ShoppingCartItem</span> {
+}</code></pre>
+ </div>
+ </div>
+ <div class="colist arabic">
+ <table>
+ <tbody>
+ <tr>
+ <td><i class="conum" data-value="1"></i><b>1</b></td>
+ <td>update the collection</td>
+ </tr>
+ <tr>
+ <td><i class="conum" data-value="2"></i><b>2</b></td>
+ <td>perform some additional business logic</td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ <div class="paragraph">
+ <p>See also <a href="#_rgcms_methods_prefixes_removeFrom"><code>removeFrom\u2026\u200b()</code></a>`</p>
+ </div>
+ </div>
+ <div class="sect3">
+ <h4 id="_rgcms_methods_prefixes_autoComplete">2.1.2. <code>autoComplete\u2026\u200b()</code></h4>
+ <div class="paragraph">
+ <p>The <code>autoComplete\u2026\u200b()</code> supporting method is called for action parameters and for properties to find objects from a drop-down list box. The use case is when the number of candidate objects is expected to be large, so the user is required to enter some characters to narrow the search down.</p>
+ </div>
+ <div class="admonitionblock tip">
+ <table>
+ <tbody>
+ <tr>
+ <td class="icon"> <i class="fa icon-tip" title="Tip"></i> </td>
+ <td class="content">
+ <div class="paragraph">
+ <p>If the number of candidate objects is comparatively small, then use <a href="#_rgcms_methods_prefixes_choices"><code>choices\u2026\u200b()</code></a> supporting method instead.</p>
+ </div> </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ <div class="paragraph">
+ <p>The signature of the supporting method depends on whether it is for a parameter or a property.</p>
+ </div>
+ <div class="sect4">
+ <h5 id="_parameters">Parameters</h5>
+ <div class="paragraph">
+ <p>For an action parameter in (0-based) position <em>N</em>, and of type <code>T</code>, the signature is:</p>
+ </div>
+ <div class="listingblock">
+ <div class="content">
+ <pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="predefined-type">List</span><T> autoCompleteNXxx(<span class="predefined-type">String</span> search) { ... }</code></pre>
+ </div>
+ </div>
+ <div class="paragraph">
+ <p>It is also valid to return <code>T[]</code>, a <code>Set<T></code> or a <code>Collection<T></code>.</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">ShoppingCartItem</span> {
<span class="annotation">@Property</span>(editing=Editing.DISABLED)
<span class="directive">public</span> Product getProduct() { ... }
<span class="directive">public</span> <span class="type">void</span> setProduct(Product product) { ... }
@@ -1008,7 +967,7 @@ RemoveFrom…​()</code></a></p></td>
<span class="annotation">@Action</span>(semantics=SemanticsOf.IDEMPOTENT)
<span class="directive">public</span> ShoppingCartItem updateProduct(
Product product,
- <span class="annotation">@ParameterLayout</span>(named=<span class="string"><span class="delimiter">"</span><span class="content">Quantity</span><span class="delimiter">"</span></span>)
+ <span class="annotation">@ParameterLayout</span>(named=<span class="string"><span class="delimiter">"</span><span class="content">Quantity</span><span class="delimiter">"</span></span>)
<span class="directive">final</span> <span class="type">int</span> quantity) {
setProduct(product);
setQuantity(quantity);
@@ -1019,41 +978,43 @@ RemoveFrom…​()</code></a></p></td>
...
}
...
-}</code></pre>
-</div>
-</div>
-<div class="colist arabic">
-<table>
-<tr>
-<td><i class="conum" data-value="1"></i><b>1</b></td>
-<td><code>product</code> is the 0th argument of the action.</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="2"></i><b>2</b></td>
-<td>the <a href="rgant.html#_rgant-MinLength"><code>@MinLength</code></a> annotation specifies the minimum number of characters that must be entered before a search is performed for matching objects</td>
-</tr>
-</table>
-</div>
-</div>
-<div class="sect4">
-<h5 id="_properties">Properties</h5>
-<div class="paragraph">
-<p>For a property of type <code>T</code>, the signature is:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="predefined-type">List</span><T> autoCompleteXxx(<span class="predefined-type">String</span> search) { ... }</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>(As for action parameters) it is also valid to return <code>T[]</code>, a <code>Set<T></code> or a <code>Collection<T></code>.</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">ShoppingCartItem</span> {
+}</code></pre>
+ </div>
+ </div>
+ <div class="colist arabic">
+ <table>
+ <tbody>
+ <tr>
+ <td><i class="conum" data-value="1"></i><b>1</b></td>
+ <td><code>product</code> is the 0th argument of the action.</td>
+ </tr>
+ <tr>
+ <td><i class="conum" data-value="2"></i><b>2</b></td>
+ <td>the <a href="rgant.html#_rgant-MinLength"><code>@MinLength</code></a> annotation specifies the minimum number of characters that must be entered before a search is performed for matching objects</td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ </div>
+ <div class="sect4">
+ <h5 id="_properties">Properties</h5>
+ <div class="paragraph">
+ <p>For a property of type <code>T</code>, the signature is:</p>
+ </div>
+ <div class="listingblock">
+ <div class="content">
+ <pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="predefined-type">List</span><T> autoCompleteXxx(<span class="predefined-type">String</span> search) { ... }</code></pre>
+ </div>
+ </div>
+ <div class="paragraph">
+ <p>(As for action parameters) it is also valid to return <code>T[]</code>, a <code>Set<T></code> or a <code>Collection<T></code>.</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">ShoppingCartItem</span> {
<span class="directive">public</span> Product getProduct() { ... }
<span class="directive">public</span> <span class="type">void</span> setProduct(Product product) { ... }
@@ -1063,43 +1024,45 @@ RemoveFrom…​()</code></a></p></td>
...
}
...
-}</code></pre>
-</div>
-</div>
-<div class="colist arabic">
-<table>
-<tr>
-<td><i class="conum" data-value="1"></i><b>1</b></td>
-<td>the <a href="rgant.html#_rgant-MinLength"><code>@MinLength</code></a> annotation specifies the minimum number of characters that must be entered before a search is performed for matching objects</td>
-</tr>
-</table>
-</div>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_rgcms_methods_prefixes_choices">2.1.3. <code>choices…​()</code></h4>
-<div class="paragraph">
-<p>The <code>choices…​()</code> supporting method is called for both action parameters and for properties, to find objects from a drop-down list box. Unlike <a href="#_rgcms_methods_prefixes_autoComplete"><code>autoComplete…​()</code></a>, the use case is when the number of objects is comparatively small and can be selected from a drop-down without any additional filtering.</p>
-</div>
-<div class="paragraph">
-<p>The signature of the supporting method depends on whether it is for an action parameter or a property.</p>
-</div>
-<div class="sect4">
-<h5 id="_parameters_2">Parameters</h5>
-<div class="paragraph">
-<p>For an action parameter in (0-based) position <em>N</em>, and of type <code>T</code>, the signature is:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="predefined-type">Collection</span><T> choicesNXxx() { ... }</code></pre>
-</div>
-</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">ShoppingCartItem</span> {
+}</code></pre>
+ </div>
+ </div>
+ <div class="colist arabic">
+ <table>
+ <tbody>
+ <tr>
+ <td><i class="conum" data-value="1"></i><b>1</b></td>
+ <td>the <a href="rgant.html#_rgant-MinLength"><code>@MinLength</code></a> annotation specifies the minimum number of characters that must be entered before a search is performed for matching objects</td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ </div>
+ </div>
+ <div class="sect3">
+ <h4 id="_rgcms_methods_prefixes_choices">2.1.3. <code>choices\u2026\u200b()</code></h4>
+ <div class="paragraph">
+ <p>The <code>choices\u2026\u200b()</code> supporting method is called for both action parameters and for properties, to find objects from a drop-down list box. Unlike <a href="#_rgcms_methods_prefixes_autoComplete"><code>autoComplete\u2026\u200b()</code></a>, the use case is when the number of objects is comparatively small and can be selected from a drop-down without any additional filtering.</p>
+ </div>
+ <div class="paragraph">
+ <p>The signature of the supporting method depends on whether it is for an action parameter or a property.</p>
+ </div>
+ <div class="sect4">
+ <h5 id="_parameters_2">Parameters</h5>
+ <div class="paragraph">
+ <p>For an action parameter in (0-based) position <em>N</em>, and of type <code>T</code>, the signature is:</p>
+ </div>
+ <div class="listingblock">
+ <div class="content">
+ <pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="predefined-type">Collection</span><T> choicesNXxx() { ... }</code></pre>
+ </div>
+ </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">ShoppingCartItem</span> {
<span class="annotation">@Property</span>(editing=Editing.DISABLED)
<span class="directive">public</span> Product getProduct() { ... }
<span class="directive">public</span> <span class="type">void</span> setProduct(Product product) { ... }
@@ -1111,7 +1074,7 @@ RemoveFrom…​()</code></a></p></td>
<span class="annotation">@Action</span>(semantics=SemanticsOf.IDEMPOTENT)
<span class="directive">public</span> ShoppingCartItem updateProduct(
Product product,
- <span class="annotation">@ParameterLayout</span>(named=<span class="string"><span class="delimiter">"</span><span class="content">Quantity</span><span class="delimiter">"</span></span>)
+ <span class="annotation">@ParameterLayout</span>(named=<span class="string"><span class="delimiter">"</span><span class="content">Quantity</span><span class="delimiter">"</span></span>)
<span class="directive">final</span> <span class="predefined-type">Integer</span> quantity) {
setProduct(product);
setQuantity(quantity);
@@ -1120,31 +1083,31 @@ RemoveFrom…​()</code></a></p></td>
<span class="keyword">return</span> <span class="predefined-type">Arrays</span>.asList(<span class="integer">1</span>,<span class="integer">2</span>,<span class="integer">3</span>,<span class="integer">5</span>,<span class="integer">10</span>,<span class="integer">25</span>,<span class="integer">50</span>,<span class="integer">100</span>);
}
...
-}</code></pre>
-</div>
-</div>
-<div class="sect5">
-<h6 id="_dependent_choices">Dependent Choices</h6>
-<div class="paragraph">
-<p>Action parameters also support the notion of dependent choices, whereby the list of choices is dependent upon the value of some other argument.</p>
-</div>
-<div class="paragraph">
-<p>An example can be found in the (non-ASF) <a href="http://github.com/isisaddons/isis-app-todoapp">Isis addons' todoapp</a>, whereby `ToDoItem`s are categorized and then can also be subcategorized:</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<a class="image" href="images/reference-methods/prefixes/choices/dependent.png"><img src="images/reference-methods/prefixes/choices/dependent.png" alt="dependent" width="800px"></a>
-</div>
-</div>
-<div class="paragraph">
-<p>This functionality is actually implemented as a <a href="ugfun.html#_ugfun_how-tos_contributed-members">contributed action</a>, so the code for this is:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="java"><span class="annotation">@DomainService</span>(nature = NatureOfService.VIEW_CONTRIBUTIONS_ONLY)
+}</code></pre>
+ </div>
+ </div>
+ <div class="sect5">
+ <h6 id="_dependent_choices">Dependent Choices</h6>
+ <div class="paragraph">
+ <p>Action parameters also support the notion of dependent choices, whereby the list of choices is dependent upon the value of some other argument.</p>
+ </div>
+ <div class="paragraph">
+ <p>An example can be found in the (non-ASF) <a href="http://github.com/isisaddons/isis-app-todoapp">Isis addons' todoapp</a>, whereby `ToDoItem`s are categorized and then can also be subcategorized:</p>
+ </div>
+ <div class="imageblock">
+ <div class="content">
+ <a class="image" href="images/reference-methods/prefixes/choices/dependent.png"><img src="images/reference-methods/prefixes/choices/dependent.png" alt="dependent" width="800px"></a>
+ </div>
+ </div>
+ <div class="paragraph">
+ <p>This functionality is actually implemented as a <a href="ugfun.html#_ugfun_how-tos_contributed-members">contributed action</a>, so the code for this is:</p>
+ </div>
+ <div class="listingblock">
+ <div class="content">
+ <pre class="CodeRay highlight"><code data-lang="java"><span class="annotation">@DomainService</span>(nature = NatureOfService.VIEW_CONTRIBUTIONS_ONLY)
<span class="directive">public</span> <span class="type">class</span> <span class="class">UpdateCategoryContributions</span> ... {
<span class="annotation">@ActionLayout</span>(
- describedAs = <span class="string"><span class="delimiter">"</span><span class="content">Update category and subcategory</span><span class="delimiter">"</span></span>
+ describedAs = <span class="string"><span class="delimiter">"</span><span class="content">Update category and subcategory</span><span class="delimiter">"</span></span>
)
<span class="annotation">@Action</span>(semantics = SemanticsOf.IDEMPOTENT)
<span class="directive">public</span> Categorized updateCategory(
@@ -1162,40 +1125,42 @@ RemoveFrom…​()</code></a></p></td>
<span class="keyword">return</span> Subcategory.listFor(category);
}
...
-}</code></pre>
-</div>
-</div>
-<div class="colist arabic">
-<table>
-<tr>
-<td><i class="conum" data-value="1"></i><b>1</b></td>
-<td><code>ToDoItem</code> implements <code>Categorized</code></td>
-</tr>
-<tr>
-<td><i class="conum" data-value="2"></i><b>2</b></td>
-<td>subcategory is the 2-th argument (0-based)</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="3"></i><b>3</b></td>
-<td>the item contributed to</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="4"></i><b>4</b></td>
-<td>the category selected</td>
-</tr>
-</table>
-</div>
-<div class="paragraph">
-<p>Dependent choices are not restricted to enums, however. Going back to the shopping cart example shown above, the choices for the <code>quantity</code> parameter could be dependent upon the selected <code>Product</code>:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">class</span> <span class="class">ShoppingCartItem</span> {
+}</code></pre>
+ </div>
+ </div>
+ <div class="colist arabic">
+ <table>
+ <tbody>
+ <tr>
+ <td><i class="conum" data-value="1"></i><b>1</b></td>
+ <td><code>ToDoItem</code> implements <code>Categorized</code></td>
+ </tr>
+ <tr>
+ <td><i class="conum" data-value="2"></i><b>2</b></td>
+ <td>subcategory is the 2-th argument (0-based)</td>
+ </tr>
+ <tr>
+ <td><i class="conum" data-value="3"></i><b>3</b></td>
+ <td>the item contributed to</td>
+ </tr>
+ <tr>
+ <td><i class="conum" data-value="4"></i><b>4</b></td>
+ <td>the category selected</td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ <div class="paragraph">
+ <p>Dependent choices are not restricted to enums, however. Going back to the shopping cart example shown above, the choices for the <code>quantity</code> parameter could be dependent upon the selected <code>Product</code>:</p>
+ </div>
+ <div class="listingblock">
+ <div class="content">
+ <pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">class</span> <span class="class">ShoppingCartItem</span> {
...
<span class="annotation">@Action</span>(semantics=SemanticsOf.IDEMPOTENT)
<span class="directive">public</span> ShoppingCartItem updateProduct(
Product product,
- <span class="annotation">@ParameterLayout</span>(named=<span class="string"><span class="delimiter">"</span><span class="content">Quantity</span><span class="delimiter">"</span></span>)
+ <span class="annotation">@ParameterLayout</span>(named=<span class="string"><span class="delimiter">"</span><span class="content">Quantity</span><span class="delimiter">"</span></span>)
<span class="directive">final</span> <span class="predefined-type">Integer</span> quantity) {
setProduct(product);
setQuantity(quantity);
@@ -1204,56 +1169,58 @@ RemoveFrom…​()</code></a></p></td>
<span class="keyword">return</span> productService.quantityChoicesFor(product); <i class="conum" data-value="1"></i><b>(1)</b>
}
...
-}</code></pre>
-</div>
-</div>
-<div class="colist arabic">
-<table>
-<tr>
-<td><i class="conum" data-value="1"></i><b>1</b></td>
-<td><code>productService</code> is a (fictitous) injected service that knows what the quantity choices should be for any given product</td>
-</tr>
-</table>
-</div>
-</div>
-</div>
-<div class="sect4">
-<h5 id="_properties_2">Properties</h5>
-<div class="paragraph">
-<p>For a property of type <code>T</code>, the signature is:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="predefined-type">Collection</span><T> choicesXxx() { ... }</code></pre>
-</div>
-</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">ShoppingCartItem</span> {
+}</code></pre>
+ </div>
+ </div>
+ <div class="colist arabic">
+ <table>
+ <tbody>
+ <tr>
+ <td><i class="conum" data-value="1"></i><b>1</b></td>
+ <td><code>productService</code> is a (fictitous) injected service that knows what the quantity choices should be for any given product</td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ </div>
+ </div>
+ <div class="sect4">
+ <h5 id="_properties_2">Properties</h5>
+ <div class="paragraph">
+ <p>For a property of type <code>T</code>, the signature is:</p>
+ </div>
+ <div class="listingblock">
+ <div class="content">
+ <pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="predefined-type">Collection</span><T> choicesXxx() { ... }</code></pre>
+ </div>
+ </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">ShoppingCartItem</span> {
<span class="directive">public</span> Product getProduct() { ... }
<span class="directive">public</span> <span class="type">void</span> setProduct(Product product) { ... }
<span class="directive">public</span> <span class="predefined-type">Collection</span><Product> choicesProduct() {
...
- }</code></pre>
-</div>
-</div>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_rgcms_methods_prefixes_clear">2.1.4. <code>clear…​()</code></h4>
-<div class="paragraph">
-<p>The <code>clear…​()</code> supporting method is called — instead of the setter — whenever an (optional) property is to be set to <code>null</code>. Its purpose is to allow additional business logic to be performed.</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">LibraryMember</span> {
+ }</code></pre>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="sect3">
+ <h4 id="_rgcms_methods_prefixes_clear">2.1.4. <code>clear\u2026\u200b()</code></h4>
+ <div class="paragraph">
+ <p>The <code>clear\u2026\u200b()</code> supporting method is called\u2009\u2014\u2009instead of the setter\u2009\u2014\u2009whenever an (optional) property is to be set to <code>null</code>. Its purpose is to allow additional business logic to be performed.</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">LibraryMember</span> {
<span class="directive">public</span> Title getFavoriteTitle() { ... }
<span class="directive">public</span> <span class="type">void</span> setFavoriteTitle(Title title) { ... }
<span class="directive">public</span> <span class="type">void</span> modifyFavoriteTitle(Title title) { ... }
@@ -1263,52 +1230,54 @@ RemoveFrom…​()</code></a></p></td>
titleFavoritesService.decrement(title); <i class="conum" data-value="2"></i><b>(2)</b>
}
...
-}</code></pre>
-</div>
-</div>
-<div class="colist arabic">
-<table>
-<tr>
-<td><i class="conum" data-value="1"></i><b>1</b></td>
-<td>update the property</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="2"></i><b>2</b></td>
-<td>perform some additional business logic</td>
-</tr>
-</table>
-</div>
-<div class="paragraph">
-<p>See also <a href="#_rgcms_methods_prefixes_modify"><code>modify…​()</code></a>`</p>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_rgcms_methods_prefixes_default">2.1.5. <code>default…​()</code></h4>
-<div class="paragraph">
-<p>The <code>default…​()</code> supporting method is called for action parameters to return the initial argument value. This may be some sensible default (eg today’s date, or 0 or 1), or — for an action that is modifying the state of an object — might default to the current value of a corresponding property.</p>
-</div>
-<div class="paragraph">
-<p>The method is <em>also</em> called for properties in the case when an object is newly instantiated using <a href="rgsvc.html#_rgsvc_api_DomainObjectContainer"><code>DomainObjectContainer#newTransientInstance(…​)</code></a>. This is a much less common use case. If a default is not specified then properties are initialized to a default based on their type (eg 0 or <code>false</code>).</p>
-</div>
-<div class="paragraph">
-<p>The signature of the supporting method depends on whether it is for an action parameter or a property.</p>
-</div>
-<div class="sect4">
-<h5 id="_parameters_3">Parameters</h5>
-<div class="paragraph">
-<p>For an action parameter in (0-based position n), and of type <code>T</code>, the signature is:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> T defaultNXxx() { ... }</code></pre>
-</div>
-</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">ShoppingCartItem</span> {
+}</code></pre>
+ </div>
+ </div>
+ <div class="colist arabic">
+ <table>
+ <tbody>
+ <tr>
+ <td><i class="conum" data-value="1"></i><b>1</b></td>
+ <td>update the property</td>
+ </tr>
+ <tr>
+ <td><i class="conum" data-value="2"></i><b>2</b></td>
+ <td>perform some additional business logic</td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ <div class="paragraph">
+ <p>See also <a href="#_rgcms_methods_prefixes_modify"><code>modify\u2026\u200b()</code></a>`</p>
+ </div>
+ </div>
+ <div class="sect3">
+ <h4 id="_rgcms_methods_prefixes_default">2.1.5. <code>default\u2026\u200b()</code></h4>
+ <div class="paragraph">
+ <p>The <code>default\u2026\u200b()</code> supporting method is called for action parameters to return the initial argument value. This may be some sensible default (eg today\u2019s date, or 0 or 1), or\u2009\u2014\u2009for an action that is modifying the state of an object\u2009\u2014\u2009might default to the current value of a corresponding property.</p>
+ </div>
+ <div class="paragraph">
+ <p>The method is <em>also</em> called for properties in the case when an object is newly instantiated using <a href="rgsvc.html#_rgsvc_api_DomainObjectContainer"><code>DomainObjectContainer#newTransientInstance(\u2026\u200b)</code></a>. This is a much less common use case. If a default is not specified then properties are initialized to a default based on their type (eg 0 or <code>false</code>).</p>
+ </div>
+ <div class="paragraph">
+ <p>The signature of the supporting method depends on whether it is for an action parameter or a property.</p>
+ </div>
+ <div class="sect4">
+ <h5 id="_parameters_3">Parameters</h5>
+ <div class="paragraph">
+ <p>For an action parameter in (0-based position n), and of type <code>T</code>, the signature is:</p>
+ </div>
+ <div class="listingblock">
+ <div class="content">
+ <pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> T defaultNXxx() { ... }</code></pre>
+ </div>
+ </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">ShoppingCartItem</span> {
<span class="annotation">@Property</span>(editing=Editing.DISABLED)
<span class="directive">public</span> Product getProduct() { ... }
<span class="directive">public</span> <span class="type">void</span> setProduct(Product product) { ... }
@@ -1320,7 +1289,7 @@ RemoveFrom…​()</code></a></p></td>
<span class="annotation">@Action</span>(semantics=SemanticsOf.IDEMPOTENT)
<span class="directive">public</span> ShoppingCartItem updateProduct(
Product product,
- <span class="annotation">@ParameterLayout</span>(named=<span class="string"><span class="delimiter">"</span><span class="content">Quantity</span><span class="delimiter">"</span></span>)
+ <span class="annotation">@ParameterLayout</span>(named=<span class="string"><span class="delimiter">"</span><span class="content">Quantity</span><span class="delimiter">"</span></span>)
<span class="directive">final</span> <span class="predefined-type">Integer</span> quantity) {
setProduct(product);
setQuantity(quantity);
@@ -1332,30 +1301,32 @@ RemoveFrom…​()</code></a></p></td>
<span class="keyword">return</span> getQuantity();
}
...
-}</code></pre>
-</div>
-</div>
-<div class="colist arabic">
-<table>
-<tr>
-<td><i class="conum" data-value="1"></i><b>1</b></td>
-<td>default the 0-th parameter using the current value of the <code>product</code> property</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="2"></i><b>2</b></td>
-<td>default the 1-th parameter using the current value of the <code>quantity</code> property</td>
-</tr>
-</table>
-</div>
-<div class="paragraph">
-<p>Defaults are also supported (of course) for <a href="ugfun.html#_ugfun_how-tos_contributed-members">contributed actions</a>. For example, here is a contributed action for updating category/subcategory of the (non-ASF) <a href="http://github.com/isisaddons/isis-app-todoapp">Isis addons' todoapp</a>:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="java"><span class="annotation">@DomainService</span>(nature = NatureOfService.VIEW_CONTRIBUTIONS_ONLY)
+}</code></pre>
+ </div>
+ </div>
+ <div class="colist arabic">
+ <table>
+ <tbody>
+ <tr>
+ <td><i class="conum" data-value="1"></i><b>1</b></td>
+ <td>default the 0-th parameter using the current value of the <code>product</code> property</td>
+ </tr>
+ <tr>
+ <td><i class="conum" data-value="2"></i><b>2</b></td>
+ <td>default the 1-th parameter using the current value of the <code>quantity</code> property</td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ <div class="paragraph">
+ <p>Defaults are also supported (of course) for <a href="ugfun.html#_ugfun_how-tos_contributed-mem
<TRUNCATED>
[36/44] isis-site git commit: ISIS-1594: provide an 'edit' button
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/83a3755a/content/guides/rgant.pdf
----------------------------------------------------------------------
diff --git a/content/guides/rgant.pdf b/content/guides/rgant.pdf
index 48cfdf6..723307c 100644
--- a/content/guides/rgant.pdf
+++ b/content/guides/rgant.pdf
@@ -4,16 +4,16 @@
<< /Title (Annotations)
/Creator (Asciidoctor PDF 1.5.0.alpha.11, based on Prawn 1.3.0)
/Producer (Asciidoctor PDF 1.5.0.alpha.11, based on Prawn 1.3.0)
-/CreationDate (D:20170219154905+00'00')
-/ModDate (D:20170219154905+00'00')
+/CreationDate (D:20170307233833+00'00')
+/ModDate (D:20170307233833+00'00')
>>
endobj
2 0 obj
<< /Type /Catalog
/Pages 3 0 R
/Names 20 0 R
-/Outlines 2146 0 R
-/PageLabels 2304 0 R
+/Outlines 2145 0 R
+/PageLabels 2303 0 R
/PageMode /UseOutlines
/OpenAction [7 0 R /FitH 842.89]
/ViewerPreferences << /DisplayDocTitle true
@@ -23,7 +23,7 @@ endobj
3 0 obj
<< /Type /Pages
/Count 178
-/Kids [7 0 R 10 0 R 12 0 R 14 0 R 16 0 R 18 0 R 42 0 R 45 0 R 66 0 R 81 0 R 105 0 R 146 0 R 170 0 R 205 0 R 228 0 R 249 0 R 273 0 R 289 0 R 292 0 R 294 0 R 308 0 R 317 0 R 330 0 R 336 0 R 345 0 R 351 0 R 354 0 R 367 0 R 376 0 R 385 0 R 389 0 R 393 0 R 397 0 R 418 0 R 426 0 R 433 0 R 440 0 R 457 0 R 468 0 R 476 0 R 493 0 R 501 0 R 507 0 R 516 0 R 531 0 R 537 0 R 540 0 R 556 0 R 563 0 R 570 0 R 574 0 R 587 0 R 602 0 R 613 0 R 629 0 R 640 0 R 651 0 R 658 0 R 664 0 R 666 0 R 674 0 R 679 0 R 688 0 R 690 0 R 695 0 R 710 0 R 714 0 R 732 0 R 756 0 R 765 0 R 768 0 R 781 0 R 794 0 R 799 0 R 803 0 R 809 0 R 813 0 R 816 0 R 822 0 R 826 0 R 833 0 R 844 0 R 848 0 R 864 0 R 873 0 R 885 0 R 889 0 R 899 0 R 904 0 R 910 0 R 913 0 R 933 0 R 939 0 R 946 0 R 963 0 R 973 0 R 979 0 R 995 0 R 1005 0 R 1019 0 R 1031 0 R 1043 0 R 1049 0 R 1055 0 R 1065 0 R 1070 0 R 1080 0 R 1087 0 R 1097 0 R 1103 0 R 1109 0 R 1120 0 R 1124 0 R 1133 0 R 1136 0 R 1142 0 R 1146 0 R 1158 0 R 1164 0 R 1167 0 R 1173 0 R 1183 0 R 1
191 0 R 1193 0 R 1202 0 R 1206 0 R 1212 0 R 1222 0 R 1230 0 R 1238 0 R 1242 0 R 1247 0 R 1249 0 R 1263 0 R 1276 0 R 1286 0 R 1300 0 R 1308 0 R 1313 0 R 1326 0 R 1332 0 R 1343 0 R 1347 0 R 1357 0 R 1364 0 R 1369 0 R 1387 0 R 1394 0 R 1406 0 R 1408 0 R 1413 0 R 1426 0 R 1433 0 R 1441 0 R 1446 0 R 1452 0 R 1459 0 R 1462 0 R 1465 0 R 1470 0 R 1485 0 R 1500 0 R 1514 0 R 1530 0 R 1536 0 R 1549 0 R 1558 0 R 1560 0 R 1566 0 R 1571 0 R 1573 0 R 1580 0 R 1597 0 R 1614 0 R 1633 0 R 1644 0 R 1649 0 R 1664 0 R]
+/Kids [7 0 R 10 0 R 12 0 R 14 0 R 16 0 R 18 0 R 42 0 R 45 0 R 66 0 R 81 0 R 105 0 R 146 0 R 170 0 R 205 0 R 228 0 R 249 0 R 273 0 R 289 0 R 292 0 R 294 0 R 308 0 R 316 0 R 329 0 R 335 0 R 344 0 R 350 0 R 353 0 R 366 0 R 375 0 R 384 0 R 388 0 R 392 0 R 396 0 R 417 0 R 425 0 R 432 0 R 439 0 R 456 0 R 467 0 R 475 0 R 492 0 R 500 0 R 506 0 R 515 0 R 530 0 R 536 0 R 539 0 R 555 0 R 562 0 R 569 0 R 573 0 R 586 0 R 601 0 R 612 0 R 628 0 R 639 0 R 650 0 R 657 0 R 663 0 R 665 0 R 673 0 R 678 0 R 687 0 R 689 0 R 694 0 R 709 0 R 713 0 R 731 0 R 755 0 R 764 0 R 767 0 R 780 0 R 793 0 R 798 0 R 802 0 R 808 0 R 812 0 R 815 0 R 821 0 R 825 0 R 832 0 R 843 0 R 847 0 R 863 0 R 872 0 R 884 0 R 888 0 R 898 0 R 903 0 R 909 0 R 912 0 R 932 0 R 938 0 R 945 0 R 962 0 R 972 0 R 978 0 R 994 0 R 1004 0 R 1018 0 R 1030 0 R 1042 0 R 1048 0 R 1054 0 R 1064 0 R 1069 0 R 1079 0 R 1086 0 R 1096 0 R 1102 0 R 1108 0 R 1119 0 R 1123 0 R 1132 0 R 1135 0 R 1141 0 R 1145 0 R 1157 0 R 1163 0 R 1166 0 R 1172 0 R 1182 0 R 1
190 0 R 1192 0 R 1201 0 R 1205 0 R 1211 0 R 1221 0 R 1229 0 R 1237 0 R 1241 0 R 1246 0 R 1248 0 R 1262 0 R 1275 0 R 1285 0 R 1299 0 R 1307 0 R 1312 0 R 1325 0 R 1331 0 R 1342 0 R 1346 0 R 1356 0 R 1363 0 R 1368 0 R 1386 0 R 1393 0 R 1405 0 R 1407 0 R 1412 0 R 1425 0 R 1432 0 R 1440 0 R 1445 0 R 1451 0 R 1458 0 R 1461 0 R 1464 0 R 1469 0 R 1484 0 R 1499 0 R 1513 0 R 1529 0 R 1535 0 R 1548 0 R 1557 0 R 1559 0 R 1565 0 R 1570 0 R 1572 0 R 1579 0 R 1596 0 R 1613 0 R 1632 0 R 1643 0 R 1648 0 R 1663 0 R]
>>
endobj
4 0 obj
@@ -78,13 +78,13 @@ endobj
endobj
8 0 obj
<< /Type /Font
-/BaseFont /AAAAAR+NotoSerif
+/BaseFont /AAAAAP+NotoSerif
/Subtype /TrueType
-/FontDescriptor 2306 0 R
+/FontDescriptor 2305 0 R
/FirstChar 32
/LastChar 255
-/Widths 2308 0 R
-/ToUnicode 2307 0 R
+/Widths 2307 0 R
+/ToUnicode 2306 0 R
>>
endobj
9 0 obj
@@ -1937,7 +1937,7 @@ endobj
/F3.0 40 0 R
>>
>>
-/Annots [1670 0 R 1671 0 R 1672 0 R 1673 0 R 1674 0 R 1675 0 R 1676 0 R 1677 0 R 1678 0 R 1679 0 R 1680 0 R 1681 0 R 1682 0 R 1683 0 R 1684 0 R 1685 0 R 1686 0 R 1687 0 R 1688 0 R 1689 0 R 1690 0 R 1691 0 R 1692 0 R 1693 0 R 1694 0 R 1695 0 R 1696 0 R 1697 0 R 1698 0 R 1699 0 R 1700 0 R 1701 0 R 1702 0 R 1703 0 R 1704 0 R 1705 0 R 1706 0 R 1707 0 R 1708 0 R 1709 0 R 1710 0 R 1711 0 R 1712 0 R 1713 0 R 1714 0 R 1715 0 R 1716 0 R 1717 0 R 1718 0 R 1719 0 R 1720 0 R 1721 0 R 1722 0 R 1723 0 R 1724 0 R 1725 0 R 1726 0 R 1727 0 R 1728 0 R 1729 0 R 1730 0 R 1731 0 R 1732 0 R 1733 0 R 1734 0 R 1735 0 R 1736 0 R 1737 0 R 1738 0 R 1739 0 R 1740 0 R 1741 0 R 1742 0 R 1743 0 R 1744 0 R 1745 0 R 1746 0 R 1747 0 R 1748 0 R 1749 0 R 1750 0 R 1751 0 R 1752 0 R 1753 0 R 1754 0 R 1755 0 R 1756 0 R 1757 0 R 1758 0 R 1759 0 R 1760 0 R 1761 0 R 1762 0 R 1763 0 R 1764 0 R 1765 0 R 1766 0 R 1767 0 R 1768 0 R 1769 0 R 1770 0 R 1771 0 R 1772 0 R]
+/Annots [1669 0 R 1670 0 R 1671 0 R 1672 0 R 1673 0 R 1674 0 R 1675 0 R 1676 0 R 1677 0 R 1678 0 R 1679 0 R 1680 0 R 1681 0 R 1682 0 R 1683 0 R 1684 0 R 1685 0 R 1686 0 R 1687 0 R 1688 0 R 1689 0 R 1690 0 R 1691 0 R 1692 0 R 1693 0 R 1694 0 R 1695 0 R 1696 0 R 1697 0 R 1698 0 R 1699 0 R 1700 0 R 1701 0 R 1702 0 R 1703 0 R 1704 0 R 1705 0 R 1706 0 R 1707 0 R 1708 0 R 1709 0 R 1710 0 R 1711 0 R 1712 0 R 1713 0 R 1714 0 R 1715 0 R 1716 0 R 1717 0 R 1718 0 R 1719 0 R 1720 0 R 1721 0 R 1722 0 R 1723 0 R 1724 0 R 1725 0 R 1726 0 R 1727 0 R 1728 0 R 1729 0 R 1730 0 R 1731 0 R 1732 0 R 1733 0 R 1734 0 R 1735 0 R 1736 0 R 1737 0 R 1738 0 R 1739 0 R 1740 0 R 1741 0 R 1742 0 R 1743 0 R 1744 0 R 1745 0 R 1746 0 R 1747 0 R 1748 0 R 1749 0 R 1750 0 R 1751 0 R 1752 0 R 1753 0 R 1754 0 R 1755 0 R 1756 0 R 1757 0 R 1758 0 R 1759 0 R 1760 0 R 1761 0 R 1762 0 R 1763 0 R 1764 0 R 1765 0 R 1766 0 R 1767 0 R 1768 0 R 1769 0 R 1770 0 R 1771 0 R]
>>
endobj
11 0 obj
@@ -4063,7 +4063,7 @@ endobj
/F3.0 40 0 R
>>
>>
-/Annots [1773 0 R 1774 0 R 1775 0 R 1776 0 R 1777 0 R 1778 0 R 1779 0 R 1780 0 R 1781 0 R 1782 0 R 1783 0 R 1784 0 R 1785 0 R 1786 0 R 1787 0 R 1788 0 R 1789 0 R 1790 0 R 1791 0 R 1792 0 R 1793 0 R 1794 0 R 1795 0 R 1796 0 R 1797 0 R 1798 0 R 1799 0 R 1800 0 R 1801 0 R 1802 0 R 1803 0 R 1804 0 R 1805 0 R 1806 0 R 1807 0 R 1808 0 R 1809 0 R 1810 0 R 1811 0 R 1812 0 R 1813 0 R 1814 0 R 1815 0 R 1816 0 R 1817 0 R 1818 0 R 1819 0 R 1820 0 R 1821 0 R 1822 0 R 1823 0 R 1824 0 R 1825 0 R 1826 0 R 1827 0 R 1828 0 R 1829 0 R 1830 0 R 1831 0 R 1832 0 R 1833 0 R 1834 0 R 1835 0 R 1836 0 R 1837 0 R 1838 0 R 1839 0 R 1840 0 R 1841 0 R 1842 0 R 1843 0 R 1844 0 R 1845 0 R 1846 0 R 1847 0 R 1848 0 R 1849 0 R 1850 0 R 1851 0 R 1852 0 R 1853 0 R 1854 0 R 1855 0 R 1856 0 R 1857 0 R 1858 0 R 1859 0 R 1860 0 R 1861 0 R 1862 0 R 1863 0 R 1864 0 R 1865 0 R 1866 0 R 1867 0 R 1868 0 R 1869 0 R 1870 0 R 1871 0 R 1872 0 R 1873 0 R 1874 0 R 1875 0 R 1876 0 R 1877 0 R 1878 0 R 1879 0 R 1880 0 R 1881 0 R 1882 0
R 1883 0 R 1884 0 R 1885 0 R 1886 0 R 1887 0 R 1888 0 R 1889 0 R 1890 0 R 1891 0 R 1892 0 R 1893 0 R 1894 0 R 1895 0 R 1896 0 R]
+/Annots [1772 0 R 1773 0 R 1774 0 R 1775 0 R 1776 0 R 1777 0 R 1778 0 R 1779 0 R 1780 0 R 1781 0 R 1782 0 R 1783 0 R 1784 0 R 1785 0 R 1786 0 R 1787 0 R 1788 0 R 1789 0 R 1790 0 R 1791 0 R 1792 0 R 1793 0 R 1794 0 R 1795 0 R 1796 0 R 1797 0 R 1798 0 R 1799 0 R 1800 0 R 1801 0 R 1802 0 R 1803 0 R 1804 0 R 1805 0 R 1806 0 R 1807 0 R 1808 0 R 1809 0 R 1810 0 R 1811 0 R 1812 0 R 1813 0 R 1814 0 R 1815 0 R 1816 0 R 1817 0 R 1818 0 R 1819 0 R 1820 0 R 1821 0 R 1822 0 R 1823 0 R 1824 0 R 1825 0 R 1826 0 R 1827 0 R 1828 0 R 1829 0 R 1830 0 R 1831 0 R 1832 0 R 1833 0 R 1834 0 R 1835 0 R 1836 0 R 1837 0 R 1838 0 R 1839 0 R 1840 0 R 1841 0 R 1842 0 R 1843 0 R 1844 0 R 1845 0 R 1846 0 R 1847 0 R 1848 0 R 1849 0 R 1850 0 R 1851 0 R 1852 0 R 1853 0 R 1854 0 R 1855 0 R 1856 0 R 1857 0 R 1858 0 R 1859 0 R 1860 0 R 1861 0 R 1862 0 R 1863 0 R 1864 0 R 1865 0 R 1866 0 R 1867 0 R 1868 0 R 1869 0 R 1870 0 R 1871 0 R 1872 0 R 1873 0 R 1874 0 R 1875 0 R 1876 0 R 1877 0 R 1878 0 R 1879 0 R 1880 0 R 1881 0
R 1882 0 R 1883 0 R 1884 0 R 1885 0 R 1886 0 R 1887 0 R 1888 0 R 1889 0 R 1890 0 R 1891 0 R 1892 0 R 1893 0 R 1894 0 R 1895 0 R]
>>
endobj
13 0 obj
@@ -6310,7 +6310,7 @@ endobj
/F3.0 40 0 R
>>
>>
-/Annots [1897 0 R 1898 0 R 1899 0 R 1900 0 R 1901 0 R 1902 0 R 1903 0 R 1904 0 R 1905 0 R 1906 0 R 1907 0 R 1908 0 R 1909 0 R 1910 0 R 1911 0 R 1912 0 R 1913 0 R 1914 0 R 1915 0 R 1916 0 R 1917 0 R 1918 0 R 1919 0 R 1920 0 R 1921 0 R 1922 0 R 1923 0 R 1924 0 R 1925 0 R 1926 0 R 1927 0 R 1928 0 R 1929 0 R 1930 0 R 1931 0 R 1932 0 R 1933 0 R 1934 0 R 1935 0 R 1936 0 R 1937 0 R 1938 0 R 1939 0 R 1940 0 R 1941 0 R 1942 0 R 1943 0 R 1944 0 R 1945 0 R 1946 0 R 1947 0 R 1948 0 R 1949 0 R 1950 0 R 1951 0 R 1952 0 R 1953 0 R 1954 0 R 1955 0 R 1956 0 R 1957 0 R 1958 0 R 1959 0 R 1960 0 R 1961 0 R 1962 0 R 1963 0 R 1964 0 R 1965 0 R 1966 0 R 1967 0 R 1968 0 R 1969 0 R 1970 0 R 1971 0 R 1972 0 R 1973 0 R 1974 0 R 1975 0 R 1976 0 R 1977 0 R 1978 0 R 1979 0 R 1980 0 R 1981 0 R 1982 0 R 1983 0 R 1984 0 R 1985 0 R 1986 0 R 1987 0 R 1988 0 R 1989 0 R 1990 0 R 1991 0 R 1992 0 R 1993 0 R 1994 0 R 1995 0 R 1996 0 R 1997 0 R 1998 0 R 1999 0 R 2000 0 R 2001 0 R 2002 0 R 2003 0 R 2004 0 R 2005 0 R 2006 0
R 2007 0 R 2008 0 R 2009 0 R 2010 0 R 2011 0 R 2012 0 R 2013 0 R 2014 0 R 2015 0 R 2016 0 R 2017 0 R 2018 0 R 2019 0 R 2020 0 R 2021 0 R 2022 0 R 2023 0 R 2024 0 R 2025 0 R 2026 0 R 2027 0 R 2028 0 R 2029 0 R 2030 0 R 2031 0 R]
+/Annots [1896 0 R 1897 0 R 1898 0 R 1899 0 R 1900 0 R 1901 0 R 1902 0 R 1903 0 R 1904 0 R 1905 0 R 1906 0 R 1907 0 R 1908 0 R 1909 0 R 1910 0 R 1911 0 R 1912 0 R 1913 0 R 1914 0 R 1915 0 R 1916 0 R 1917 0 R 1918 0 R 1919 0 R 1920 0 R 1921 0 R 1922 0 R 1923 0 R 1924 0 R 1925 0 R 1926 0 R 1927 0 R 1928 0 R 1929 0 R 1930 0 R 1931 0 R 1932 0 R 1933 0 R 1934 0 R 1935 0 R 1936 0 R 1937 0 R 1938 0 R 1939 0 R 1940 0 R 1941 0 R 1942 0 R 1943 0 R 1944 0 R 1945 0 R 1946 0 R 1947 0 R 1948 0 R 1949 0 R 1950 0 R 1951 0 R 1952 0 R 1953 0 R 1954 0 R 1955 0 R 1956 0 R 1957 0 R 1958 0 R 1959 0 R 1960 0 R 1961 0 R 1962 0 R 1963 0 R 1964 0 R 1965 0 R 1966 0 R 1967 0 R 1968 0 R 1969 0 R 1970 0 R 1971 0 R 1972 0 R 1973 0 R 1974 0 R 1975 0 R 1976 0 R 1977 0 R 1978 0 R 1979 0 R 1980 0 R 1981 0 R 1982 0 R 1983 0 R 1984 0 R 1985 0 R 1986 0 R 1987 0 R 1988 0 R 1989 0 R 1990 0 R 1991 0 R 1992 0 R 1993 0 R 1994 0 R 1995 0 R 1996 0 R 1997 0 R 1998 0 R 1999 0 R 2000 0 R 2001 0 R 2002 0 R 2003 0 R 2004 0 R 2005 0
R 2006 0 R 2007 0 R 2008 0 R 2009 0 R 2010 0 R 2011 0 R 2012 0 R 2013 0 R 2014 0 R 2015 0 R 2016 0 R 2017 0 R 2018 0 R 2019 0 R 2020 0 R 2021 0 R 2022 0 R 2023 0 R 2024 0 R 2025 0 R 2026 0 R 2027 0 R 2028 0 R 2029 0 R 2030 0 R]
>>
endobj
15 0 obj
@@ -8207,7 +8207,7 @@ endobj
/F3.0 40 0 R
>>
>>
-/Annots [2032 0 R 2033 0 R 2034 0 R 2035 0 R 2036 0 R 2037 0 R 2038 0 R 2039 0 R 2040 0 R 2041 0 R 2042 0 R 2043 0 R 2044 0 R 2045 0 R 2046 0 R 2047 0 R 2048 0 R 2049 0 R 2050 0 R 2051 0 R 2052 0 R 2053 0 R 2054 0 R 2055 0 R 2056 0 R 2057 0 R 2058 0 R 2059 0 R 2060 0 R 2061 0 R 2062 0 R 2063 0 R 2064 0 R 2065 0 R 2066 0 R 2067 0 R 2068 0 R 2069 0 R 2070 0 R 2071 0 R 2072 0 R 2073 0 R 2074 0 R 2075 0 R 2076 0 R 2077 0 R 2078 0 R 2079 0 R 2080 0 R 2081 0 R 2082 0 R 2083 0 R 2084 0 R 2085 0 R 2086 0 R 2087 0 R 2088 0 R 2089 0 R 2090 0 R 2091 0 R 2092 0 R 2093 0 R 2094 0 R 2095 0 R 2096 0 R 2097 0 R 2098 0 R 2099 0 R 2100 0 R 2101 0 R 2102 0 R 2103 0 R 2104 0 R 2105 0 R 2106 0 R 2107 0 R 2108 0 R 2109 0 R 2110 0 R 2111 0 R 2112 0 R 2113 0 R 2114 0 R 2115 0 R 2116 0 R 2117 0 R 2118 0 R 2119 0 R 2120 0 R 2121 0 R 2122 0 R 2123 0 R 2124 0 R 2125 0 R 2126 0 R 2127 0 R 2128 0 R 2129 0 R 2130 0 R 2131 0 R 2132 0 R 2133 0 R 2134 0 R 2135 0 R 2136 0 R 2137 0 R 2138 0 R 2139 0 R 2140 0 R 2141 0
R 2142 0 R 2143 0 R 2144 0 R]
+/Annots [2031 0 R 2032 0 R 2033 0 R 2034 0 R 2035 0 R 2036 0 R 2037 0 R 2038 0 R 2039 0 R 2040 0 R 2041 0 R 2042 0 R 2043 0 R 2044 0 R 2045 0 R 2046 0 R 2047 0 R 2048 0 R 2049 0 R 2050 0 R 2051 0 R 2052 0 R 2053 0 R 2054 0 R 2055 0 R 2056 0 R 2057 0 R 2058 0 R 2059 0 R 2060 0 R 2061 0 R 2062 0 R 2063 0 R 2064 0 R 2065 0 R 2066 0 R 2067 0 R 2068 0 R 2069 0 R 2070 0 R 2071 0 R 2072 0 R 2073 0 R 2074 0 R 2075 0 R 2076 0 R 2077 0 R 2078 0 R 2079 0 R 2080 0 R 2081 0 R 2082 0 R 2083 0 R 2084 0 R 2085 0 R 2086 0 R 2087 0 R 2088 0 R 2089 0 R 2090 0 R 2091 0 R 2092 0 R 2093 0 R 2094 0 R 2095 0 R 2096 0 R 2097 0 R 2098 0 R 2099 0 R 2100 0 R 2101 0 R 2102 0 R 2103 0 R 2104 0 R 2105 0 R 2106 0 R 2107 0 R 2108 0 R 2109 0 R 2110 0 R 2111 0 R 2112 0 R 2113 0 R 2114 0 R 2115 0 R 2116 0 R 2117 0 R 2118 0 R 2119 0 R 2120 0 R 2121 0 R 2122 0 R 2123 0 R 2124 0 R 2125 0 R 2126 0 R 2127 0 R 2128 0 R 2129 0 R 2130 0 R 2131 0 R 2132 0 R 2133 0 R 2134 0 R 2135 0 R 2136 0 R 2137 0 R 2138 0 R 2139 0 R 2140 0
R 2141 0 R 2142 0 R 2143 0 R]
>>
endobj
17 0 obj
@@ -8930,7 +8930,7 @@ endobj
/F1.0 8 0 R
/F3.0 40 0 R
>>
-/XObject << /Stamp1 2145 0 R
+/XObject << /Stamp1 2144 0 R
>>
>>
/Annots [24 0 R 25 0 R 26 0 R 27 0 R 28 0 R 29 0 R 30 0 R 31 0 R 32 0 R 33 0 R 34 0 R 35 0 R 36 0 R 37 0 R 38 0 R]
@@ -8945,18 +8945,18 @@ endobj
>>
endobj
21 0 obj
-<< /Kids [369 0 R 480 0 R 605 0 R 716 0 R 1034 0 R 835 0 R 1089 0 R 1189 0 R 1251 0 R 1349 0 R 1448 0 R 1554 0 R 1641 0 R 370 0 R 1007 0 R 683 0 R 894 0 R 1401 0 R]
+<< /Kids [368 0 R 479 0 R 604 0 R 715 0 R 1033 0 R 834 0 R 1088 0 R 1188 0 R 1250 0 R 1348 0 R 1447 0 R 1553 0 R 1640 0 R 369 0 R 1006 0 R 682 0 R 893 0 R 1400 0 R]
>>
endobj
22 0 obj
<< /Type /Font
-/BaseFont /AAAAAS+NotoSerif-Bold
+/BaseFont /AAAAAQ+NotoSerif-Bold
/Subtype /TrueType
-/FontDescriptor 2310 0 R
+/FontDescriptor 2309 0 R
/FirstChar 32
/LastChar 255
-/Widths 2312 0 R
-/ToUnicode 2311 0 R
+/Widths 2311 0 R
+/ToUnicode 2310 0 R
>>
endobj
23 0 obj
@@ -9129,13 +9129,13 @@ endobj
endobj
40 0 obj
<< /Type /Font
-/BaseFont /AAAAAT+mplus1mn-regular
+/BaseFont /AAAAAR+mplus1mn-regular
/Subtype /TrueType
-/FontDescriptor 2314 0 R
+/FontDescriptor 2313 0 R
/FirstChar 32
/LastChar 255
-/Widths 2316 0 R
-/ToUnicode 2315 0 R
+/Widths 2315 0 R
+/ToUnicode 2314 0 R
>>
endobj
41 0 obj
@@ -9498,20 +9498,20 @@ endobj
/F1.0 8 0 R
/F4.0 43 0 R
>>
-/XObject << /Stamp1 2145 0 R
+/XObject << /Stamp1 2144 0 R
>>
>>
>>
endobj
43 0 obj
<< /Type /Font
-/BaseFont /AAAAAU+mplus-1p-regular
+/BaseFont /AAAAAS+mplus-1p-regular
/Subtype /TrueType
-/FontDescriptor 2318 0 R
+/FontDescriptor 2317 0 R
/FirstChar 32
/LastChar 255
-/Widths 2320 0 R
-/ToUnicode 2319 0 R
+/Widths 2319 0 R
+/ToUnicode 2318 0 R
>>
endobj
44 0 obj
@@ -11890,7 +11890,7 @@ endobj
/F5.1 48 0 R
/F6.0 50 0 R
>>
-/XObject << /Stamp1 2145 0 R
+/XObject << /Stamp1 2144 0 R
>>
>>
/Annots [49 0 R 51 0 R 52 0 R 53 0 R 54 0 R 55 0 R 56 0 R 57 0 R 58 0 R 59 0 R 60 0 R 61 0 R 62 0 R 63 0 R 64 0 R]
@@ -11904,13 +11904,13 @@ endobj
endobj
48 0 obj
<< /Type /Font
-/BaseFont /AAAAAV+FontAwesome
+/BaseFont /AAAAAT+FontAwesome
/Subtype /TrueType
-/FontDescriptor 2322 0 R
+/FontDescriptor 2321 0 R
/FirstChar 32
/LastChar 255
-/Widths 2324 0 R
-/ToUnicode 2323 0 R
+/Widths 2323 0 R
+/ToUnicode 2322 0 R
>>
endobj
49 0 obj
@@ -11926,13 +11926,13 @@ endobj
endobj
50 0 obj
<< /Type /Font
-/BaseFont /AAAAAW+NotoSerif-Italic
+/BaseFont /AAAAAU+NotoSerif-Italic
/Subtype /TrueType
-/FontDescriptor 2326 0 R
+/FontDescriptor 2325 0 R
/FirstChar 32
/LastChar 255
-/Widths 2328 0 R
-/ToUnicode 2327 0 R
+/Widths 2327 0 R
+/ToUnicode 2326 0 R
>>
endobj
51 0 obj
@@ -13928,7 +13928,7 @@ endobj
/F6.0 50 0 R
/F5.1 48 0 R
>>
-/XObject << /Stamp1 2145 0 R
+/XObject << /Stamp1 2144 0 R
>>
>>
/Annots [67 0 R 68 0 R 69 0 R 70 0 R 72 0 R 73 0 R 74 0 R 75 0 R 76 0 R 77 0 R 78 0 R]
@@ -16250,7 +16250,7 @@ endobj
/F2.0 22 0 R
/F3.0 40 0 R
>>
-/XObject << /Stamp1 2145 0 R
+/XObject << /Stamp1 2144 0 R
>>
>>
/Annots [82 0 R 83 0 R 84 0 R 85 0 R 86 0 R 87 0 R 88 0 R 89 0 R 90 0 R 91 0 R 92 0 R 93 0 R 94 0 R 95 0 R 96 0 R 97 0 R 98 0 R 99 0 R 100 0 R 101 0 R 102 0 R 103 0 R]
@@ -18454,7 +18454,7 @@ endobj
/F6.0 50 0 R
/F3.0 40 0 R
>>
-/XObject << /Stamp1 2145 0 R
+/XObject << /Stamp1 2144 0 R
>>
>>
/Annots [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 126 0 R 127 0 R 128 0 R 129 0 R 130 0 R 131 0 R 132 0 R 133 0 R 134 0 R 135 0 R 136 0 R 137 0 R 138 0 R 139 0 R 140 0 R 141 0 R 142 0 R 143 0 R]
@@ -21340,7 +21340,7 @@ endobj
/F2.0 22 0 R
/F3.0 40 0 R
>>
-/XObject << /Stamp1 2145 0 R
+/XObject << /Stamp1 2144 0 R
>>
>>
/Annots [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 165 0 R 166 0 R 167 0 R 168 0 R]
@@ -24318,7 +24318,7 @@ endobj
/F3.0 40 0 R
/F1.0 8 0 R
>>
-/XObject << /Stamp1 2145 0 R
+/XObject << /Stamp1 2144 0 R
>>
>>
/Annots [171 0 R 172 0 R 173 0 R 174 0 R 175 0 R 176 0 R 177 0 R 178 0 R 179 0 R 180 0 R 181 0 R 182 0 R 183 0 R 184 0 R 185 0 R 186 0 R 187 0 R 188 0 R 189 0 R 190 0 R 191 0 R 192 0 R 193 0 R 194 0 R 195 0 R 196 0 R 197 0 R 198 0 R 199 0 R 200 0 R 201 0 R 202 0 R 203 0 R]
@@ -27123,7 +27123,7 @@ endobj
/F3.0 40 0 R
/F1.0 8 0 R
>>
-/XObject << /Stamp1 2145 0 R
+/XObject << /Stamp1 2144 0 R
>>
>>
/Annots [206 0 R 207 0 R 208 0 R 209 0 R 210 0 R 211 0 R 212 0 R 213 0 R 214 0 R 215 0 R 216 0 R 217 0 R 218 0 R 219 0 R 220 0 R 221 0 R 222 0 R 223 0 R 224 0 R 225 0 R 226 0 R]
@@ -29493,7 +29493,7 @@ endobj
/F3.0 40 0 R
/F1.0 8 0 R
>>
-/XObject << /Stamp1 2145 0 R
+/XObject << /Stamp1 2144 0 R
>>
>>
/Annots [229 0 R 230 0 R 231 0 R 232 0 R 233 0 R 234 0 R 235 0 R 236 0 R 237 0 R 238 0 R 239 0 R 240 0 R 241 0 R 242 0 R 243 0 R 244 0 R 245 0 R 246 0 R 247 0 R]
@@ -32707,7 +32707,7 @@ endobj
/F3.0 40 0 R
/F1.0 8 0 R
>>
-/XObject << /Stamp1 2145 0 R
+/XObject << /Stamp1 2144 0 R
>>
>>
/Annots [250 0 R 251 0 R 252 0 R 253 0 R 254 0 R 255 0 R 256 0 R 257 0 R 258 0 R 259 0 R 260 0 R 261 0 R 262 0 R 263 0 R 264 0 R 265 0 R 266 0 R 267 0 R 268 0 R 269 0 R 270 0 R 271 0 R]
@@ -34546,7 +34546,7 @@ endobj
/F1.0 8 0 R
/F6.0 50 0 R
>>
-/XObject << /Stamp1 2145 0 R
+/XObject << /Stamp1 2144 0 R
>>
>>
/Annots [274 0 R 275 0 R 276 0 R 277 0 R 278 0 R 279 0 R 280 0 R 281 0 R 282 0 R 283 0 R 284 0 R 285 0 R 286 0 R]
@@ -35586,7 +35586,7 @@ endobj
/F3.0 40 0 R
/F1.0 8 0 R
>>
-/XObject << /Stamp1 2145 0 R
+/XObject << /Stamp1 2144 0 R
>>
>>
/Annots [290 0 R]
@@ -36274,7 +36274,7 @@ endobj
/F3.0 40 0 R
/F1.0 8 0 R
>>
-/XObject << /Stamp1 2145 0 R
+/XObject << /Stamp1 2144 0 R
>>
>>
>>
@@ -38489,7 +38489,7 @@ endobj
/F1.0 8 0 R
/F6.0 50 0 R
>>
-/XObject << /Stamp1 2145 0 R
+/XObject << /Stamp1 2144 0 R
>>
>>
/Annots [296 0 R 297 0 R 298 0 R 299 0 R 300 0 R 301 0 R 302 0 R 303 0 R 304 0 R 305 0 R 306 0 R]
@@ -38602,7 +38602,7 @@ endobj
>>
endobj
307 0 obj
-<< /Length 33066
+<< /Length 33492
>>
stream
q
@@ -39270,12 +39270,12 @@ f
h
S
Q
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
59.24 538.499 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<7075626c6963> Tj
ET
@@ -39292,12 +39292,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
BT
97.74000000000001 538.499 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<636c617373> Tj
ET
@@ -39314,12 +39314,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
BT
130.74 538.499 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<546f446f4974656d> Tj
ET
@@ -39358,12 +39358,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
81.24000000000001 523.759 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<7075626c6963> Tj
ET
@@ -39380,12 +39380,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
119.74000000000001 523.759 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<737461746963> Tj
ET
@@ -39402,12 +39402,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
BT
158.24 523.759 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<636c617373> Tj
ET
@@ -39424,12 +39424,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
BT
191.24 523.759 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<436f6d706c657465644576656e74> Tj
ET
@@ -39446,12 +39446,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
273.74 523.759 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<657874656e6473> Tj
ET
@@ -39567,8 +39567,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
BT
81.24000000000001 509.01899999999995 Td
@@ -39644,8 +39644,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
251.74 494.27899999999994 Td
@@ -39721,8 +39721,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
290.24 479.53899999999993 Td
@@ -39820,8 +39820,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
312.24 464.799 Td
@@ -39919,8 +39919,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
251.74 450.05899999999997 Td
@@ -40018,8 +40018,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
185.74 435.31899999999996 Td
@@ -40139,8 +40139,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
213.24 420.57899999999995 Td
@@ -40260,8 +40260,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
235.24 405.83899999999994 Td
@@ -40359,8 +40359,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
235.24 391.09899999999993 Td
@@ -40403,12 +40403,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
81.24000000000001 361.6189999999999 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<7075626c6963> Tj
ET
@@ -40464,7 +40464,18 @@ ET
BT
218.74 361.6189999999999 Td
/F3.0 11 Tf
-<2829> 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
+
+BT
+224.24 361.6189999999999 Td
+/F3.0 11 Tf
+<29> Tj
ET
0.000 0.000 0.000 SCN
@@ -40508,7 +40519,29 @@ ET
BT
246.24 361.6189999999999 Td
/F3.0 11 Tf
-<2e2e2e> Tj
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+251.74 361.6189999999999 Td
+/F3.0 11 Tf
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+257.24 361.6189999999999 Td
+/F3.0 11 Tf
+<2e> Tj
ET
0.000 0.000 0.000 SCN
@@ -40963,13 +40996,12 @@ endobj
/F3.0 40 0 R
/F1.0 8 0 R
/F4.0 43 0 R
-/F7.0 312 0 R
-/F3.1 313 0 R
+/F3.1 312 0 R
>>
-/XObject << /Stamp1 2145 0 R
+/XObject << /Stamp1 2144 0 R
>>
>>
-/Annots [309 0 R 310 0 R 311 0 R 315 0 R]
+/Annots [309 0 R 310 0 R 311 0 R 314 0 R]
>>
endobj
309 0 obj
@@ -41001,30 +41033,19 @@ endobj
endobj
312 0 obj
<< /Type /Font
-/BaseFont /AAAAAX+mplus1mn-bold
+/BaseFont /AAAAAV+mplus1mn-regular
/Subtype /TrueType
-/FontDescriptor 2330 0 R
+/FontDescriptor 2329 0 R
/FirstChar 32
/LastChar 255
-/Widths 2332 0 R
-/ToUnicode 2331 0 R
+/Widths 2331 0 R
+/ToUnicode 2330 0 R
>>
endobj
313 0 obj
-<< /Type /Font
-/BaseFont /AAAAAY+mplus1mn-regular
-/Subtype /TrueType
-/FontDescriptor 2334 0 R
-/FirstChar 32
-/LastChar 255
-/Widths 2336 0 R
-/ToUnicode 2335 0 R
->>
-endobj
-314 0 obj
[308 0 R /XYZ 0 233.84400000000002 null]
endobj
-315 0 obj
+314 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -41035,7 +41056,7 @@ endobj
/Type /Annot
>>
endobj
-316 0 obj
+315 0 obj
<< /Length 20065
>>
stream
@@ -42351,23 +42372,23 @@ Q
endstream
endobj
-317 0 obj
+316 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 316 0 R
+/Contents 315 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/Font << /F1.0 8 0 R
/F3.0 40 0 R
/F5.1 48 0 R
>>
-/XObject << /Stamp1 2145 0 R
+/XObject << /Stamp1 2144 0 R
>>
>>
-/Annots [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]
+/Annots [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]
>>
endobj
-318 0 obj
+317 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -42378,7 +42399,7 @@ endobj
/Type /Annot
>>
endobj
-319 0 obj
+318 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -42389,7 +42410,7 @@ endobj
/Type /Annot
>>
endobj
-320 0 obj
+319 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -42400,7 +42421,7 @@ endobj
/Type /Annot
>>
endobj
-321 0 obj
+320 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -42411,7 +42432,7 @@ endobj
/Type /Annot
>>
endobj
-322 0 obj
+321 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -42422,7 +42443,7 @@ endobj
/Type /Annot
>>
endobj
-323 0 obj
+322 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -42433,7 +42454,7 @@ endobj
/Type /Annot
>>
endobj
-324 0 obj
+323 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -42444,7 +42465,7 @@ endobj
/Type /Annot
>>
endobj
-325 0 obj
+324 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -42455,7 +42476,7 @@ endobj
/Type /Annot
>>
endobj
-326 0 obj
+325 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -42466,7 +42487,7 @@ endobj
/Type /Annot
>>
endobj
-327 0 obj
+326 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -42477,7 +42498,7 @@ endobj
/Type /Annot
>>
endobj
-328 0 obj
+327 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -42488,8 +42509,8 @@ endobj
/Type /Annot
>>
endobj
-329 0 obj
-<< /Length 29514
+328 0 obj
+<< /Length 32022
>>
stream
q
@@ -42523,13 +42544,13 @@ h
S
Q
/DeviceRGB cs
-0.000 0.533 0.000 scn
+0.000 0.400 0.600 scn
/DeviceRGB CS
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 SCN
BT
59.24 783.0649999999999 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<7075626c6963> Tj
ET
@@ -42546,12 +42567,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
BT
97.74000000000001 783.0649999999999 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<636c617373> Tj
ET
@@ -42568,12 +42589,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
BT
130.74 783.0649999999999 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<4f72646572> Tj
ET
@@ -42612,8 +42633,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
BT
81.24000000000001 768.3249999999999 Td
@@ -42678,8 +42699,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
273.74 768.3249999999999 Td
@@ -42711,12 +42732,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
81.24000000000001 753.585 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<7075626c6963> Tj
ET
@@ -42772,7 +42793,51 @@ ET
BT
246.24 753.585 Td
/F3.0 11 Tf
-<282e2e2e29> 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
+
+BT
+251.74 753.585 Td
+/F3.0 11 Tf
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+257.24 753.585 Td
+/F3.0 11 Tf
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+262.74 753.585 Td
+/F3.0 11 Tf
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+268.24 753.585 Td
+/F3.0 11 Tf
+<29> Tj
ET
0.000 0.000 0.000 SCN
@@ -42816,7 +42881,29 @@ ET
BT
290.24 753.585 Td
/F3.0 11 Tf
-<2e2e2e> Tj
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+295.74 753.585 Td
+/F3.0 11 Tf
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+301.24 753.585 Td
+/F3.0 11 Tf
+<2e> Tj
ET
0.000 0.000 0.000 SCN
@@ -43059,12 +43146,12 @@ f
h
S
Q
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
59.24 541.9250000000002 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<7075626c6963> Tj
ET
@@ -43081,12 +43168,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
BT
97.74000000000001 541.9250000000002 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<636c617373> Tj
ET
@@ -43103,12 +43190,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
BT
130.74 541.9250000000002 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<4f72646572> Tj
ET
@@ -43147,8 +43234,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
BT
81.24000000000001 527.1850000000002 Td
@@ -43224,8 +43311,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
251.74 512.4450000000002 Td
@@ -43301,8 +43388,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
312.24 497.7050000000002 Td
@@ -43345,12 +43432,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
81.24000000000001 468.22500000000025 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<7075626c6963> Tj
ET
@@ -43406,7 +43493,51 @@ ET
BT
246.24 468.22500000000025 Td
/F3.0 11 Tf
-<282e2e2e29> 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
+
+BT
+251.74 468.22500000000025 Td
+/F3.0 11 Tf
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+257.24 468.22500000000025 Td
+/F3.0 11 Tf
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+262.74 468.22500000000025 Td
+/F3.0 11 Tf
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+268.24 468.22500000000025 Td
+/F3.0 11 Tf
+<29> Tj
ET
0.000 0.000 0.000 SCN
@@ -43450,7 +43581,29 @@ ET
BT
290.24 468.22500000000025 Td
/F3.0 11 Tf
-<2e2e2e> Tj
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+295.74 468.22500000000025 Td
+/F3.0 11 Tf
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+301.24 468.22500000000025 Td
+/F3.0 11 Tf
+<2e> Tj
ET
0.000 0.000 0.000 SCN
@@ -43664,12 +43817,12 @@ f
h
S
Q
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
59.24 333.40500000000026 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<7075626c6963> Tj
ET
@@ -43686,12 +43839,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
BT
97.74000000000001 333.40500000000026 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<636c617373> Tj
ET
@@ -43708,12 +43861,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
BT
130.74 333.40500000000026 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<4f72646572> Tj
ET
@@ -43752,8 +43905,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
BT
81.24000000000001 318.66500000000025 Td
@@ -43829,8 +43982,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
251.74 303.92500000000024 Td
@@ -43906,8 +44059,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
290.24 289.18500000000023 Td
@@ -43983,8 +44136,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
312.24 274.4450000000002 Td
@@ -44027,12 +44180,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
81.24000000000001 244.96500000000026 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<7075626c6963> Tj
ET
@@ -44088,7 +44241,51 @@ ET
BT
246.24 244.96500000000026 Td
/F3.0 11 Tf
-<282e2e2e29> 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
+
+BT
+251.74 244.96500000000026 Td
+/F3.0 11 Tf
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+257.24 244.96500000000026 Td
+/F3.0 11 Tf
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+262.74 244.96500000000026 Td
+/F3.0 11 Tf
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+268.24 244.96500000000026 Td
+/F3.0 11 Tf
+<29> Tj
ET
0.000 0.000 0.000 SCN
@@ -44132,7 +44329,29 @@ ET
BT
290.24 244.96500000000026 Td
/F3.0 11 Tf
-<2e2e2e> Tj
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+295.74 244.96500000000026 Td
+/F3.0 11 Tf
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+301.24 244.96500000000026 Td
+/F3.0 11 Tf
+<2e> Tj
ET
0.000 0.000 0.000 SCN
@@ -44478,28 +44697,27 @@ Q
endstream
endobj
-330 0 obj
+329 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 329 0 R
+/Contents 328 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F7.0 312 0 R
-/F3.0 40 0 R
+/Font << /F3.0 40 0 R
/F1.0 8 0 R
/F2.0 22 0 R
/F6.0 50 0 R
>>
-/XObject << /Stamp1 2145 0 R
+/XObject << /Stamp1 2144 0 R
>>
>>
-/Annots [332 0 R 334 0 R]
+/Annots [331 0 R 333 0 R]
>>
endobj
-331 0 obj
-[330 0 R /XYZ 0 669.37 null]
+330 0 obj
+[329 0 R /XYZ 0 669.37 null]
endobj
-332 0 obj
+331 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -44510,10 +44728,10 @@ endobj
/Type /Annot
>>
endobj
-333 0 obj
-[330 0 R /XYZ 0 160.75000000000023 null]
+332 0 obj
+[329 0 R /XYZ 0 160.75000000000023 null]
endobj
-334 0 obj
+333 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -44524,8 +44742,8 @@ endobj
/Type /Annot
>>
endobj
-335 0 obj
-<< /Length 21003
+334 0 obj
+<< /Length 22746
>>
stream
q
@@ -44602,12 +44820,12 @@ f
h
S
Q
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
59.24 728.255 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<7075626c6963> Tj
ET
@@ -44624,12 +44842,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
BT
97.74000000000001 728.255 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<636c617373> Tj
ET
@@ -44646,12 +44864,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
BT
130.74 728.255 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<4f72646572> Tj
ET
@@ -44690,8 +44908,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
BT
81.24000000000001 713.515 Td
@@ -44767,8 +44985,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
251.74 698.7750000000001 Td
@@ -44844,8 +45062,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
290.24 684.0350000000001 Td
@@ -44877,12 +45095,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
81.24000000000001 669.2950000000001 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<7075626c6963> Tj
ET
@@ -44938,7 +45156,51 @@ ET
BT
246.24 669.2950000000001 Td
/F3.0 11 Tf
-<282e2e2e29> 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
+
+BT
+251.74 669.2950000000001 Td
+/F3.0 11 Tf
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+257.24 669.2950000000001 Td
+/F3.0 11 Tf
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+262.74 669.2950000000001 Td
+/F3.0 11 Tf
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+268.24 669.2950000000001 Td
+/F3.0 11 Tf
+<29> Tj
ET
0.000 0.000 0.000 SCN
@@ -44982,7 +45244,29 @@ ET
BT
290.24 669.2950000000001 Td
/F3.0 11 Tf
-<2e2e2e> Tj
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+295.74 669.2950000000001 Td
+/F3.0 11 Tf
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+301.24 669.2950000000001 Td
+/F3.0 11 Tf
+<2e> Tj
ET
0.000 0.000 0.000 SCN
@@ -45454,12 +45738,12 @@ f
h
S
Q
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
59.24000000000001 276.59500000000014 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<7075626c6963> Tj
ET
@@ -45476,12 +45760,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
BT
97.74000000000001 276.59500000000014 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<636c617373> Tj
ET
@@ -45498,12 +45782,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
BT
130.74 276.59500000000014 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<546f446f4974656d> Tj
ET
@@ -45542,8 +45826,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
BT
81.24000000000001 261.8550000000002 Td
@@ -45559,7 +45843,18 @@ ET
BT
119.74000000000001 261.8550000000002 Td
/F3.0 11 Tf
-<2829> 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
+
+BT
+125.24000000000001 261.8550000000002 Td
+/F3.0 11 Tf
+<29> Tj
ET
0.000 0.000 0.000 SCN
@@ -45575,12 +45870,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
81.24000000000001 247.11500000000018 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<7075626c6963> Tj
ET
@@ -45636,7 +45931,18 @@ ET
BT
218.74 247.11500000000018 Td
/F3.0 11 Tf
-<2829> 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
+
+BT
+224.24 247.11500000000018 Td
+/F3.0 11 Tf
+<29> Tj
ET
0.000 0.000 0.000 SCN
@@ -45680,7 +45986,29 @@ ET
BT
246.24 247.11500000000018 Td
/F3.0 11 Tf
-<2e2e2e> Tj
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+251.74 247.11500000000018 Td
+/F3.0 11 Tf
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+257.24 247.11500000000018 Td
+/F3.0 11 Tf
+<2e> Tj
ET
0.000 0.000 0.000 SCN
@@ -45724,7 +46052,29 @@ ET
BT
81.24000000000001 232.37500000000017 Td
/F3.0 11 Tf
-<2e2e2e> Tj
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+86.74000000000001 232.37500000000017 Td
+/F3.0 11 Tf
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+92.24000000000001 232.37500000000017 Td
+/F3.0 11 Tf
+<2e> Tj
ET
0.000 0.000 0.000 SCN
@@ -45879,24 +46229,23 @@ Q
endstream
endobj
-336 0 obj
+335 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 335 0 R
+/Contents 334 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/Font << /F1.0 8 0 R
-/F7.0 312 0 R
/F3.0 40 0 R
/F2.0 22 0 R
>>
-/XObject << /Stamp1 2145 0 R
+/XObject << /Stamp1 2144 0 R
>>
>>
-/Annots [337 0 R 339 0 R 340 0 R 341 0 R 342 0 R 343 0 R]
+/Annots [336 0 R 338 0 R 339 0 R 340 0 R 341 0 R 342 0 R]
>>
endobj
-337 0 obj
+336 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -45907,10 +46256,10 @@ endobj
/Type /Annot
>>
endobj
-338 0 obj
-[336 0 R /XYZ 0 585.08 null]
+337 0 obj
+[335 0 R /XYZ 0 585.08 null]
endobj
-339 0 obj
+338 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -45921,7 +46270,7 @@ endobj
/Type /Annot
>>
endobj
-340 0 obj
+339 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -45932,7 +46281,7 @@ endobj
/Type /Annot
>>
endobj
-341 0 obj
+340 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -45943,7 +46292,7 @@ endobj
/Type /Annot
>>
endobj
-342 0 obj
+341 0 obj
<< /Border [0 0 0]
/Dest (_rgant-Collection_domainEvent)
/Subtype /Link
@@ -45951,7 +46300,7 @@ endobj
/Type /Annot
>>
endobj
-343 0 obj
+342 0 obj
<< /Border [0 0 0]
/Dest (_rgant-Property_domainEvent)
/Subtype /Link
@@ -45959,8 +46308,8 @@ endobj
/Type /Annot
>>
endobj
-344 0 obj
-<< /Length 31536
+343 0 obj
+<< /Length 32530
>>
stream
q
@@ -45994,13 +46343,13 @@ h
S
Q
/DeviceRGB cs
-0.000 0.533 0.000 scn
+0.000 0.400 0.600 scn
/DeviceRGB CS
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 SCN
BT
59.24 783.0649999999999 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<7075626c6963> Tj
ET
@@ -46017,12 +46366,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
BT
97.74000000000001 783.0649999999999 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<636c617373> Tj
ET
@@ -46039,12 +46388,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
BT
130.74 783.0649999999999 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<546f446f4974656d> Tj
ET
@@ -46083,12 +46432,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
81.24000000000001 768.3249999999999 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<7075626c6963> Tj
ET
@@ -46105,12 +46454,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
119.74000000000001 768.3249999999999 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<737461746963> Tj
ET
@@ -46127,12 +46476,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
BT
158.24 768.3249999999999 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<636c617373> Tj
ET
@@ -46149,12 +46498,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
BT
191.24 768.3249999999999 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<436f6d706c657465644576656e74> Tj
ET
@@ -46171,12 +46520,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
273.74 768.3249999999999 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<657874656e6473> Tj
ET
@@ -46314,8 +46663,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
BT
81.24000000000001 753.585 Td
@@ -46380,8 +46729,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
273.74 753.585 Td
@@ -46413,12 +46762,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
81.24000000000001 738.845 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<7075626c6963> Tj
ET
@@ -46474,7 +46823,18 @@ ET
BT
218.74 738.845 Td
/F3.0 11 Tf
-<2829> 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
+
+BT
+224.24 738.845 Td
+/F3.0 11 Tf
+<29> Tj
ET
0.000 0.000 0.000 SCN
@@ -46518,7 +46878,29 @@ ET
BT
246.24 738.845 Td
/F3.0 11 Tf
-<2e2e2e> Tj
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+251.74 738.845 Td
+/F3.0 11 Tf
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+257.24 738.845 Td
+/F3.0 11 Tf
+<2e> Tj
ET
0.000 0.000 0.000 SCN
@@ -46825,8 +47207,8 @@ f
h
S
Q
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
BT
59.24000000000001 459.8450000000001 Td
@@ -46891,8 +47273,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
268.24 459.8450000000001 Td
@@ -46913,12 +47295,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
59.24000000000001 445.1050000000001 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<7075626c6963> Tj
ET
@@ -46935,12 +47317,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
BT
97.74000000000001 445.1050000000001 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<636c617373> Tj
ET
@@ -46957,12 +47339,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
BT
130.74 445.1050000000001 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<536f6d6553756273637269626572> Tj
ET
@@ -46979,12 +47361,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
213.24 445.1050000000001 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<657874656e6473> Tj
ET
@@ -47045,8 +47427,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
BT
81.24000000000001 430.36500000000007 Td
@@ -47067,8 +47449,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
108.74000000000001 430.36500000000007 Td
@@ -47089,8 +47471,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
147.24 430.36500000000007 Td
@@ -47111,8 +47493,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
185.74 430.36500000000007 Td
@@ -47133,8 +47515,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
235.24 430.36500000000007 Td
@@ -47155,12 +47537,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
81.24000000000001 415.62500000000006 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<7075626c6963> Tj
ET
@@ -47177,12 +47559,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
BT
119.74000000000001 415.62500000000006 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<766f6964> Tj
ET
@@ -47304,7 +47686,29 @@ ET
BT
103.24000000000001 400.88500000000005 Td
/F3.0 11 Tf
-<2e2e2e> Tj
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+108.74000000000001 400.88500000000005 Td
+/F3.0 11 Tf
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+114.24000000000001 400.88500000000005 Td
+/F3.0 11 Tf
+<2e> Tj
ET
0.000 0.000 0.000 SCN
@@ -47380,8 +47784,8 @@ f
h
S
Q
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
BT
59.24000000000001 294.885 Td
@@ -47446,8 +47850,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
268.24 294.885 Td
@@ -47468,12 +47872,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
59.24000000000001 280.14500000000004 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<7075626c6963> Tj
ET
@@ -47490,12 +47894,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
BT
97.74000000000001 280.14500000000004 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<636c617373> Tj
ET
@@ -47512,12 +47916,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
BT
130.74 280.14500000000004 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<536f6d6553756273637269626572> Tj
ET
@@ -47534,12 +47938,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
213.24 280.14500000000004 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<657874656e6473> Tj
ET
@@ -47600,8 +48004,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
BT
81.24000000000001 265.40500000000003 Td
@@ -47622,8 +48026,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
108.74000000000001 265.40500000000003 Td
@@ -47644,8 +48048,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
147.24 265.40500000000003 Td
@@ -47666,8 +48070,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
185.74 265.40500000000003 Td
@@ -47688,8 +48092,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
235.24 265.40500000000003 Td
@@ -47710,12 +48114,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
81.24000000000001 250.66500000000002 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<7075626c6963> Tj
ET
@@ -47732,12 +48136,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
BT
119.74000000000001 250.66500000000002 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<766f6964> Tj
ET
@@ -47798,8 +48202,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
213.24 250.66500000000002 Td
@@ -47881,7 +48285,29 @@ ET
BT
103.24000000000001 235.925 Td
/F3.0 11 Tf
-<2e2e2e> Tj
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+108.74000000000001 235.925 Td
+/F3.0 11 Tf
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+114.24000000000001 235.925 Td
+/F3.0 11 Tf
+<2e> Tj
ET
0.000 0.000 0.000 SCN
@@ -48095,29 +48521,28 @@ Q
endstream
endobj
-345 0 obj
+344 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 344 0 R
+/Contents 343 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F7.0 312 0 R
-/F3.0 40 0 R
-/F3.1 313 0 R
+/Font << /F3.0 40 0 R
+/F3.1 312 0 R
/F1.0 8 0 R
/F5.1 48 0 R
/F2.0 22 0 R
>>
-/XObject << /Stamp1 2145 0 R
+/XObject << /Stamp1 2144 0 R
>>
>>
-/Annots [347 0 R 348 0 R 349 0 R]
+/Annots [346 0 R 347 0 R 348 0 R]
>>
endobj
-346 0 obj
-[345 0 R /XYZ 0 603.0699999999999 null]
+345 0 obj
+[344 0 R /XYZ 0 603.0699999999999 null]
endobj
-347 0 obj
+346 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -48128,7 +48553,7 @@ endobj
/Type /Annot
>>
endobj
-348 0 obj
+347 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -48139,7 +48564,7 @@ endobj
/Type /Annot
>>
endobj
-349 0 obj
+348 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -48150,8 +48575,8 @@ endobj
/Type /Annot
>>
endobj
-350 0 obj
-<< /Length 22671
+349 0 obj
+<< /Length 23656
>>
stream
q
@@ -48295,8 +48720,8 @@ f
h
S
Q
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
BT
59.24000000000001 683.945 Td
@@ -48306,8 +48731,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
BT
59.24000000000001 669.205 Td
@@ -48328,8 +48753,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
86.74000000000001 669.205 Td
@@ -48350,8 +48775,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
125.24000000000001 669.205 Td
@@ -48372,8 +48797,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
163.74 669.205 Td
@@ -48394,8 +48819,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
213.24 669.205 Td
@@ -48405,12 +48830,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
59.24000000000001 654.4650000000001 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<7075626c6963> Tj
ET
@@ -48427,12 +48852,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
BT
97.74000000000001 654.4650000000001 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<766f6964> Tj
ET
@@ -48449,12 +48874,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.400 0.733 scn
-0.000 0.400 0.733 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
125.24000000000001 654.4650000000001 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<6f6e> Tj
ET
@@ -48548,12 +48973,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
81.24000000000001 639.7250000000001 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<737769746368> Tj
ET
@@ -48592,8 +49017,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
136.24 639.7250000000001 Td
@@ -48609,7 +49034,29 @@ ET
BT
207.74 639.7250000000001 Td
/F3.0 11 Tf
-<282929> 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
+
+BT
+213.24 639.7250000000001 Td
+/F3.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
+218.74 639.7250000000001 Td
+/F3.0 11 Tf
+<29> Tj
ET
0.000 0.000 0.000 SCN
@@ -48647,12 +49094,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
103.24000000000001 624.9850000000001 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<63617365> Tj
ET
@@ -48669,13 +49116,24 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
130.74 624.9850000000001 Td
/F3.0 11 Tf
-<484944453a> Tj
+<48494445> 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
+152.74 624.9850000000001 Td
+/F3.0 11 Tf
+<3a> Tj
ET
0.000 0.000 0.000 SCN
@@ -48691,8 +49149,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.600 0.600 0.600 scn
+0.600 0.600 0.600 SCN
BT
125.24000000000001 610.2450000000001 Td
@@ -48713,12 +49171,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
125.24000000000001 595.5050000000001 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<627265616b> Tj
ET
@@ -48746,12 +49204,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
103.24000000000001 580.7650000000001 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<63617365> Tj
ET
@@ -48768,13 +49226,24 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
130.74 580.7650000000001 Td
/F3.0 11 Tf
-<44495341424c453a> Tj
+<44495341424c45> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+169.24 580.7650000000001 Td
+/F3.0 11 Tf
+<3a> Tj
ET
0.000 0.000 0.000 SCN
@@ -48790,8 +49259,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.600 0.600 0.600 scn
+0.600 0.600 0.600 SCN
BT
125.24000000000001 566.0250000000001 Td
@@ -48812,12 +49281,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
125.24000000000001 551.2850000000001 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<627265616b> Tj
ET
@@ -48845,12 +49314,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
103.24000000000001 536.5450000000001 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<63617365> Tj
ET
@@ -48867,13 +49336,24 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
130.74 536.5450000000001 Td
/F3.0 11 Tf
-<56414c49444154453a> Tj
+<56414c4944415445> 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 536.5450000000001 Td
+/F3.0 11 Tf
+<3a> Tj
ET
0.000 0.000 0.000 SCN
@@ -48889,8 +49369,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.600 0.600 0.600 scn
+0.600 0.600 0.600 SCN
BT
125.24000000000001 521.8050000000001 Td
@@ -48911,8 +49391,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.600 0.600 0.600 scn
+0.600 0.600 0.600 SCN
BT
125.24000000000001 507.06500000000005 Td
@@ -48933,12 +49413,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
125.24000000000001 492.32500000000005 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<627265616b> Tj
ET
@@ -48966,12 +49446,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
103.24000000000001 477.58500000000004 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<63617365> Tj
ET
@@ -48988,13 +49468,24 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
130.74 477.58500000000004 Td
/F3.0 11 Tf
-<455845435554494e473a> Tj
+<455845435554494e47> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+180.24 477.58500000000004 Td
+/F3.0 11 Tf
+<3a> Tj
ET
0.000 0.000 0.000 SCN
@@ -49010,12 +49501,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
125.24000000000001 462.845 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<627265616b> Tj
ET
@@ -49043,12 +49534,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
103.24000000000001 448.105 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<63617365> Tj
ET
@@ -49065,13 +49556,24 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
130.74 448.105 Td
/F3.0 11 Tf
-<45584543555445443a> Tj
+<4558454355544544> 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 448.105 Td
+/F3.0 11 Tf
+<3a> Tj
ET
0.000 0.000 0.000 SCN
@@ -49087,12 +49589,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
125.24000000000001 433.36500000000007 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<627265616b> Tj
ET
@@ -49586,27 +50088,26 @@ Q
endstream
endobj
-351 0 obj
+350 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 350 0 R
+/Contents 349 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/Font << /F1.0 8 0 R
/F3.0 40 0 R
-/F7.0 312 0 R
/F2.0 22 0 R
>>
-/XObject << /Stamp1 2145 0 R
+/XObject << /Stamp1 2144 0 R
>>
>>
>>
endobj
-352 0 obj
-[351 0 R /XYZ 0 318.63 null]
+351 0 obj
+[350 0 R /XYZ 0 318.63 null]
endobj
-353 0 obj
-<< /Length 17832
+352 0 obj
+<< /Length 18564
>>
stream
q
@@ -49999,12 +50500,12 @@ f
h
S
Q
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
59.24000000000001 484.92500000000024 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<7075626c6963> Tj
ET
@@ -50021,12 +50522,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
BT
97.74000000000001 484.92500000000024 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<636c617373> Tj
ET
@@ -50043,12 +50544,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
BT
130.74 484.92500000000024 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<437573746f6d6572> Tj
ET
@@ -50087,8 +50588,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
BT
81.24000000000001 470.18500000000023 Td
@@ -50153,8 +50654,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
196.74 470.18500000000023 Td
@@ -50186,12 +50687,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
81.24000000000001 455.4450000000002 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<7075626c6963> Tj
ET
@@ -50208,12 +50709,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
BT
119.74000000000001 455.4450000000002 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<766f6964> Tj
ET
@@ -50247,7 +50748,18 @@ ET
BT
213.24 455.4450000000002 Td
/F3.0 11 Tf
-<2829> 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
+
+BT
+218.74 455.4450000000002 Td
+/F3.0 11 Tf
+<29> Tj
ET
0.000 0.000 0.000 SCN
@@ -50291,7 +50803,29 @@ ET
BT
240.74 455.4450000000002 Td
/F3.0 11 Tf
-<2e2e2e> Tj
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+246.24 455.4450000000002 Td
+/F3.0 11 Tf
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+251.74 455.4450000000002 Td
+/F3.0 11 Tf
+<2e> Tj
ET
0.000 0.000 0.000 SCN
@@ -50335,7 +50869,29 @@ ET
BT
81.24000000000001 440.7050000000002 Td
/F3.0 11 Tf
-<2e2e2e> Tj
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+86.74000000000001 440.7050000000002 Td
+/F3.0 11 Tf
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+92.24000000000001 440.7050000000002 Td
+/F3.0 11 Tf
+<2e> Tj
ET
0.000 0.000 0.000 SCN
@@ -50715,28 +51271,27 @@ Q
endstream
endobj
-354 0 obj
+353 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 353 0 R
+/Contents 352 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/Font << /F2.0 22 0 R
/F1.0 8 0 R
/F3.0 40 0 R
/F5.1 48 0 R
-/F7.0 312 0 R
>>
-/XObject << /Stamp1 2145 0 R
+/XObject << /Stamp1 2144 0 R
>>
>>
-/Annots [356 0 R 357 0 R 359 0 R 360 0 R 361 0 R 362 0 R 363 0 R 364 0 R]
+/Annots [355 0 R 356 0 R 358 0 R 359 0 R 360 0 R 361 0 R 362 0 R 363 0 R]
>>
endobj
-355 0 obj
-[354 0 R /XYZ 0 841.89 null]
+354 0 obj
+[353 0 R /XYZ 0 841.89 null]
endobj
-356 0 obj
+355 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -50747,7 +51302,7 @@ endobj
/Type /Annot
>>
endobj
-357 0 obj
+356 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -50758,10 +51313,10 @@ endobj
/Type /Annot
>>
endobj
-358 0 obj
-[354 0 R /XYZ 0 718.07 null]
+357 0 obj
+[353 0 R /XYZ 0 718.07 null]
endobj
-359 0 obj
+358 0 obj
<< /Border [0 0 0]
/Dest (_rgant-Property_hidden)
/Subtype /Link
@@ -50769,7 +51324,7 @@ endobj
/Type /Annot
>>
endobj
-360 0 obj
+359 0 obj
<< /Border [0 0 0]
/Dest (_rgant-Collection_hidden)
/Subtype /Link
@@ -50777,7 +51332,7 @@ endobj
/Type /Annot
>>
endobj
-361 0 obj
+360 0 obj
<< /Border [0 0 0]
/Dest (_rgant-ActionLayout_hidden)
/Subtype /Link
@@ -50785,7 +51340,7 @@ endobj
/Type /Annot
>>
endobj
-362 0 obj
+361 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -50796,7 +51351,7 @@ endobj
/Type /Annot
>>
endobj
-363 0 obj
+362 0 obj
<< /Border [0 0 0]
/Dest (_rgant-DomainService_nature)
/Subtype /Link
@@ -50804,7 +51359,7 @@ endobj
/Type /Annot
>>
endobj
-364 0 obj
+363 0 obj
<< /Border [0 0 0]
/Dest (_rgant-ActionLayout_contributedAs)
/Subtype /Link
@@ -50812,11 +51367,11 @@ endobj
/Type /Annot
>>
endobj
-365 0 obj
-[354 0 R /XYZ 0 160.0300000000003 null]
+364 0 obj
+[353 0 R /XYZ 0 160.0300000000003 null]
endobj
-366 0 obj
-<< /Length 25495
+365 0 obj
+<< /Length 27184
>>
stream
q
@@ -50850,13 +51405,13 @@ h
S
Q
/DeviceRGB cs
-0.000 0.533 0.000 scn
+0.000 0.400 0.600 scn
/DeviceRGB CS
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 SCN
BT
59.24 783.0649999999999 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<7075626c6963> Tj
ET
@@ -50873,12 +51428,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
BT
97.74000000000001 783.0649999999999 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<636c617373> Tj
ET
@@ -50895,12 +51450,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
BT
130.74 783.0649999999999 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<546f446f4974656d> Tj
ET
@@ -50939,8 +51494,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
BT
81.24000000000001 768.3249999999999 Td
@@ -51005,8 +51560,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
224.24 768.3249999999999 Td
@@ -51038,12 +51593,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
81.24000000000001 753.585 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<7075626c6963> Tj
ET
@@ -51060,12 +51615,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
BT
119.74000000000001 753.585 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<766f6964> Tj
ET
@@ -51099,7 +51654,18 @@ ET
BT
229.74 753.585 Td
/F3.0 11 Tf
-<2829> 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
+
+BT
+235.24 753.585 Td
+/F3.0 11 Tf
+<29> Tj
ET
0.000 0.000 0.000 SCN
@@ -51159,12 +51725,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
174.74 738.845 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<74727565> Tj
ET
@@ -51176,7 +51742,18 @@ ET
BT
196.74 738.845 Td
/F3.0 11 Tf
-<293b> Tj
+<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
+202.24 738.845 Td
+/F3.0 11 Tf
+<3b> Tj
ET
0.000 0.000 0.000 SCN
@@ -51220,7 +51797,29 @@ ET
BT
81.24000000000001 709.365 Td
/F3.0 11 Tf
-<2e2e2e> Tj
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+86.74000000000001 709.365 Td
+/F3.0 11 Tf
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+92.24000000000001 709.365 Td
+/F3.0 11 Tf
+<2e> Tj
ET
0.000 0.000 0.000 SCN
@@ -51419,8 +52018,8 @@ f
h
S
Q
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
BT
59.24000000000001 475.42500000000024 Td
@@ -51485,8 +52084,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
202.24 475.42500000000024 Td
@@ -51507,12 +52106,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
59.24000000000001 460.68500000000023 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<7075626c6963> Tj
ET
@@ -51529,12 +52128,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
BT
97.74000000000001 460.68500000000023 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<766f6964> Tj
ET
@@ -51551,12 +52150,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.400 0.733 scn
-0.000 0.400 0.733 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
125.24000000000001 460.68500000000023 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<6d61726b4173436f6d706c65746564> Tj
ET
@@ -51639,12 +52238,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
152.74 445.9450000000002 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<74727565> Tj
ET
@@ -51656,7 +52255,18 @@ ET
BT
174.74 445.9450000000002 Td
/F3.0 11 Tf
-<293b> Tj
+<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
+180.24 445.9450000000002 Td
+/F3.0 11 Tf
+<3b> Tj
ET
0.000 0.000 0.000 SCN
@@ -51694,8 +52304,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
158.24 431.2050000000002 Td
@@ -51711,7 +52321,29 @@ ET
BT
290.24 431.2050000000002 Td
/F3.0 11 Tf
-<28293b> 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
+
+BT
+295.74 431.2050000000002 Td
+/F3.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
+301.24 431.2050000000002 Td
+/F3.0 11 Tf
+<3b> Tj
ET
0.000 0.000 0.000 SCN
@@ -51765,8 +52397,8 @@ f
h
S
Q
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
BT
59.24000000000001 339.9450000000002 Td
@@ -51831,8 +52463,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
202.24 339.9450000000002 Td
@@ -51853,12 +52485,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
59.24000000000001 325.2050000000002 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<7075626c6963> Tj
ET
@@ -51875,12 +52507,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
BT
97.74000000000001 325.2050000000002 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<766f6964> Tj
ET
@@ -51897,12 +52529,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.400 0.733 scn
-0.000 0.400 0.733 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
125.24000000000001 325.2050000000002 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<6d61726b4173436f6d706c65746564> Tj
ET
@@ -51963,12 +52595,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
81.24000000000001 310.4650000000002 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<6966> Tj
ET
@@ -52002,7 +52634,29 @@ ET
BT
158.24 310.4650000000002 Td
/F3.0 11 Tf
-<282929> 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
+
+BT
+163.74 310.4650000000002 Td
+/F3.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
+169.24 310.4650000000002 Td
+/F3.0 11 Tf
+<29> Tj
ET
0.000 0.000 0.000 SCN
@@ -52040,12 +52694,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
103.24000000000001 295.7250000000002 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<72657475726e> Tj
ET
@@ -52117,12 +52771,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
152.74 266.24500000000023 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<74727565> Tj
ET
@@ -52134,7 +52788,18 @@ ET
BT
174.74 266.24500000000023 Td
/F3.0 11 Tf
-<293b> Tj
+<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
+180.24 266.24500000000023 Td
+/F3.0 11 Tf
+<3b> Tj
ET
0.000 0.000 0.000 SCN
@@ -52172,8 +52837,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
158.24 251.50500000000022 Td
@@ -52189,7 +52854,29 @@ ET
BT
290.24 251.50500000000022 Td
/F3.0 11 Tf
-<28293b> 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
+
+BT
+295.74 251.50500000000022 Td
+/F3.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
+301.24 251.50500000000022 Td
+/F3.0 11 Tf
+<3b> Tj
ET
0.000 0.000 0.000 SCN
@@ -52482,38 +53169,37 @@ Q
endstream
endobj
-367 0 obj
+366 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 366 0 R
+/Contents 365 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F7.0 312 0 R
-/F3.0 40 0 R
+/Font << /F3.0 40 0 R
/F1.0 8 0 R
/F5.1 48 0 R
/F2.0 22 0 R
>>
-/XObject << /Stamp1 2145 0 R
+/XObject << /Stamp1 2144 0 R
>>
>>
-/Annots [371 0 R 372 0 R 373 0 R 374 0 R]
+/Annots [370 0 R 371 0 R 372 0 R 373 0 R]
>>
endobj
-368 0 obj
-[367 0 R /XYZ 0 175.0700000000002 null]
+367 0 obj
+[366 0 R /XYZ 0 175.0700000000002 null]
endobj
-369 0 obj
+368 0 obj
<< /Limits [(_rgant) (_rgant-ActionLayout_named)]
-/Names [(_rgant) 19 0 R (_rgant-Action) 295 0 R (_rgant-ActionLayout) 398 0 R (_rgant-ActionLayout_bookmarking) 420 0 R (_rgant-ActionLayout_contributedAs) 434 0 R (_rgant-ActionLayout_cssClass) 442 0 R (_rgant-ActionLayout_cssClassFa) 452 0 R (_rgant-ActionLayout_describedAs) 460 0 R (_rgant-ActionLayout_hidden) 470 0 R (_rgant-ActionLayout_named) 479 0 R]
+/Names [(_rgant) 19 0 R (_rgant-Action) 295 0 R (_rgant-ActionLayout) 397 0 R (_rgant-ActionLayout_bookmarking) 419 0 R (_rgant-ActionLayout_contributedAs) 433 0 R (_rgant-ActionLayout_cssClass) 441 0 R (_rgant-ActionLayout_cssClassFa) 451 0 R (_rgant-ActionLayout_describedAs) 459 0 R (_rgant-ActionLayout_hidden) 469 0 R (_rgant-ActionLayout_named) 478 0 R]
>>
endobj
-370 0 obj
+369 0 obj
<< /Limits [(_rgant_aaa_jee) (default-doop-and-noop-events)]
-/Names [(_rgant_aaa_jee) 79 0 R (_rgant_aaa_main) 47 0 R (_rgant_aaa_other) 71 0 R (_rgant_aaa_partial) 287 0 R (alternative-syntaxes) 1156 0 R (code-autocompleteaction-code) 766 0 R (code-commandexecutein-code) 333 0 R (code-commandpersistence-code) 331 0 R (code-publishingpayloadfactory-code) 379 0 R (code-publishingpayloadfactory-code-2) 871 0 R (default-doop-and-noop-events) 352 0 R]
+/Names [(_rgant_aaa_jee) 79 0 R (_rgant_aaa_main) 47 0 R (_rgant_aaa_other) 71 0 R (_rgant_aaa_partial) 287 0 R (alternative-syntaxes) 1155 0 R (code-autocompleteaction-code) 765 0 R (code-commandexecutein-code) 332 0 R (code-commandpersistence-code) 330 0 R (code-publishingpayloadfactory-code) 378 0 R (code-publishingpayloadfactory-code-2) 870 0 R (default-doop-and-noop-events) 351 0 R]
>>
endobj
-371 0 obj
+370 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -52524,7 +53210,7 @@ endobj
/Type /Annot
>>
endobj
-372 0 obj
+371 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -52535,7 +53221,7 @@ endobj
/Type /Annot
>>
endobj
-373 0 obj
+372 0 obj
<< /Border [0 0 0]
/Dest (_rgant-DomainObject_publishing)
/Subtype /Link
@@ -52543,7 +53229,7 @@ endobj
/Type /Annot
>>
endobj
-374 0 obj
+373 0 obj
<< /Border [0 0 0]
/Dest (_rgant_Property_publishing)
/Subtype /Link
@@ -52551,8 +53237,8 @@ endobj
/Type /Annot
>>
endobj
-375 0 obj
-<< /Length 19923
+374 0 obj
+<< /Length 20781
>>
stream
q
@@ -53060,12 +53746,12 @@ f
h
S
Q
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
59.24000000000001 421.1150000000002 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<7075626c6963> Tj
ET
@@ -53082,12 +53768,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
BT
97.74000000000001 421.1150000000002 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<636c617373> Tj
ET
@@ -53104,12 +53790,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
BT
130.74 421.1150000000002 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<4f72646572> Tj
ET
@@ -53148,8 +53834,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
BT
81.24000000000001 406.37500000000017 Td
@@ -53214,8 +53900,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
246.24 406.37500000000017 Td
@@ -53269,12 +53955,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
81.24000000000001 391.63500000000016 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<7075626c6963> Tj
ET
@@ -53330,7 +54016,51 @@ ET
BT
246.24 391.63500000000016 Td
/F3.0 11 Tf
-<282e2e2e29> 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
+
+BT
+251.74 391.63500000000016 Td
+/F3.0 11 Tf
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+257.24 391.63500000000016 Td
+/F3.0 11 Tf
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+262.74 391.63500000000016 Td
+/F3.0 11 Tf
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+268.24 391.63500000000016 Td
+/F3.0 11 Tf
+<29> Tj
ET
0.000 0.000 0.000 SCN
@@ -53374,7 +54104,29 @@ ET
BT
290.24 391.63500000000016 Td
/F3.0 11 Tf
-<2e2e2e> Tj
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+295.74 391.63500000000016 Td
+/F3.0 11 Tf
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+301.24 391.63500000000016 Td
+/F3.0 11 Tf
+<2e> Tj
ET
0.000 0.000 0.000 SCN
@@ -53789,27 +54541,26 @@ Q
endstream
endobj
-376 0 obj
+375 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 375 0 R
+/Contents 374 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/Font << /F1.0 8 0 R
/F3.0 40 0 R
/F6.0 50 0 R
-/F7.0 312 0 R
-/F3.1 313 0 R
+/F3.1 312 0 R
/F2.0 22 0 R
/F5.1 48 0 R
>>
-/XObject << /Stamp1 2145 0 R
+/XObject << /Stamp1 2144 0 R
>>
>>
-/Annots [377 0 R 378 0 R 380 0 R 381 0 R 383 0 R]
+/Annots [376 0 R 377 0 R 379 0 R 380 0 R 382 0 R]
>>
endobj
-377 0 obj
+376 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -53820,7 +54571,7 @@ endobj
/Type /Annot
>>
endobj
-378 0 obj
+377 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -53831,10 +54582,10 @@ endobj
/Type /Annot
>>
endobj
-379 0 obj
-[376 0 R /XYZ 0 329.20000000000016 null]
+378 0 obj
+[375 0 R /XYZ 0 329.20000000000016 null]
endobj
-380 0 obj
+379 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -53845,7 +54596,7 @@ endobj
/Type /Annot
>>
endobj
-381 0 obj
+380 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -53856,10 +54607,10 @@ endobj
/Type /Annot
>>
endobj
-382 0 obj
-[376 0 R /XYZ 0 109.90000000000012 null]
+381 0 obj
+[375 0 R /XYZ 0 109.90000000000012 null]
endobj
-383 0 obj
+382 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -53870,8 +54621,8 @@ endobj
/Type /Annot
>>
endobj
-384 0 obj
-<< /Length 27553
+383 0 obj
+<< /Length 29087
>>
stream
q
@@ -53926,12 +54677,12 @@ f
h
S
Q
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
59.24 728.255 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<7075626c6963> Tj
ET
@@ -53948,12 +54699,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
BT
97.74000000000001 728.255 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<636c617373> Tj
ET
@@ -53970,12 +54721,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
BT
130.74 728.255 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<437573746f6d6572> Tj
ET
@@ -54014,12 +54765,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
81.24000000000001 713.515 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<7075626c6963> Tj
ET
@@ -54075,7 +54826,18 @@ ET
BT
224.24 713.515 Td
/F3.0 11 Tf
-<2829> 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
+
+BT
+229.74 713.515 Td
+/F3.0 11 Tf
+<29> Tj
ET
0.000 0.000 0.000 SCN
@@ -54119,7 +54881,29 @@ ET
BT
251.74 713.515 Td
/F3.0 11 Tf
-<2e2e2e> Tj
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+257.24 713.515 Td
+/F3.0 11 Tf
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+262.74 713.515 Td
+/F3.0 11 Tf
+<2e> Tj
ET
0.000 0.000 0.000 SCN
@@ -54157,12 +54941,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
81.24000000000001 698.7750000000001 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<7075626c6963> Tj
ET
@@ -54179,8 +54963,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
BT
119.74000000000001 698.7750000000001 Td
@@ -54251,7 +55035,18 @@ ET
BT
273.74 698.7750000000001 Td
/F3.0 11 Tf
-<2829> 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
+
+BT
+279.24 698.7750000000001 Td
+/F3.0 11 Tf
+<29> Tj
ET
0.000 0.000 0.000 SCN
@@ -54295,7 +55090,29 @@ ET
BT
301.24 698.7750000000001 Td
/F3.0 11 Tf
-<2e2e2e> Tj
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+306.74 698.7750000000001 Td
+/F3.0 11 Tf
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+312.24 698.7750000000001 Td
+/F3.0 11 Tf
+<2e> Tj
ET
0.000 0.000 0.000 SCN
@@ -54333,8 +55150,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
BT
81.24000000000001 669.2950000000001 Td
@@ -54399,8 +55216,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
246.24 669.2950000000001 Td
@@ -54432,12 +55249,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
81.24000000000001 654.5550000000001 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<7075626c6963> Tj
ET
@@ -54454,8 +55271,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
BT
119.74000000000001 654.5550000000001 Td
@@ -54526,7 +55343,18 @@ ET
BT
257.24 654.5550000000001 Td
/F3.0 11 Tf
-<2829> 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
+
+BT
+262.74 654.5550000000001 Td
+/F3.0 11 Tf
+<29> Tj
ET
0.000 0.000 0.000 SCN
@@ -54570,7 +55398,29 @@ ET
BT
284.74 654.5550000000001 Td
/F3.0 11 Tf
-<2e2e2e> Tj
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+290.24 654.5550000000001 Td
+/F3.0 11 Tf
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+295.74 654.5550000000001 Td
+/F3.0 11 Tf
+<2e> Tj
ET
0.000 0.000 0.000 SCN
@@ -54614,7 +55464,29 @@ ET
BT
81.24000000000001 639.815 Td
/F3.0 11 Tf
-<2e2e2e> Tj
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+86.74000000000001 639.815 Td
+/F3.0 11 Tf
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
<TRUNCATED>
[17/44] isis-site git commit: ISIS-1594: provide an 'edit' button
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/83a3755a/content/guides/ugsec.html
----------------------------------------------------------------------
diff --git a/content/guides/ugsec.html b/content/guides/ugsec.html
index 564715f..5242b89 100644
--- a/content/guides/ugsec.html
+++ b/content/guides/ugsec.html
@@ -1,12 +1,10 @@
<!doctype html>
<html class="no-js" lang="en">
-<head>
- <meta charset="utf-8"/>
- <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-
- <title>Security</title>
-
- <!--
+ <head>
+ <meta charset="utf-8">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+ <title>Security</title>
+ <!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
@@ -23,31 +21,21 @@
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
- -->
-
- <!-- No caching headers -->
- <meta http-equiv="cache-control" content="no-cache" />
- <meta http-equiv="pragma" content="no-cache" />
- <meta http-equiv="expires" content="-1" />
-
-
- <!-- TODO: need to (re)instate CDN in the future (not using for now just so can develop off-line -->
- <link href="../css/foundation/5.5.1/foundation.css" rel="stylesheet" />
- <script src="../js/foundation/5.5.1/vendor/modernizr.js"></script>
- <link href="../css/asciidoctor/colony.css" rel="stylesheet">
- <link href="../css/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet">
-
-
-
-
- <link href="../css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.css" rel="stylesheet" />
- <!--[if lt IE 9]>
+ -->
+ <!-- No caching headers -->
+ <meta http-equiv="cache-control" content="no-cache">
+ <meta http-equiv="pragma" content="no-cache">
+ <meta http-equiv="expires" content="-1">
+ <!-- TODO: need to (re)instate CDN in the future (not using for now just so can develop off-line -->
+ <link href="../css/foundation/5.5.1/foundation.css" rel="stylesheet">
+ <script src="../js/foundation/5.5.1/vendor/modernizr.js"></script>
+ <link href="../css/asciidoctor/colony.css" rel="stylesheet">
+ <link href="../css/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet">
+ <link href="../css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.css" rel="stylesheet">
+ <!--[if lt IE 9]>
<link href="../css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.ie.css" rel="stylesheet" />
- <![endif]-->
-
-
-
- <style type="text/css">
+ <![endif]-->
+ <style type="text/css">
pre code {
background-color: inherit;
border-style: none;
@@ -192,9 +180,8 @@ table.CodeRay td.code>pre{padding:0}
color:#fff;
font-size: 1.1em;
}
- </style>
-
- <style>
+ </style>
+ <style>
@media only screen and (min-width: 40.063em) {
.top-bar {
.contain-to-grid .top-bar {
@@ -205,9 +192,8 @@ table.CodeRay td.code>pre{padding:0}
.row {
max-width: 80rem;
}
- </style>
-
- <style>
+ </style>
+ <style>
.extended-quote,
.extended-quote-first {
margin-left: 40px;
@@ -231,9 +217,8 @@ table.CodeRay td.code>pre{padding:0}
text-shadow: 0 1px 2px rgba(0, 0, 0, 0.1);
}
- </style>
-
- <style>
+ </style>
+ <style>
body {
position: relative;
}
@@ -255,6 +240,7 @@ table.CodeRay td.code>pre{padding:0}
div#doc-content {
margin-top: 30px;
+ padding-top: 30px;
}
div.documentation-page table.frame-all {
@@ -286,9 +272,8 @@ table.CodeRay td.code>pre{padding:0}
min-height: 2000px;
}
- </style>
-
- <style>
+ </style>
+ <style>
@media only screen and (min-width: 768px) {
#toc.toc2 ul ul { margin-left: -10px; }
@@ -316,15 +301,13 @@ table.CodeRay td.code>pre{padding:0}
body div#toc2 li.tocify-item.active a {
color: red;
}
- </style>
-
- <style>
+ </style>
+ <style>
footer {
margin-top: 1000px;
}
- </style>
-
- <style>
+ </style>
+ <style>
/* overriding colony.css stylesheet */
.literalblock pre, .literalblock pre[class], .listingblock pre, .listingblock pre[class] {
/*padding: 1.25em 1.5625em 1.125em 1.5625em;*/
@@ -372,9 +355,8 @@ table.CodeRay td.code>pre{padding:0}
.imageblock img {
margin-bottom: 10px;
}
- </style>
-
- <style>
+ </style>
+ <style>
/* from http://ben.balter.com/2014/03/13/pages-anchor-links/ */
.header-link {
position: absolute;
@@ -395,9 +377,8 @@ table.CodeRay td.code>pre{padding:0}
h6:hover .header-link {
opacity: 1;
}
- </style>
-
- <style>
+ </style>
+ <style>
.top-bar
{
-webkit-transition-duration: .5s;
@@ -425,309 +406,239 @@ table.CodeRay td.code>pre{padding:0}
-webkit-transition-property: -webkit-transform;
transition-property: transform;
}
- </style>
-
- <style>
+ </style>
+ <style>
#doc-content a.guide {
color: white;
}
- </style>
-
- <style>
+ </style>
+ <style>
+ .tocify {
+ margin-top: 80px;
+ }
+ </style>
+ <style>
.tocify {
margin-top: 80px;
}
- </style>
-
-
-</script>
-
-</head>
-<body>
-
-<<div class="github-fork-ribbon-wrapper right" style="position: fixed;">
- <div class="github-fork-ribbon">
- <a href="https://github.com/apache/isis#fork-destination-box">Fork me on GitHub</a>
- </div>
-</div>
-
-
-<div class="row">
-
- <div class="fixed contain-to-grid header">
- <nav class="top-bar" data-topbar role="navigation" style="max-width: 80rem">
- <ul class="title-area">
- <li class="name">
- <h1>
- <a href="/index.html">Apache Isis™</a>
- </h1>
- </li>
- <!-- Remove the class "menu-icon" to get rid of menu icon. Take out "Menu" to just have icon alone -->
- <li class="toggle-topbar menu-icon"><a href="#"><span>Menu</span></a></li>
- </ul>
-
- <section class="top-bar-section">
- <ul class="right">
-
- <li class="has-form">
- <FORM class="searchbox navbar-form navbar-right" id="searchbox_012614087480249044419:dn-q5gtwxya" action="http://www.google.com/cse">
- <div class="row collapse">
- <input type="hidden" name="cx" value="012614087480249044419:dn-q5gtwxya">
- <INPUT type="hidden" name="cof" value="FORID:0">
- <INPUT class="form-control" name="q" type="text" placeholder="Search">
- </div>
- </FORM>
- </li>
-
- </ul>
-
- <!-- Left Nav Section -->
- <ul class="left">
-
- <li><a href="/documentation.html">Documentation</a></li>
- <li><a href="/downloads.html">Downloads</a></li>
- <li><a href="/help.html">Help</a></li>
- <li><a href="/asf.html">@ASF</a></li>
-
- </ul>
-
- </section>
- </nav>
- </div>
-</div>
-
-<div class="row">
-
- <div id="doc-content-left" class="large-9 medium-9 columns">
-
-
- <div id="doc-content">
- <div class="sect1">
-<h2 id="_ugsec">1. Security</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>This guide describes the authentication and authorization features available to secure your Apache Isis application.</p>
-</div>
-<div class="sect2">
-<h3 id="_other_guides">1.1. Other Guides</h3>
-<div class="paragraph">
-<p>Apache Isis documentation is broken out into a number of user, reference and "supporting procedures" guides.</p>
-</div>
-<div class="paragraph">
-<p>The user guides available are:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="ugfun.html">Fundamentals</a></p>
-</li>
-<li>
-<p><a href="ugvw.html">Wicket viewer</a></p>
-</li>
-<li>
-<p><a href="ugvro.html">Restful Objects viewer</a></p>
-</li>
-<li>
-<p><a href="ugdno.html">DataNucleus object store</a></p>
-</li>
-<li>
-<p><a href="#">Security</a> (this guide)</p>
-</li>
-<li>
-<p><a href="ugtst.html">Testing</a></p>
-</li>
-<li>
-<p><a href="ugbtb.html">Beyond the Basics</a></p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>The reference guides are:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="rgant.html">Annotations</a></p>
-</li>
-<li>
-<p><a href="rgsvc.html">Domain Services</a></p>
-</li>
-<li>
-<p><a href="rgcfg.html">Configuration Properties</a></p>
-</li>
-<li>
-<p><a href="rgcms.html">Classes, Methods and Schema</a></p>
-</li>
-<li>
-<p><a href="rgmvn.html">Apache Isis Maven plugin</a></p>
-</li>
-<li>
-<p><a href="rgfis.html">Framework Internal Services</a></p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>The remaining guides are:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="dg.html">Developers' Guide</a> (how to set up a development environment
-for Apache Isis and contribute back to the project)</p>
-</li>
-<li>
-<p><a href="cgcom.html">Committers' Guide</a> (release procedures and related practices)</p>
-</li>
-</ul>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_terminology">1.2. Terminology</h3>
-<div class="paragraph">
-<p>Apache Isis has built-in support for authentication and authorization:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>By "authentication" we mean logging into the application using some credentials, typically a username and password. Authentication also means looking up the set of roles to which a user belongs.</p>
-</li>
-<li>
-<p>By "authorization" we mean permissions: granting roles to have access to features (object member) of the app.</p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>Isis has two levels of permissions. <em>Read</em> permission means that the user can view the object member; it will be rendered in the UI. An action with only read permission will be shown disabled ("greyed out". <em>Write</em> permission means that the object member can be changed. For actions this means that they can be invoked.</p>
-</div>
-<div class="paragraph">
-<p>Isis provides an API for both authentication and authorization, and provides an implementation that integrates with <a href="http://shiro.apache.org">Apache Shiro</a>. Shiro in turn uses the concept of a <em>realm</em> as a source for both authentication and optionally authorization.</p>
-</div>
-<div class="paragraph">
-<p>Shiro ships with a simple text-based realm — the <code>IniRealm</code> — which reads users (and password), user roles and role permissions from the <code>WEB-INF/shiro.ini</code> file. The <a href="ugfun.html#_ugfun_getting-started_simpleapp-archetype">SimpleApp archetype</a> is configured to use this realm.</p>
-</div>
-<div class="paragraph">
-<p>Shiro also ships with an implementation of an LDAP-based realm; LDAP is often used to manage user/passwords and corresponding user groups. Apache Isis in turn extends this with its <code>IsisLdapRealm</code>, which provides more flexibility for both group/role and role/permissions management.</p>
-</div>
-<div class="paragraph">
-<p>In addition, the (non-ASF) <a href="http://www.isisaddons.org">Isis Addons</a> provides the <a href="http://github.com/isisaddons/isis-module-security">Isis addons' security</a> module, which also provides an implementation of the Shiro <code>Realm</code> API. However, the security module also represents users, roles and permissions as domain objects, allowing them to be administered through Apache Isis itself. Moreover, the security module can optionally delegate password management to a subsidiary (delegate) realm (usually LDAP as discussed above).</p>
-</div>
-<div class="paragraph">
-<p>In addition to Apache Isis' Shiro-based implementation of its authentication and authorization APIs, Isis also provides a "bypass" implementation, useful for quick-n-dirty prototyping when you want to in effect disable (bypass) security completely.</p>
-</div>
-<div class="admonitionblock note">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-note" title="Note"></i>
-</td>
-<td class="content">
-<div class="title">What about auditing?</div>
-<div class="paragraph">
-<p>A further aspect of security is auditing: recording what data was modified by which user.</p>
-</div>
-<div class="paragraph">
-<p>Apache Isis provides the <a href="rgsvc.html#_rgsvc_api_InteractionContext"><code>InteractionContext</code></a>
-can be used to track the actions being invoked, and the <a href="rgsvc.html#_rgsvc_spi_AuditerService"><code>AuditerService</code></a>
-captures what data was modified as a result (auditing). When <code>Interaction</code>s are persisted (eg by way of
-(non-ASF) <a href="http://github.com/isisaddons/isis-module-publishmq">Isis addons' publishmq</a> module) this provides excellent
-traceability. The (non-ASF) <a href="http://github.com/isisaddons/isis-module-audit">Isis addons' audit</a> module provides an
-implementation of the <code>AuditerService</code>.</p>
-</div>
-<div class="paragraph">
-<p>For earlier versions of the framework the
-<a href="rgsvc.html#_rgsvc_spi_CommandService"><code>CommandService</code></a> can be used to capture actions, while the (deprecated)
-<a href="rgsvc.html#_rgsvc_spi_AuditingService"><code>AuditingService</code></a> used to capture data modified.</p>
-</div>
-</td>
-</tr>
-</table>
-</div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_ugsec_configuring-isis-to-use-shiro">2. Configuring Apache Isis to use Shiro</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>Apache Isis' security mechanism is configurable, specifying an <code>Authenticator</code> and an <code>Authorizor</code> (non-public) APIs. The Shiro security mechanism is an integration wih Apache Shiro that implements both interfaces.</p>
-</div>
-<div class="admonitionblock tip">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-tip" title="Tip"></i>
-</td>
-<td class="content">
-<div class="paragraph">
-<p>The <a href="ugfun.html#_ugfun_getting-started_simpleapp-archetype">SimpleApp archetype</a> is pre-configured to use Apache Shiro, so much of what follows is set up already.</p>
-</div>
-</td>
-</tr>
-</table>
-</div>
-<div class="sect2">
-<h3 id="_telling_apache_isis_to_use_shiro">2.1. Telling Apache Isis to use Shiro</h3>
-<div class="paragraph">
-<p>To tell Apache Isis to use Shiro, update the <code>WEB-INF/isis.properties</code> file:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="ini">isis.authentication=shiro
-isis.authorization=shiro</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>This installs the appropriate implementation (the <code>ShiroAuthenticatorOrAuthorizor</code> class) that use Shiro’s APIs to perform authentication and authorization:</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<img src="images/security/security-apis-impl/configure-isis-to-use-shiro.png" alt="configure isis to use shiro" width="600px">
-</div>
-</div>
-<div class="paragraph">
-<p>The figure above doesn’t tell the whole story; we haven’t yet seen how Shiro itself is configured to use realms. The <code>ShiroAuthenticatorOrAuthorizor</code> is in essence the glue between the Apache Isis runtime and Shiro.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_configuring_isis_shiro_authenticator">2.2. Configuring Isis' Shiro Authenticator</h3>
-<div class="paragraph">
-<p>The <code>ShiroAuthenticatorOrAuthorizor</code> class itself supports a single optional property. This can
-be configured in <code>authentication_shiro.properties</code> file:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="ini">isis.authentication.shiro.autoLogoutIfAlreadyAuthenticated=false</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>This configuration property only comes into effect for the <a href="ugvro.html">Restful Objects viewer</a>; if set then
-the Shiro subject - if found to be still authenticated - will be logged out anyway and then re-authenticated.</p>
-</div>
-<div class="admonitionblock warning">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-warning" title="Warning"></i>
-</td>
-<td class="content">
-<div class="paragraph">
-<p>This auto-logout behaviour was the default prior to <code>1.13.0</code>, but is believed to be the root cause of some
-exceptions caused by a possible race condition. There should generally be no need to change this property from its
-default (<code>false</code>).</p>
-</div>
-</td>
-</tr>
-</table>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_bootstrapping_shiro">2.3. Bootstrapping Shiro</h3>
-<div class="paragraph">
-<p>The Shiro environment (in essence, thread-locals holding the security credentials) needs to be bootstrapped using the following settings in the <code>WEB-INF/web.xml</code> file:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="xml"><span class="tag"><listener></span>
+ </style>
+ </head>
+ <body>
+ <div class="row">
+ <div class="fixed contain-to-grid header">
+ <nav class="top-bar" data-topbar role="navigation" style="max-width: 80rem">
+ <ul class="title-area">
+ <li class="name"> <h1> <a href="/index.html">Apache Isis\u2122</a> </h1> </li>
+ <!-- Remove the class "menu-icon" to get rid of menu icon. Take out "Menu" to just have icon alone -->
+ <li class="toggle-topbar menu-icon"><a href="#"><span>Menu</span></a></li>
+ </ul>
+ <section class="top-bar-section">
+ <ul class="right">
+ <li class="has-form">
+ <form class="searchbox navbar-form navbar-right" id="searchbox_012614087480249044419:dn-q5gtwxya" action="http://www.google.com/cse">
+ <div class="row collapse">
+ <input type="hidden" name="cx" value="012614087480249044419:dn-q5gtwxya">
+ <input type="hidden" name="cof" value="FORID:0">
+ <input class="form-control" name="q" type="text" placeholder="Search">
+ </div>
+ </form> </li>
+ </ul>
+ <!-- Left Nav Section -->
+ <ul class="left">
+ <li><a href="/documentation.html">Documentation</a></li>
+ <li><a href="/downloads.html">Downloads</a></li>
+ <li><a href="/help.html">Help</a></li>
+ <li><a href="/asf.html">@ASF</a></li>
+ </ul>
+ </section>
+ </nav>
+ </div>
+ </div>
+ <div class="row">
+ <div id="doc-content-left" class="large-9 medium-9 columns">
+ <div id="doc-content">
+ <button type="button" class="button secondary" onclick="window.location.href="https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/ugsec.adoc"" style="float: right; font-size: small; padding: 6px; "><i class="fa fa-pencil-square-o"></i> Edit</button>
+ <div class="sect1">
+ <h2 id="_ugsec">1. Security</h2>
+ <button type="button" class="button secondary" onclick="window.location.href="https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/_ugsec.adoc"" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i> Edit</button>
+ <div class="sectionbody">
+ <div class="paragraph">
+ <p>This guide describes the authentication and authorization features available to secure your Apache Isis application.</p>
+ </div>
+ <div class="sect2">
+ <h3 id="_other_guides">1.1. Other Guides</h3>
+ <div class="paragraph">
+ <p>Apache Isis documentation is broken out into a number of user, reference and "supporting procedures" guides.</p>
+ </div>
+ <div class="paragraph">
+ <p>The user guides available are:</p>
+ </div>
+ <div class="ulist">
+ <ul>
+ <li> <p><a href="ugfun.html">Fundamentals</a></p> </li>
+ <li> <p><a href="ugvw.html">Wicket viewer</a></p> </li>
+ <li> <p><a href="ugvro.html">Restful Objects viewer</a></p> </li>
+ <li> <p><a href="ugdno.html">DataNucleus object store</a></p> </li>
+ <li> <p><a href="#">Security</a> (this guide)</p> </li>
+ <li> <p><a href="ugtst.html">Testing</a></p> </li>
+ <li> <p><a href="ugbtb.html">Beyond the Basics</a></p> </li>
+ </ul>
+ </div>
+ <div class="paragraph">
+ <p>The reference guides are:</p>
+ </div>
+ <div class="ulist">
+ <ul>
+ <li> <p><a href="rgant.html">Annotations</a></p> </li>
+ <li> <p><a href="rgsvc.html">Domain Services</a></p> </li>
+ <li> <p><a href="rgcfg.html">Configuration Properties</a></p> </li>
+ <li> <p><a href="rgcms.html">Classes, Methods and Schema</a></p> </li>
+ <li> <p><a href="rgmvn.html">Apache Isis Maven plugin</a></p> </li>
+ <li> <p><a href="rgfis.html">Framework Internal Services</a></p> </li>
+ </ul>
+ </div>
+ <div class="paragraph">
+ <p>The remaining guides are:</p>
+ </div>
+ <div class="ulist">
+ <ul>
+ <li> <p><a href="dg.html">Developers' Guide</a> (how to set up a development environment for Apache Isis and contribute back to the project)</p> </li>
+ <li> <p><a href="cgcom.html">Committers' Guide</a> (release procedures and related practices)</p> </li>
+ </ul>
+ </div>
+ </div>
+ <div class="sect2">
+ <h3 id="_terminology">1.2. Terminology</h3>
+ <div class="paragraph">
+ <p>Apache Isis has built-in support for authentication and authorization:</p>
+ </div>
+ <div class="ulist">
+ <ul>
+ <li> <p>By "authentication" we mean logging into the application using some credentials, typically a username and password. Authentication also means looking up the set of roles to which a user belongs.</p> </li>
+ <li> <p>By "authorization" we mean permissions: granting roles to have access to features (object member) of the app.</p> </li>
+ </ul>
+ </div>
+ <div class="paragraph">
+ <p>Isis has two levels of permissions. <em>Read</em> permission means that the user can view the object member; it will be rendered in the UI. An action with only read permission will be shown disabled ("greyed out". <em>Write</em> permission means that the object member can be changed. For actions this means that they can be invoked.</p>
+ </div>
+ <div class="paragraph">
+ <p>Isis provides an API for both authentication and authorization, and provides an implementation that integrates with <a href="http://shiro.apache.org">Apache Shiro</a>. Shiro in turn uses the concept of a <em>realm</em> as a source for both authentication and optionally authorization.</p>
+ </div>
+ <div class="paragraph">
+ <p>Shiro ships with a simple text-based realm\u2009\u2014\u2009the <code>IniRealm</code>\u2009\u2014\u2009which reads users (and password), user roles and role permissions from the <code>WEB-INF/shiro.ini</code> file. The <a href="ugfun.html#_ugfun_getting-started_simpleapp-archetype">SimpleApp archetype</a> is configured to use this realm.</p>
+ </div>
+ <div class="paragraph">
+ <p>Shiro also ships with an implementation of an LDAP-based realm; LDAP is often used to manage user/passwords and corresponding user groups. Apache Isis in turn extends this with its <code>IsisLdapRealm</code>, which provides more flexibility for both group/role and role/permissions management.</p>
+ </div>
+ <div class="paragraph">
+ <p>In addition, the (non-ASF) <a href="http://www.isisaddons.org">Isis Addons</a> provides the <a href="http://github.com/isisaddons/isis-module-security">Isis addons' security</a> module, which also provides an implementation of the Shiro <code>Realm</code> API. However, the security module also represents users, roles and permissions as domain objects, allowing them to be administered through Apache Isis itself. Moreover, the security module can optionally delegate password management to a subsidiary (delegate) realm (usually LDAP as discussed above).</p>
+ </div>
+ <div class="paragraph">
+ <p>In addition to Apache Isis' Shiro-based implementation of its authentication and authorization APIs, Isis also provides a "bypass" implementation, useful for quick-n-dirty prototyping when you want to in effect disable (bypass) security completely.</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="title">
+ What about auditing?
+ </div>
+ <div class="paragraph">
+ <p>A further aspect of security is auditing: recording what data was modified by which user.</p>
+ </div>
+ <div class="paragraph">
+ <p>Apache Isis provides the <a href="rgsvc.html#_rgsvc_api_InteractionContext"><code>InteractionContext</code></a> can be used to track the actions being invoked, and the <a href="rgsvc.html#_rgsvc_spi_AuditerService"><code>AuditerService</code></a> captures what data was modified as a result (auditing). When <code>Interaction</code>s are persisted (eg by way of (non-ASF) <a href="http://github.com/isisaddons/isis-module-publishmq">Isis addons' publishmq</a> module) this provides excellent traceability. The (non-ASF) <a href="http://github.com/isisaddons/isis-module-audit">Isis addons' audit</a> module provides an implementation of the <code>AuditerService</code>.</p>
+ </div>
+ <div class="paragraph">
+ <p>For earlier versions of the framework the <a href="rgsvc.html#_rgsvc_spi_CommandService"><code>CommandService</code></a> can be used to capture actions, while the (deprecated) <a href="rgsvc.html#_rgsvc_spi_AuditingService"><code>AuditingService</code></a> used to capture data modified.</p>
+ </div> </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="sect1">
+ <h2 id="_ugsec_configuring-isis-to-use-shiro">2. Configuring Apache Isis to use Shiro</h2>
+ <button type="button" class="button secondary" onclick="window.location.href="https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/_ugsec_configuring-isis-to-use-shiro.adoc"" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i> Edit</button>
+ <div class="sectionbody">
+ <div class="paragraph">
+ <p>Apache Isis' security mechanism is configurable, specifying an <code>Authenticator</code> and an <code>Authorizor</code> (non-public) APIs. The Shiro security mechanism is an integration wih Apache Shiro that implements both interfaces.</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>The <a href="ugfun.html#_ugfun_getting-started_simpleapp-archetype">SimpleApp archetype</a> is pre-configured to use Apache Shiro, so much of what follows is set up already.</p>
+ </div> </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ <div class="sect2">
+ <h3 id="_telling_apache_isis_to_use_shiro">2.1. Telling Apache Isis to use Shiro</h3>
+ <div class="paragraph">
+ <p>To tell Apache Isis to use Shiro, update the <code>WEB-INF/isis.properties</code> file:</p>
+ </div>
+ <div class="listingblock">
+ <div class="content">
+ <pre class="CodeRay highlight"><code data-lang="ini">isis.authentication=shiro
+isis.authorization=shiro</code></pre>
+ </div>
+ </div>
+ <div class="paragraph">
+ <p>This installs the appropriate implementation (the <code>ShiroAuthenticatorOrAuthorizor</code> class) that use Shiro\u2019s APIs to perform authentication and authorization:</p>
+ </div>
+ <div class="imageblock">
+ <div class="content">
+ <img src="images/security/security-apis-impl/configure-isis-to-use-shiro.png" alt="configure isis to use shiro" width="600px">
+ </div>
+ </div>
+ <div class="paragraph">
+ <p>The figure above doesn\u2019t tell the whole story; we haven\u2019t yet seen how Shiro itself is configured to use realms. The <code>ShiroAuthenticatorOrAuthorizor</code> is in essence the glue between the Apache Isis runtime and Shiro.</p>
+ </div>
+ </div>
+ <div class="sect2">
+ <h3 id="_configuring_isis_shiro_authenticator">2.2. Configuring Isis' Shiro Authenticator</h3>
+ <div class="paragraph">
+ <p>The <code>ShiroAuthenticatorOrAuthorizor</code> class itself supports a single optional property. This can be configured in <code>authentication_shiro.properties</code> file:</p>
+ </div>
+ <div class="listingblock">
+ <div class="content">
+ <pre class="CodeRay highlight"><code data-lang="ini">isis.authentication.shiro.autoLogoutIfAlreadyAuthenticated=false</code></pre>
+ </div>
+ </div>
+ <div class="paragraph">
+ <p>This configuration property only comes into effect for the <a href="ugvro.html">Restful Objects viewer</a>; if set then the Shiro subject - if found to be still authenticated - will be logged out anyway and then re-authenticated.</p>
+ </div>
+ <div class="admonitionblock warning">
+ <table>
+ <tbody>
+ <tr>
+ <td class="icon"> <i class="fa icon-warning" title="Warning"></i> </td>
+ <td class="content">
+ <div class="paragraph">
+ <p>This auto-logout behaviour was the default prior to <code>1.13.0</code>, but is believed to be the root cause of some exceptions caused by a possible race condition. There should generally be no need to change this property from its default (<code>false</code>).</p>
+ </div> </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ </div>
+ <div class="sect2">
+ <h3 id="_bootstrapping_shiro">2.3. Bootstrapping Shiro</h3>
+ <div class="paragraph">
+ <p>The Shiro environment (in essence, thread-locals holding the security credentials) needs to be bootstrapped using the following settings in the <code>WEB-INF/web.xml</code> file:</p>
+ </div>
+ <div class="listingblock">
+ <div class="content">
+ <pre class="CodeRay highlight"><code data-lang="xml"><span class="tag"><listener></span>
<span class="tag"><listener-class></span>org.apache.shiro.web.env.EnvironmentLoaderListener<span class="tag"></listener-class></span>
<span class="tag"></listener></span>
<span class="tag"><filter></span>
@@ -737,164 +648,155 @@ default (<code>false</code>).</p>
<span class="tag"><filter-mapping></span>
<span class="tag"><filter-name></span>ShiroFilter<span class="tag"></filter-name></span>
<span class="tag"><url-pattern></span>/*<span class="tag"></url-pattern></span>
-<span class="tag"></filter-mapping></span></code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>Based on this Shiro will then read <code>WEB-INF/shiro.ini</code> file to configure its Realm definitions for authentication and authorization.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="__code_web_inf_shiro_ini_code">2.4. <code>WEB-INF/shiro.ini</code></h3>
-<div class="paragraph">
-<p>The <code>shiro.ini</code> file is used to specify the realm(s) that Shiro will delegate to:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="ini">securityManager.realms = $realmName</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>Shiro’s ini file supports a "poor-man’s" dependency injection (<a href="https://shiro.apache.org/configuration.html">their words</a>), and so <code>$realmName</code> in the above example is a reference to a realm defined elsewhere in <code>shiro.ini</code>. The subsequent sections describe the specifics for thevarious realm implementations available to you.</p>
-</div>
-<div class="paragraph">
-<p>It’s also possible to configure Shiro to support multiple realms.</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="ini">securityManager.realms = $realm1,$realm2</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>You can learn more about Shiro realms in the <a href="http://shiro.apache.org/realm.html">Shiro documentation</a>.</p>
-</div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_ugsec_shiro-ini-realm">3. Shiro Ini Realm</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>Probably the simplest realm to use is Shiro’s built-in <code>IniRealm</code>, which reads from the (same) <code>WEB-INF/shiro.ini</code> file.</p>
-</div>
-<div class="paragraph">
-<p>This is suitable for prototyping, but isn’t intended for production use, if only because user/password credentials are stored in plain text. Nevertheless, it’s a good starting point. The app generated by the <a href="ugfun.html#_ugfun_getting-started_simpleapp-archetype">SimpleApp archetype</a> is configured to use this realm.</p>
-</div>
-<div class="paragraph">
-<p>The diagram below shows the Isis and components involved:</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<img src="images/security/security-apis-impl/configure-shiro-to-use-ini-realm.PNG" alt="configure shiro to use ini realm" width="600px">
-</div>
-</div>
-<div class="paragraph">
-<p>The realm is responsible for validating the user credentials, and then creates a Shiro <a href="http://shiro.apache.org/static/latest/apidocs/org/apache/shiro/subject/Subject.html"><code>Subject</code></a> which represents the user (for the current request). Apache Isis <code>Authenticator</code> component then interacts with the <code>Subject</code> in order to check permissions.</p>
-</div>
-<div class="sect2">
-<h3 id="_shiro_configuration">3.1. Shiro Configuration</h3>
-<div class="paragraph">
-<p>To use the built-in <code>IniRealm</code>, we add the following to <code>WEB-INF/shiro.ini</code>:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="ini">securityManager.realms = $iniRealm</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>(Unlike other realms) there is no need to "define" <code>$iniRealm</code>; it is automatically available to us.</p>
-</div>
-<div class="paragraph">
-<p>Specifying <code>$iniRealm</code> means that the usernames/passwords, roles and permissions are read from the <code>shiro.ini</code> file itself. Specifically:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>the users/passwords and their roles from the <code>[users]</code> sections;</p>
-</li>
-<li>
-<p>the roles are mapped to permissions in the <code>[roles]</code> section.</p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>The format of these is described below.</p>
-</div>
-<div class="sect3">
-<h4 id="__code_users_code_section">3.1.1. <code>[users]</code> section</h4>
-<div class="paragraph">
-<p>This section lists users, passwords and their roles.</p>
-</div>
-<div class="paragraph">
-<p>For example:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="ini">sven = pass, admin_role
+<span class="tag"></filter-mapping></span></code></pre>
+ </div>
+ </div>
+ <div class="paragraph">
+ <p>Based on this Shiro will then read <code>WEB-INF/shiro.ini</code> file to configure its Realm definitions for authentication and authorization.</p>
+ </div>
+ </div>
+ <div class="sect2">
+ <h3 id="__code_web_inf_shiro_ini_code">2.4. <code>WEB-INF/shiro.ini</code></h3>
+ <div class="paragraph">
+ <p>The <code>shiro.ini</code> file is used to specify the realm(s) that Shiro will delegate to:</p>
+ </div>
+ <div class="listingblock">
+ <div class="content">
+ <pre class="CodeRay highlight"><code data-lang="ini">securityManager.realms = $realmName</code></pre>
+ </div>
+ </div>
+ <div class="paragraph">
+ <p>Shiro\u2019s ini file supports a "poor-man\u2019s" dependency injection (<a href="https://shiro.apache.org/configuration.html">their words</a>), and so <code>$realmName</code> in the above example is a reference to a realm defined elsewhere in <code>shiro.ini</code>. The subsequent sections describe the specifics for thevarious realm implementations available to you.</p>
+ </div>
+ <div class="paragraph">
+ <p>It\u2019s also possible to configure Shiro to support multiple realms.</p>
+ </div>
+ <div class="listingblock">
+ <div class="content">
+ <pre class="CodeRay highlight"><code data-lang="ini">securityManager.realms = $realm1,$realm2</code></pre>
+ </div>
+ </div>
+ <div class="paragraph">
+ <p>You can learn more about Shiro realms in the <a href="http://shiro.apache.org/realm.html">Shiro documentation</a>.</p>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="sect1">
+ <h2 id="_ugsec_shiro-ini-realm">3. Shiro Ini Realm</h2>
+ <button type="button" class="button secondary" onclick="window.location.href="https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/_ugsec_shiro-ini-realm.adoc"" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i> Edit</button>
+ <div class="sectionbody">
+ <div class="paragraph">
+ <p>Probably the simplest realm to use is Shiro\u2019s built-in <code>IniRealm</code>, which reads from the (same) <code>WEB-INF/shiro.ini</code> file.</p>
+ </div>
+ <div class="paragraph">
+ <p>This is suitable for prototyping, but isn\u2019t intended for production use, if only because user/password credentials are stored in plain text. Nevertheless, it\u2019s a good starting point. The app generated by the <a href="ugfun.html#_ugfun_getting-started_simpleapp-archetype">SimpleApp archetype</a> is configured to use this realm.</p>
+ </div>
+ <div class="paragraph">
+ <p>The diagram below shows the Isis and components involved:</p>
+ </div>
+ <div class="imageblock">
+ <div class="content">
+ <img src="images/security/security-apis-impl/configure-shiro-to-use-ini-realm.PNG" alt="configure shiro to use ini realm" width="600px">
+ </div>
+ </div>
+ <div class="paragraph">
+ <p>The realm is responsible for validating the user credentials, and then creates a Shiro <a href="http://shiro.apache.org/static/latest/apidocs/org/apache/shiro/subject/Subject.html"><code>Subject</code></a> which represents the user (for the current request). Apache Isis <code>Authenticator</code> component then interacts with the <code>Subject</code> in order to check permissions.</p>
+ </div>
+ <div class="sect2">
+ <h3 id="_shiro_configuration">3.1. Shiro Configuration</h3>
+ <div class="paragraph">
+ <p>To use the built-in <code>IniRealm</code>, we add the following to <code>WEB-INF/shiro.ini</code>:</p>
+ </div>
+ <div class="listingblock">
+ <div class="content">
+ <pre class="CodeRay highlight"><code data-lang="ini">securityManager.realms = $iniRealm</code></pre>
+ </div>
+ </div>
+ <div class="paragraph">
+ <p>(Unlike other realms) there is no need to "define" <code>$iniRealm</code>; it is automatically available to us.</p>
+ </div>
+ <div class="paragraph">
+ <p>Specifying <code>$iniRealm</code> means that the usernames/passwords, roles and permissions are read from the <code>shiro.ini</code> file itself. Specifically:</p>
+ </div>
+ <div class="ulist">
+ <ul>
+ <li> <p>the users/passwords and their roles from the <code>[users]</code> sections;</p> </li>
+ <li> <p>the roles are mapped to permissions in the <code>[roles]</code> section.</p> </li>
+ </ul>
+ </div>
+ <div class="paragraph">
+ <p>The format of these is described below.</p>
+ </div>
+ <div class="sect3">
+ <h4 id="__code_users_code_section">3.1.1. <code>[users]</code> section</h4>
+ <div class="paragraph">
+ <p>This section lists users, passwords and their roles.</p>
+ </div>
+ <div class="paragraph">
+ <p>For example:</p>
+ </div>
+ <div class="listingblock">
+ <div class="content">
+ <pre class="CodeRay highlight"><code data-lang="ini">sven = pass, admin_role
dick = pass, user_role, analysis_role, self-install_role
-bob = pass, user_role, self-install_role</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>The first value is the password (eg "pass", the remaining values are the role(s).</p>
-</div>
-</div>
-<div class="sect3">
-<h4 id="__code_roles_code_section">3.1.2. <code>[roles]</code> section</h4>
-<div class="paragraph">
-<p>This section lists roles and their corresponding permissions.</p>
-</div>
-<div class="paragraph">
-<p>For example:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="ini">user_role = *:ToDoItems:*:*,\
+bob = pass, user_role, self-install_role</code></pre>
+ </div>
+ </div>
+ <div class="paragraph">
+ <p>The first value is the password (eg "pass", the remaining values are the role(s).</p>
+ </div>
+ </div>
+ <div class="sect3">
+ <h4 id="__code_roles_code_section">3.1.2. <code>[roles]</code> section</h4>
+ <div class="paragraph">
+ <p>This section lists roles and their corresponding permissions.</p>
+ </div>
+ <div class="paragraph">
+ <p>For example:</p>
+ </div>
+ <div class="listingblock">
+ <div class="content">
+ <pre class="CodeRay highlight"><code data-lang="ini">user_role = *:ToDoItems:*:*,\
*:ToDoItem:*:*,\
*:ToDoAppDashboard:*:*
analysis_role = *:ToDoItemAnalysis:*:*,\
*:ToDoItemsByCategoryViewModel:*:*,\
*:ToDoItemsByDateRangeViewModel:*:*
self-install_role = *:ToDoItemsFixturesService:install:*
-admin_role = *</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>The value is a comma-separated list of permissions for the role. The format is:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="ini">packageName:className:memberName:r,w</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>where:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><code>memberName</code> is the property, collection or action name.</p>
-</li>
-<li>
-<p><code>r</code> indicates that the member is visible</p>
-</li>
-<li>
-<p><code>w</code> indicates that the member is usable (editable or invokable)</p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>and where each of the parts of the permission string can be wildcarded using <code>*</code>.</p>
-</div>
-<div class="paragraph">
-<p>Because these are wildcards, a '*' can be used at any level. Additionally, missing levels assume wildcards.</p>
-</div>
-<div class="paragraph">
-<p>Thus:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="ini">com.mycompany.myapp:Customer:firstName:r,w # view or edit customer's firstName
+admin_role = *</code></pre>
+ </div>
+ </div>
+ <div class="paragraph">
+ <p>The value is a comma-separated list of permissions for the role. The format is:</p>
+ </div>
+ <div class="listingblock">
+ <div class="content">
+ <pre class="CodeRay highlight"><code data-lang="ini">packageName:className:memberName:r,w</code></pre>
+ </div>
+ </div>
+ <div class="paragraph">
+ <p>where:</p>
+ </div>
+ <div class="ulist">
+ <ul>
+ <li> <p><code>memberName</code> is the property, collection or action name.</p> </li>
+ <li> <p><code>r</code> indicates that the member is visible</p> </li>
+ <li> <p><code>w</code> indicates that the member is usable (editable or invokable)</p> </li>
+ </ul>
+ </div>
+ <div class="paragraph">
+ <p>and where each of the parts of the permission string can be wildcarded using <code>*</code>.</p>
+ </div>
+ <div class="paragraph">
+ <p>Because these are wildcards, a '*' can be used at any level. Additionally, missing levels assume wildcards.</p>
+ </div>
+ <div class="paragraph">
+ <p>Thus:</p>
+ </div>
+ <div class="listingblock">
+ <div class="content">
+ <pre class="CodeRay highlight"><code data-lang="ini">com.mycompany.myapp:Customer:firstName:r,w # view or edit customer's firstName
com.mycompany.myapp:Customer:lastName:r # view customer's lastName only
com.mycompany.myapp:Customer:placeOrder:* # view and invoke placeOrder action
com.mycompany.myapp:Customer:placeOrder # ditto
@@ -904,93 +806,94 @@ com.mycompany.myapp:*:*:* # view/edit for all classes in myap
com.mycompany.myapp:*:* # ditto
com.mycompany.myapp:* # ditto
com.mycompany.myapp # ditto
-* # view/edit access to everything</code></pre>
-</div>
-</div>
-<div class="admonitionblock tip">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-tip" title="Tip"></i>
-</td>
-<td class="content">
-<div class="paragraph">
-<p>The format of the permissions string is configurable in Shiro, and Apache Isis uses this to provide an extended wildcard format, described <a href="#_ugsec_shiro-isis-enhanced-wildcard-permission">here</a>.</p>
-</div>
-</td>
-</tr>
-</table>
-</div>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_externalized_inirealm">3.2. Externalized IniRealm</h3>
-<div class="paragraph">
-<p>There’s no requirement for all users/roles to be defined in the <code>shiro.ini</code> file. Instead, a realm can be defined that loads its users/roles from some other resource.</p>
-</div>
-<div class="paragraph">
-<p>For example:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="ini">$realm1=org.apache.shiro.realm.text.IniRealm <i class="conum" data-value="1"></i><b>(1)</b>
-realm1.resourcePath=classpath:webapp/realm1.ini <i class="conum" data-value="2"></i><b>(2)</b></code></pre>
-</div>
-</div>
-<div class="colist arabic">
-<table>
-<tr>
-<td><i class="conum" data-value="1"></i><b>1</b></td>
-<td>happens to (coincidentally) be the <a href="http://shiro.apache.org/static/latest/apidocs/org/apache/shiro/realm/text/IniRealm.html">same implementation</a> as Shiro’s built-in $iniRealm</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="2"></i><b>2</b></td>
-<td>in this case load the users/roles from the <code>src/main/resources/webapp/realm1.ini</code> file.</td>
-</tr>
-</table>
-</div>
-<div class="paragraph">
-<p>Note that a URL could be provided as the <code>resourcePath</code>, so a centralized config file could be used. Even so, the</p>
-</div>
-<div class="admonitionblock note">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-note" title="Note"></i>
-</td>
-<td class="content">
-<div class="paragraph">
-<p>If configured this way then the <code>[users]</code> and <code>[roles]</code> sections of <code>shiro.ini</code> become unused. Instead, the corresponding sections from for <code>realm1.ini</code> are used instead.</p>
-</div>
-</td>
-</tr>
-</table>
-</div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_ugsec_shiro-isis-ldap-realm">4. Isis Ldap Realm</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>Isis ships with an implementation of <a href="http://shiro.apache.org">Apache Shiro</a>'s <code>Realm</code> class that allows user authentication and authorization to be performed against an LDAP server.</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<img src="images/security/security-apis-impl/configure-shiro-to-use-isis-ldap-realm.PNG" alt="configure shiro to use isis ldap realm" width="600px">
-</div>
-</div>
-<div class="paragraph">
-<p>The LDAP database stores the user/passwords and user groups, while the <code>shiro.ini</code> file is used to map the LDAP groups to roles, and to map the roles to permissions.</p>
-</div>
-<div class="sect2">
-<h3 id="_shiro_configuration_2">4.1. Shiro Configuration</h3>
-<div class="paragraph">
-<p>To use LDAP involves telling Shiro how to instantiate the realm. This bootstrapping info lives in the <code>WEB-INF/shiro.ini</code>:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="ini">contextFactory = org.apache.isis.security.shiro.IsisLdapContextFactory
+* # view/edit access to everything</code></pre>
+ </div>
+ </div>
+ <div class="admonitionblock tip">
+ <table>
+ <tbody>
+ <tr>
+ <td class="icon"> <i class="fa icon-tip" title="Tip"></i> </td>
+ <td class="content">
+ <div class="paragraph">
+ <p>The format of the permissions string is configurable in Shiro, and Apache Isis uses this to provide an extended wildcard format, described <a href="#_ugsec_shiro-isis-enhanced-wildcard-permission">here</a>.</p>
+ </div> </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ </div>
+ </div>
+ <div class="sect2">
+ <h3 id="_externalized_inirealm">3.2. Externalized IniRealm</h3>
+ <div class="paragraph">
+ <p>There\u2019s no requirement for all users/roles to be defined in the <code>shiro.ini</code> file. Instead, a realm can be defined that loads its users/roles from some other resource.</p>
+ </div>
+ <div class="paragraph">
+ <p>For example:</p>
+ </div>
+ <div class="listingblock">
+ <div class="content">
+ <pre class="CodeRay highlight"><code data-lang="ini">$realm1=org.apache.shiro.realm.text.IniRealm <i class="conum" data-value="1"></i><b>(1)</b>
+realm1.resourcePath=classpath:webapp/realm1.ini <i class="conum" data-value="2"></i><b>(2)</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>happens to (coincidentally) be the <a href="http://shiro.apache.org/static/latest/apidocs/org/apache/shiro/realm/text/IniRealm.html">same implementation</a> as Shiro\u2019s built-in $iniRealm</td>
+ </tr>
+ <tr>
+ <td><i class="conum" data-value="2"></i><b>2</b></td>
+ <td>in this case load the users/roles from the <code>src/main/resources/webapp/realm1.ini</code> file.</td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ <div class="paragraph">
+ <p>Note that a URL could be provided as the <code>resourcePath</code>, so a centralized config file could be used. Even so, the</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>If configured this way then the <code>[users]</code> and <code>[roles]</code> sections of <code>shiro.ini</code> become unused. Instead, the corresponding sections from for <code>realm1.ini</code> are used instead.</p>
+ </div> </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="sect1">
+ <h2 id="_ugsec_shiro-isis-ldap-realm">4. Isis Ldap Realm</h2>
+ <button type="button" class="button secondary" onclick="window.location.href="https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/_ugsec_shiro-isis-ldap-realm.adoc"" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i> Edit</button>
+ <div class="sectionbody">
+ <div class="paragraph">
+ <p>Isis ships with an implementation of <a href="http://shiro.apache.org">Apache Shiro</a>'s <code>Realm</code> class that allows user authentication and authorization to be performed against an LDAP server.</p>
+ </div>
+ <div class="imageblock">
+ <div class="content">
+ <img src="images/security/security-apis-impl/configure-shiro-to-use-isis-ldap-realm.PNG" alt="configure shiro to use isis ldap realm" width="600px">
+ </div>
+ </div>
+ <div class="paragraph">
+ <p>The LDAP database stores the user/passwords and user groups, while the <code>shiro.ini</code> file is used to map the LDAP groups to roles, and to map the roles to permissions.</p>
+ </div>
+ <div class="sect2">
+ <h3 id="_shiro_configuration_2">4.1. Shiro Configuration</h3>
+ <div class="paragraph">
+ <p>To use LDAP involves telling Shiro how to instantiate the realm. This bootstrapping info lives in the <code>WEB-INF/shiro.ini</code>:</p>
+ </div>
+ <div class="listingblock">
+ <div class="content">
+ <pre class="CodeRay highlight"><code data-lang="ini">contextFactory = org.apache.isis.security.shiro.IsisLdapContextFactory
contextFactory.url = ldap://localhost:10389
contextFactory.systemUsername = uid=admin,ou=system <i class="conum" data-value="1"></i><b>(1)</b>
contextFactory.systemPassword = secret
@@ -1019,282 +922,283 @@ ldapRealm.permissionsByRole=\ <i class="conum" data
self-install_role = *:ToDoItemsFixturesService:install:* ; \
admin_role = *
-securityManager.realms = $ldapRealm</code></pre>
-</div>
-</div>
-<div class="colist arabic">
-<table>
-<tr>
-<td><i class="conum" data-value="1"></i><b>1</b></td>
-<td>user accounts are searched using a dedicated service account</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="2"></i><b>2</b></td>
-<td>SASL (CRAM-MD5) authentication is used for this authentication</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="3"></i><b>3</b></td>
-<td>Apache Isis' implementation of the LDAP realm.</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="4"></i><b>4</b></td>
-<td>groups are searched under <code>ou=groups,o=mojo</code> (where <code>mojo</code> is the company name)</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="5"></i><b>5</b></td>
-<td>each group has an LDAP objectClass of <code>groupOfUniqueNames</code></td>
-</tr>
-<tr>
-<td><i class="conum" data-value="6"></i><b>6</b></td>
-<td>each group has a vector attribute of <code>uniqueMember</code></td>
-</tr>
-<tr>
-<td><i class="conum" data-value="7"></i><b>7</b></td>
-<td>groups looked up from LDAP can optionally be mapped to logical roles; otherwise groups are used as role names directly</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="8"></i><b>8</b></td>
-<td>roles are mapped in turn to permissions</td>
-</tr>
-</table>
-</div>
-<div class="paragraph">
-<p>The value of <code>uniqueMember</code> is in the form <code>uid=xxx</code>, with <code>xxx</code> being the uid of the user
-* users searched under <code>ou=system</code>
-* users have, at minimum, a <code>uid</code> attribute and a password
-* the users credentials are used to verify their user/password</p>
-</div>
-<div class="paragraph">
-<p>The above configuration has been tested against <a href="http://directory.apache.org/apacheds/">ApacheDS</a>, v1.5.7. This can be administered using <a href="http://directory.apache.org/studio/">Apache Directory Studio</a>, v1.5.3.</p>
-</div>
-<div class="admonitionblock tip">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-tip" title="Tip"></i>
-</td>
-<td class="content">
-<div class="title">Shiro Realm Mappings</div>
-<div class="paragraph">
-<p>When configuring role based permission mapping, there can only be one of these entries per realm:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="ini">realm.groupToRolesMappings = ...</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>and</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="ini">realm.roleToPermissionsMappings = ...</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>This forces you to put everything on one line for each of the above. This is, unfortunately, a Shiro "feature". And if you repeat the entries above then it’s "last one wins".)</p>
-</div>
-<div class="paragraph">
-<p>To make the configuration maintainable, use "\" to separate the mappings onto separate lines in the file. Use this technique for both group to roles mapping and role to permission mapping. If you use the '' after the "," that separates the key:value pairs it is more readable.</p>
-</div>
-</td>
-</tr>
-</table>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_externalizing_role_perms">4.2. Externalizing role perms</h3>
-<div class="paragraph">
-<p>As an alternative to injecting the <code>permissionsByRole</code> property, the role/permission mapping can alternatively be specified by injecting a resource path:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="ini">ldapRealm.resourcePath=classpath:webapp/myroles.ini</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>where <code>myroles.ini</code> is in <code>src/main/resources/webapp</code>, and takes the form:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="ini">[roles]
+securityManager.realms = $ldapRealm</code></pre>
+ </div>
+ </div>
+ <div class="colist arabic">
+ <table>
+ <tbody>
+ <tr>
+ <td><i class="conum" data-value="1"></i><b>1</b></td>
+ <td>user accounts are searched using a dedicated service account</td>
+ </tr>
+ <tr>
+ <td><i class="conum" data-value="2"></i><b>2</b></td>
+ <td>SASL (CRAM-MD5) authentication is used for this authentication</td>
+ </tr>
+ <tr>
+ <td><i class="conum" data-value="3"></i><b>3</b></td>
+ <td>Apache Isis' implementation of the LDAP realm.</td>
+ </tr>
+ <tr>
+ <td><i class="conum" data-value="4"></i><b>4</b></td>
+ <td>groups are searched under <code>ou=groups,o=mojo</code> (where <code>mojo</code> is the company name)</td>
+ </tr>
+ <tr>
+ <td><i class="conum" data-value="5"></i><b>5</b></td>
+ <td>each group has an LDAP objectClass of <code>groupOfUniqueNames</code></td>
+ </tr>
+ <tr>
+ <td><i class="conum" data-value="6"></i><b>6</b></td>
+ <td>each group has a vector attribute of <code>uniqueMember</code></td>
+ </tr>
+ <tr>
+ <td><i class="conum" data-value="7"></i><b>7</b></td>
+ <td>groups looked up from LDAP can optionally be mapped to logical roles; otherwise groups are used as role names directly</td>
+ </tr>
+ <tr>
+ <td><i class="conum" data-value="8"></i><b>8</b></td>
+ <td>roles are mapped in turn to permissions</td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ <div class="paragraph">
+ <p>The value of <code>uniqueMember</code> is in the form <code>uid=xxx</code>, with <code>xxx</code> being the uid of the user * users searched under <code>ou=system</code> * users have, at minimum, a <code>uid</code> attribute and a password * the users credentials are used to verify their user/password</p>
+ </div>
+ <div class="paragraph">
+ <p>The above configuration has been tested against <a href="http://directory.apache.org/apacheds/">ApacheDS</a>, v1.5.7. This can be administered using <a href="http://directory.apache.org/studio/">Apache Directory Studio</a>, v1.5.3.</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="title">
+ Shiro Realm Mappings
+ </div>
+ <div class="paragraph">
+ <p>When configuring role based permission mapping, there can only be one of these entries per realm:</p>
+ </div>
+ <div class="listingblock">
+ <div class="content">
+ <pre class="CodeRay highlight"><code data-lang="ini">realm.groupToRolesMappings = ...</code></pre>
+ </div>
+ </div>
+ <div class="paragraph">
+ <p>and</p>
+ </div>
+ <div class="listingblock">
+ <div class="content">
+ <pre class="CodeRay highlight"><code data-lang="ini">realm.roleToPermissionsMappings = ...</code></pre>
+ </div>
+ </div>
+ <div class="paragraph">
+ <p>This forces you to put everything on one line for each of the above. This is, unfortunately, a Shiro "feature". And if you repeat the entries above then it\u2019s "last one wins".)</p>
+ </div>
+ <div class="paragraph">
+ <p>To make the configuration maintainable, use "\" to separate the mappings onto separate lines in the file. Use this technique for both group to roles mapping and role to permission mapping. If you use the '' after the "," that separates the key:value pairs it is more readable.</p>
+ </div> </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ </div>
+ <div class="sect2">
+ <h3 id="_externalizing_role_perms">4.2. Externalizing role perms</h3>
+ <div class="paragraph">
+ <p>As an alternative to injecting the <code>permissionsByRole</code> property, the role/permission mapping can alternatively be specified by injecting a resource path:</p>
+ </div>
+ <div class="listingblock">
+ <div class="content">
+ <pre class="CodeRay highlight"><code data-lang="ini">ldapRealm.resourcePath=classpath:webapp/myroles.ini</code></pre>
+ </div>
+ </div>
+ <div class="paragraph">
+ <p>where <code>myroles.ini</code> is in <code>src/main/resources/webapp</code>, and takes the form:</p>
+ </div>
+ <div class="listingblock">
+ <div class="content">
+ <pre class="CodeRay highlight"><code data-lang="ini">[roles]
user_role = *:ToDoItemsJdo:*:*,\
*:ToDoItem:*:*
self-install_role = *:ToDoItemsFixturesService:install:*
-admin_role = *</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>This separation of the role/mapping can be useful if Shiro is configured to support multiple realms (eg an LdapRealm based one and also an TextRealm)</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_active_ds_ldap_tutorial">4.3. Active DS LDAP tutorial</h3>
-<div class="paragraph">
-<p>The screenshots below show how to setup LDAP accounts in ApacheDS using the Apache Directory Studio.</p>
-</div>
-<div class="paragraph">
-<p>The setup here was initially based on <a href="http://krams915.blogspot.co.uk/2011/01/ldap-apache-directory-studio-basic.html">this tutorial</a>, however we have moved the user accounts so that they are defined in a separate LDAP node.</p>
-</div>
-<div class="paragraph">
-<p>To start, create a partition in order to hold the mojo node (holding the groups):</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<img src="images//configuration/configuring-shiro/ldap/activeds-ldap-mojo-partition.png" alt="ActiveDS LDAP Users">
-</div>
-</div>
-<div class="paragraph">
-<p>Create the <code>ou=groups,o=mojo</code> hierarchy:</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<img src="images//configuration/configuring-shiro/ldap/activeds-ldap-mojo-root-dse.png" alt="ActiveDS LDAP Users">
-</div>
-</div>
-<div class="paragraph">
-<p>Configure SASL authentication. This means that the checking of user/password is done implicitly by virtue of Apache Isis connecting to LDAP using these credentials:</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<img src="images//configuration/configuring-shiro/ldap/activeds-ldap-sasl-authentication.png" alt="ActiveDS LDAP Users">
-</div>
-</div>
-<div class="paragraph">
-<p>In order for SASL to work, it seems to be necessary to put users under <code>o=system</code>. (This is why the setup is slightly different than the tutorial mentioned above):</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<img src="images//configuration/configuring-shiro/ldap/activeds-ldap-users.png" alt="ActiveDS LDAP Users">
-</div>
-</div>
-<div class="paragraph">
-<p>Configure the users into the groups:</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<img src="images//configuration/configuring-shiro/ldap/activeds-ldap-groups.png" alt="ActiveDS LDAP Users">
-</div>
-</div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_ugsec_shiro-isisaddons-security-module-realm">5. Security Module Realm</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>The <a href="https://github.com/isisaddons/isis-module-security">Isis Addons' security module</a> (not ASF) provides a complete
-security subdomain for users, roles, permissions; all are persisted as domain entities.</p>
-</div>
-<div class="paragraph">
-<p>What that means, of course, that they can also be administered through your Isis application. Moreover, the set of permissions (to features) is derived completely from your application’s metamodel; in essence the permissions are "type-safe".</p>
-</div>
-<div class="paragraph">
-<p>In order to play along, the module includes a Shiro realm, which fits in as follows:</p>
-</div>
-<div class="paragraph">
-<p>The general configuration is as follows:</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<img src="images/security/security-apis-impl/configure-shiro-to-use-isisaddons-security-module-realm.PNG" alt="configure shiro to use isisaddons security module realm" width="600px">
-</div>
-</div>
-<div class="paragraph">
-<p>where the <code>IsisModuleSecurityRealm</code> realm is the implementation provided by the module.</p>
-</div>
-<div class="paragraph">
-<p>In the configuration above user passwords are stored in the database. The module uses <a href="http://www.mindrot.org/projects/jBCrypt/">jBCrypt</a> so that passwords are only stored in a (one-way) encrypted form in the database.</p>
-</div>
-<div class="paragraph">
-<p>The security module also supports a slightly more sophisticated configuration. Most organizations use LDAP for user credentials, and maintaining two separate user accounts would be less than ideal. The <code>IsisModuleSecurityRealm</code> can therefore be configured with a subsidiary "delegate" realm that is responsible for performing the primary authentication of the user; if that passes then a user is created (as a domain entity) automatically.
-In most cases this delegate realm will be the LDAP realm, and so the architecture becomes:</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<img src="images/security/security-apis-impl/configure-shiro-to-use-isisaddons-security-module-realm-with-delegate-realm.PNG" alt="configure shiro to use isisaddons security module realm with delegate realm" width="600px">
-</div>
-</div>
-<div class="paragraph">
-<p>The security module has many more features than are described here, all of which are described in the module’s <a href="https://github.com/isisaddons/isis-module-security">README</a>. The README also explains in detail how to configure an existing app to use this module.</p>
-</div>
-<div class="paragraph">
-<p>You can also look at the Isisaddons <a href="https://github.com/isisaddons/isis-app-todoapp">todoapp example</a> (not ASF), which is preconfigured to use the security module.</p>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_ugsec_shiro-jdbc-realm">6. Shiro JDBC Realm</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>There is nothing to stop you from using some other <code>Realm</code> implementation (or indeed writing one yourself). For example, you could use Shiro’s own JDBC realm that loads user/password details from a database.</p>
-</div>
-<div class="admonitionblock warning">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-warning" title="Warning"></i>
-</td>
-<td class="content">
-<div class="paragraph">
-<p>If you are happy to use a database then we strongly recommend you use the <a href="http://github.com/isisaddons/isis-module-security">Isis addons' security</a> module instead of a vanilla JDBC; it is far more sophisticated and moreover gives you the ability to administer the system from within your Isis application.</p>
-</div>
-</td>
-</tr>
-</table>
-</div>
-<div class="paragraph">
-<p>If you go down this route, then the architecture is as follows:</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<img src="images/security/security-apis-impl/configure-shiro-to-use-custom-jdbc-realm.png" alt="configure shiro to use custom jdbc realm" width="600px">
-</div>
-</div>
-<div class="paragraph">
-<p>There’s quite a lot of configuration required (in <code>WEB-INF/shiro.ini</code>) to set up a JDBC realm, so we’ll break it out into sections.</p>
-</div>
-<div class="paragraph">
-<p>First, we need to set up the connection to JDBC:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="ini">jdbcRealm=org.apache.shiro.realm.jdbc.JdbcRealm <i class="conum" data-value="1"></i><b>(1)</b>
+admin_role = *</code></pre>
+ </div>
+ </div>
+ <div class="paragraph">
+ <p>This separation of the role/mapping can be useful if Shiro is configured to support multiple realms (eg an LdapRealm based one and also an TextRealm)</p>
+ </div>
+ </div>
+ <div class="sect2">
+ <h3 id="_active_ds_ldap_tutorial">4.3. Active DS LDAP tutorial</h3>
+ <div class="paragraph">
+ <p>The screenshots below show how to setup LDAP accounts in ApacheDS using the Apache Directory Studio.</p>
+ </div>
+ <div class="paragraph">
+ <p>The setup here was initially based on <a href="http://krams915.blogspot.co.uk/2011/01/ldap-apache-directory-studio-basic.html">this tutorial</a>, however we have moved the user accounts so that they are defined in a separate LDAP node.</p>
+ </div>
+ <div class="paragraph">
+ <p>To start, create a partition in order to hold the mojo node (holding the groups):</p>
+ </div>
+ <div class="imageblock">
+ <div class="content">
+ <img src="images//configuration/configuring-shiro/ldap/activeds-ldap-mojo-partition.png" alt="ActiveDS LDAP Users">
+ </div>
+ </div>
+ <div class="paragraph">
+ <p>Create the <code>ou=groups,o=mojo</code> hierarchy:</p>
+ </div>
+ <div class="imageblock">
+ <div class="content">
+ <img src="images//configuration/configuring-shiro/ldap/activeds-ldap-mojo-root-dse.png" alt="ActiveDS LDAP Users">
+ </div>
+ </div>
+ <div class="paragraph">
+ <p>Configure SASL authentication. This means that the checking of user/password is done implicitly by virtue of Apache Isis connecting to LDAP using these credentials:</p>
+ </div>
+ <div class="imageblock">
+ <div class="content">
+ <img src="images//configuration/configuring-shiro/ldap/activeds-ldap-sasl-authentication.png" alt="ActiveDS LDAP Users">
+ </div>
+ </div>
+ <div class="paragraph">
+ <p>In order for SASL to work, it seems to be necessary to put users under <code>o=system</code>. (This is why the setup is slightly different than the tutorial mentioned above):</p>
+ </div>
+ <div class="imageblock">
+ <div class="content">
+ <img src="images//configuration/configuring-shiro/ldap/activeds-ldap-users.png" alt="ActiveDS LDAP Users">
+ </div>
+ </div>
+ <div class="paragraph">
+ <p>Configure the users into the groups:</p>
+ </div>
+ <div class="imageblock">
+ <div class="content">
+ <img src="images//configuration/configuring-shiro/ldap/activeds-ldap-groups.png" alt="ActiveDS LDAP Users">
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="sect1">
+ <h2 id="_ugsec_shiro-isisaddons-security-module-realm">5. Security Module Realm</h2>
+ <button type="button" class="button secondary" onclick="window.location.href="https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/_ugsec_shiro-isisaddons-security-module-realm.adoc"" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i> Edit</button>
+ <div class="sectionbody">
+ <div class="paragraph">
+ <p>The <a href="https://github.com/isisaddons/isis-module-security">Isis Addons' security module</a> (not ASF) provides a complete security subdomain for users, roles, permissions; all are persisted as domain entities.</p>
+ </div>
+ <div class="paragraph">
+ <p>What that means, of course, that they can also be administered through your Isis application. Moreover, the set of permissions (to features) is derived completely from your application\u2019s metamodel; in essence the permissions are "type-safe".</p>
+ </div>
+ <div class="paragraph">
+ <p>In order to play along, the module includes a Shiro realm, which fits in as follows:</p>
+ </div>
+ <div class="paragraph">
+ <p>The general configuration is as follows:</p>
+ </div>
+ <div class="imageblock">
+ <div class="content">
+ <img src="images/security/security-apis-impl/configure-shiro-to-use-isisaddons-security-module-realm.PNG" alt="configure shiro to use isisaddons security module realm" width="600px">
+ </div>
+ </div>
+ <div class="paragraph">
+ <p>where the <code>IsisModuleSecurityRealm</code> realm is the implementation provided by the module.</p>
+ </div>
+ <div class="paragraph">
+ <p>In the configuration above user passwords are stored in the database. The module uses <a href="http://www.mindrot.org/projects/jBCrypt/">jBCrypt</a> so that passwords are only stored in a (one-way) encrypted form in the database.</p>
+ </div>
+ <div class="paragraph">
+ <p>The security module also supports a slightly more sophisticated configuration. Most organizations use LDAP for user credentials, and maintaining two separate user accounts would be less than ideal. The <code>IsisModuleSecurityRealm</code> can therefore be configured with a subsidiary "delegate" realm that is responsible for performing the primary authentication of the user; if that passes then a user is created (as a domain entity) automatically. In most cases this delegate realm will be the LDAP realm, and so the architecture becomes:</p>
+ </div>
+ <div class="imageblock">
+ <div class="content">
+ <img src="images/security/security-apis-impl/configure-shiro-to-use-isisaddons-security-module-realm-with-delegate-realm.PNG" alt="configure shiro to use isisaddons security module realm with delegate realm" width="600px">
+ </div>
+ </div>
+ <div class="paragraph">
+ <p>The security module has many more features than are described here, all of which are described in the module\u2019s <a href="https://github.com/isisaddons/isis-module-security">README</a>. The README also explains in detail how to configure an existing app to use this module.</p>
+ </div>
+ <div class="paragraph">
+ <p>You can also look at the Isisaddons <a href="https://github.com/isisaddons/isis-app-todoapp">todoapp example</a> (not ASF), which is preconfigured to use the security module.</p>
+ </div>
+ </div>
+ </div>
+ <div class="sect1">
+ <h2 id="_ugsec_shiro-jdbc-realm">6. Shiro JDBC Realm</h2>
+ <button type="button" class="button secondary" onclick="window.location.href="https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/_ugsec_shiro-jdbc-realm.adoc"" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i> Edit</button>
+ <div class="sectionbody">
+ <div class="paragraph">
+ <p>There is nothing to stop you from using some other <code>Realm</code> implementation (or indeed writing one yourself). For example, you could use Shiro\u2019s own JDBC realm that loads user/password details from a database.</p>
+ </div>
+ <div class="admonitionblock warning">
+ <table>
+ <tbody>
+ <tr>
+ <td class="icon"> <i class="fa icon-warning" title="Warning"></i> </td>
+ <td class="content">
+ <div class="paragraph">
+ <p>If you are happy to use a database then we strongly recommend you use the <a href="http://github.com/isisaddons/isis-module-security">Isis addons' security</a> module instead of a vanilla JDBC; it is far more sophisticated and moreover gives you the ability to administer the system from within your Isis application.</p>
+ </div> </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ <div class="paragraph">
+ <p>If you go down this route, then the architecture is as follows:</p>
+ </div>
+ <div class="imageblock">
+ <div class="content">
+ <img src="images/security/security-apis-impl/configure-shiro-to-use-custom-jdbc-realm.png" alt="configure shiro to use custom jdbc realm" width="600px">
+ </div>
+ </div>
+ <div class="paragraph">
+ <p>There\u2019s quite a lot of configuration required (in <code>WEB-INF/shiro.ini</code>) to set up a JDBC realm, so we\u2019ll break it out into sections.</p>
+ </div>
+ <div class="paragraph">
+ <p>First, we need to set up the connection to JDBC:</p>
+ </div>
+ <div class="listingblock">
+ <div class="content">
+ <pre class="CodeRay highlight"><code data-lang="ini">jdbcRealm=org.apache.shiro.realm.jdbc.JdbcRealm <i class="conum" data-value="1"></i><b>(1)</b>
jof = org.apache.shiro.jndi.JndiObjectFactory <i class="conum" data-value="2"></i><b>(2)</b>
jof.resourceName = jdbc/postgres <i class="conum" data-value="3"></i><b>(3)</b>
jof.requiredType = javax.sql.DataSource
jof.resourceRef = true
-jdbcRealm.dataSource = $jof <i class="conum" data-value="4"></i><b>(4)</b></code></pre>
-</div>
-</div>
-<div class="colist arabic">
-<table>
-<tr>
-<td><i class="conum" data-value="1"></i><b>1</b></td>
-<td>instantiate the JDBC realm</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="2"></i><b>2</b></td>
-<td>instantiate factory object to lookup DataSource from servlet container</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="3"></i><b>3</b></td>
-<td>name of the datasource (as configured in <code>web.xml</code>)</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="4"></i><b>4</b></td>
-<td>instruct JDBC realm to obtain datasource from the JNDI</td>
-</tr>
-</table>
-</div>
-<div class="paragraph">
-<p>We next need to tell the realm how to query the database. Shiro supports any schema; what matters is the input search argument and the output results.</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="ini">jdbcRealm.authenticationQuery = \ <i class="conum" data-value="1"></i><b>(1)</b>
+jdbcRealm.dataSource = $jof <i class="conum" data-value="4"></i><b>(4)</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>instantiate the JDBC realm</td>
+ </tr>
+ <tr>
+ <td><i class="conum" data-value="2"></i><b>2</b></td>
+ <td>instantiate factory object to lookup DataSource from servlet container</td>
+ </tr>
+ <tr>
+ <td><i class="conum" data-value="3"></i><b>3</b></td>
+ <td>name of the datasource (as configured in <code>web.xml</code>)</td>
+ </tr>
+ <tr>
+ <td><i class="conum" data-value="4"></i><b>4</b></td>
+ <td>instruct JDBC realm to obtain datasource from the JNDI</td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ <div class="paragraph">
+ <p>We next need to tell the realm how to query the database. Shiro supports any schema; what matters is the input search argument and the output results.</p>
+ </div>
+ <div class="listingblock">
+ <div class="content">
+ <pre class="CodeRay highlight"><code data-lang="ini">jdbcRealm.authenticationQuery = \ <i class="conum" data-value="1"></i><b>(1)</b>
select password \
from users \
where username = ?
@@ -1319,408 +1223,385 @@ jdbcRealm.permissionsQuery= \ <i class="conum" data-va
from roles \
where label = ?);
-jdbcRealm.permissionsLookupEnabled=true <i class="conum" data-value="4"></i><b>(4)</b></code></pre>
-</div>
-</div>
-<div class="colist arabic">
-<table>
-<tr>
-<td><i class="conum" data-value="1"></i><b>1</b></td>
-<td>query to find password for user</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="2"></i><b>2</b></td>
-<td>query to find roles for user</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="3"></i><b>3</b></td>
-<td>query to find permissions for role</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="4"></i><b>4</b></td>
-<td>enable permissions lookup</td>
-</tr>
-</table>
-</div>
-<div class="admonitionblock warning">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-warning" title="Warning"></i>
-</td>
-<td class="content">
-<div class="paragraph">
-<p>The <code>permissionsLookupEnabled</code> is very important, otherwise Shiro just returns an empty list of permissions and your users will have no access to any features(!).</p>
-</div>
-</td>
-</tr>
-</table>
-</div>
-<div class="paragraph">
-<p>We also should ensure that the passwords are not stored as plain-text:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="ini">dps = org.apache.shiro.authc.credential.DefaultPasswordService <i class="conum" data-value="1"></i><b>(1)</b>
+jdbcRealm.permissionsLookupEnabled=true <i class="conum" data-value="4"></i><b>(4)</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>query to find password for user</td>
+ </tr>
+ <tr>
+ <td><i class="conum" data-value="2"></i><b>2</b></td>
+ <td>query to find roles for user</td>
+ </tr>
+ <tr>
+ <td><i class="conum" data-value="3"></i><b>3</b></td>
+ <td>query to find permissions for role</td>
+ </tr>
+ <tr>
+ <td><i class="conum" data-value="4"></i><b>4</b></td>
+ <td>enable permissions lookup</td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ <div class="admonitionblock warning">
+ <table>
+ <tbody>
+ <tr>
+ <td class="icon"> <i class="fa icon-warning" title="Warning"></i> </td>
+ <td class="content">
+ <div class="paragraph">
+ <p>The <code>permissionsLookupEnabled</code> is very important, otherwise Shiro just returns an empty list of permissions and your users will have no access to any features(!).</p>
+ </div> </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ <div class="paragraph">
+ <p>We also should ensure that the passwords are not stored as plain-text:</p>
+ </div>
+ <div class="listingblock">
+ <div class="content">
+ <pre class="CodeRay highlight"><code data-lang="ini">dps = org.apache.shiro.authc.credential.DefaultPasswordService <i class="conum" data-value="1"></i><b>(1)</b>
pm = org.apache.shiro.authc.credential.PasswordMatcher <i class="conum" data-value="2"></i><b>(2)</b>
pm.passwordService = $dps
-jdbcRealm.credentialsMatcher = $pm <i class="conum" data-value="3"></i><b>(3)</b></code></pre>
-</div>
-</div>
-<div class="colist arabic">
-<table>
-<tr>
-<td><i class="conum" data-value="1"></i><b>1</b></td>
-<td>mechanism to encrypts password</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="2"></i><b>2</b></td>
-<td>service to match passwords</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="3"></i><b>3</b></td>
-<td>instruct JDBC realm to use password matching service when authenticating</td>
-</tr>
-</table>
-</div>
-<div class="paragraph">
-<p>And finally we need to tell Shiro to use the realm, in the usual fashion:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="ini">securityManager.realms = $jdbcRealm</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>Using the above configuration you will also need to setup a <code>DataSource</code>. The details vary by servlet container, for example this is <a href="https://tomcat.apache.org/tomcat-8.0-doc/jndi-datasource-examples-howto.html">how to do the setup on Tomcat 8.0</a>.</p>
-</div>
-<div class="admonitionblock warning">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-warning" title="Warning"></i>
-</td>
-<td class="content">
-<div class="paragraph">
-<p>The name of the <code>DataSource</code> can also vary by servlet container; see for example <a href="http://stackoverflow.com/questions/17441019/how-to-configure-jdbcrealm-to-obtain-its-datasource-from-jndi/23784702#23784702">this StackOverflow answer</a>.</p>
-</div>
-</td>
-</tr>
-</tab
<TRUNCATED>
[42/44] isis-site git commit: ISIS-1594: provide an 'edit' button
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/83a3755a/content/downloads.html
----------------------------------------------------------------------
diff --git a/content/downloads.html b/content/downloads.html
index f27eb66..43c5017 100644
--- a/content/downloads.html
+++ b/content/downloads.html
@@ -1,12 +1,10 @@
<!doctype html>
<html class="no-js" lang="en">
-<head>
- <meta charset="utf-8"/>
- <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-
- <title>Downloads</title>
-
- <!--
+ <head>
+ <meta charset="utf-8">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+ <title>Downloads</title>
+ <!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
@@ -23,31 +21,21 @@
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
- -->
-
- <!-- No caching headers -->
- <meta http-equiv="cache-control" content="no-cache" />
- <meta http-equiv="pragma" content="no-cache" />
- <meta http-equiv="expires" content="-1" />
-
-
- <!-- TODO: need to (re)instate CDN in the future (not using for now just so can develop off-line -->
- <link href="./css/foundation/5.5.1/foundation.css" rel="stylesheet" />
- <script src="./js/foundation/5.5.1/vendor/modernizr.js"></script>
- <link href="./css/asciidoctor/colony.css" rel="stylesheet">
- <link href="./css/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet">
-
-
-
-
- <link href="./css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.css" rel="stylesheet" />
- <!--[if lt IE 9]>
+ -->
+ <!-- No caching headers -->
+ <meta http-equiv="cache-control" content="no-cache">
+ <meta http-equiv="pragma" content="no-cache">
+ <meta http-equiv="expires" content="-1">
+ <!-- TODO: need to (re)instate CDN in the future (not using for now just so can develop off-line -->
+ <link href="./css/foundation/5.5.1/foundation.css" rel="stylesheet">
+ <script src="./js/foundation/5.5.1/vendor/modernizr.js"></script>
+ <link href="./css/asciidoctor/colony.css" rel="stylesheet">
+ <link href="./css/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet">
+ <link href="./css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.css" rel="stylesheet">
+ <!--[if lt IE 9]>
<link href="./css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.ie.css" rel="stylesheet" />
- <![endif]-->
-
-
-
- <style type="text/css">
+ <![endif]-->
+ <style type="text/css">
pre code {
background-color: inherit;
border-style: none;
@@ -192,9 +180,8 @@ table.CodeRay td.code>pre{padding:0}
color:#fff;
font-size: 1.1em;
}
- </style>
-
- <style>
+ </style>
+ <style>
@media only screen and (min-width: 40.063em) {
.top-bar {
.contain-to-grid .top-bar {
@@ -205,9 +192,8 @@ table.CodeRay td.code>pre{padding:0}
.row {
max-width: 80rem;
}
- </style>
-
- <style>
+ </style>
+ <style>
.extended-quote,
.extended-quote-first {
margin-left: 40px;
@@ -231,9 +217,8 @@ table.CodeRay td.code>pre{padding:0}
text-shadow: 0 1px 2px rgba(0, 0, 0, 0.1);
}
- </style>
-
- <style>
+ </style>
+ <style>
body {
position: relative;
}
@@ -255,6 +240,7 @@ table.CodeRay td.code>pre{padding:0}
div#doc-content {
margin-top: 30px;
+ padding-top: 30px;
}
div.documentation-page table.frame-all {
@@ -286,9 +272,8 @@ table.CodeRay td.code>pre{padding:0}
min-height: 2000px;
}
- </style>
-
- <style>
+ </style>
+ <style>
@media only screen and (min-width: 768px) {
#toc.toc2 ul ul { margin-left: -10px; }
@@ -316,15 +301,13 @@ table.CodeRay td.code>pre{padding:0}
body div#toc2 li.tocify-item.active a {
color: red;
}
- </style>
-
- <style>
+ </style>
+ <style>
footer {
margin-top: 1000px;
}
- </style>
-
- <style>
+ </style>
+ <style>
/* overriding colony.css stylesheet */
.literalblock pre, .literalblock pre[class], .listingblock pre, .listingblock pre[class] {
/*padding: 1.25em 1.5625em 1.125em 1.5625em;*/
@@ -372,9 +355,8 @@ table.CodeRay td.code>pre{padding:0}
.imageblock img {
margin-bottom: 10px;
}
- </style>
-
- <style>
+ </style>
+ <style>
/* from http://ben.balter.com/2014/03/13/pages-anchor-links/ */
.header-link {
position: absolute;
@@ -395,9 +377,8 @@ table.CodeRay td.code>pre{padding:0}
h6:hover .header-link {
opacity: 1;
}
- </style>
-
- <style>
+ </style>
+ <style>
.top-bar
{
-webkit-transition-duration: .5s;
@@ -425,274 +406,234 @@ table.CodeRay td.code>pre{padding:0}
-webkit-transition-property: -webkit-transform;
transition-property: transform;
}
- </style>
-
- <style>
+ </style>
+ <style>
#doc-content a.guide {
color: white;
}
- </style>
-
- <style>
+ </style>
+ <style>
+ .tocify {
+ margin-top: 80px;
+ }
+ </style>
+ <style>
.tocify {
margin-top: 80px;
}
- </style>
-
-
-</script>
-
-</head>
-<body>
-
-<<div class="github-fork-ribbon-wrapper right" style="position: fixed;">
- <div class="github-fork-ribbon">
- <a href="https://github.com/apache/isis#fork-destination-box">Fork me on GitHub</a>
- </div>
-</div>
-
-
-<div class="row">
-
- <div class="fixed contain-to-grid header">
- <nav class="top-bar" data-topbar role="navigation" style="max-width: 80rem">
- <ul class="title-area">
- <li class="name">
- <h1>
- <a href="/index.html">Apache Isis™</a>
- </h1>
- </li>
- <!-- Remove the class "menu-icon" to get rid of menu icon. Take out "Menu" to just have icon alone -->
- <li class="toggle-topbar menu-icon"><a href="#"><span>Menu</span></a></li>
- </ul>
-
- <section class="top-bar-section">
- <ul class="right">
-
- <li class="has-form">
- <FORM class="searchbox navbar-form navbar-right" id="searchbox_012614087480249044419:dn-q5gtwxya" action="http://www.google.com/cse">
- <div class="row collapse">
- <input type="hidden" name="cx" value="012614087480249044419:dn-q5gtwxya">
- <INPUT type="hidden" name="cof" value="FORID:0">
- <INPUT class="form-control" name="q" type="text" placeholder="Search">
- </div>
- </FORM>
- </li>
-
- </ul>
-
- <!-- Left Nav Section -->
- <ul class="left">
-
- <li><a href="/documentation.html">Documentation</a></li>
- <li><a href="/downloads.html">Downloads</a></li>
- <li><a href="/help.html">Help</a></li>
- <li><a href="/asf.html">@ASF</a></li>
-
- </ul>
-
- </section>
- </nav>
- </div>
-</div>
-
-<div class="row">
-
- <div id="doc-content-left" class="large-9 medium-9 columns">
-
-
- <div id="doc-content">
- <div id="preamble">
-<div class="sectionbody">
-<div class="paragraph">
-<p><br/><br/><br/></p>
-</div>
-<div class="paragraph">
-<p>Apache Isis™ software is a framework for rapidly developing domain-driven apps in Java. Write your business logic in entities, domain services and repositories, and the framework dynamically generates a representation of that domain model as a webapp or RESTful API. Use for prototyping or production.</p>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_getting_started">Getting Started</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>If you just want to get going quickly, we suggest using our Maven archetype. For more information, see <a href="guides/ugfun.html#_ugfun_getting-started_simpleapp-archetype">SimpleApp archetype</a>[here].</p>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_formal_releases">Formal Releases</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>If you want to build Apache Isis from formally released source tarballs, you can download from here:</p>
-</div>
-<div class="paragraph">
-<p>Core:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="https://www.apache.org/dyn/closer.cgi/isis/isis-core/isis-1.13.2-source-release.zip">isis-1.13.2</a> (<a href="http://www.apache.org/dist/isis/isis-core/isis-1.13.2-source-release.zip.asc">asc</a>, <a href="http://www.apache.org/dist/isis/isis-core/isis-1.13.2-source-release.zip.md5">md5</a>)</p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>Archetypes:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="https://www.apache.org/dyn/closer.cgi/isis/archetype/simpleapp-archetype/simpleapp-archetype-1.13.2.1-source-release.zip">simpleapp-archetype-1.13.2.1</a> (<a href="http://www.apache.org/dist/isis/archetype/simpleapp-archetype/simpleapp-archetype-1.13.2.1-source-release.zip.asc">asc</a>, <a href="http://www.apache.org/dist/isis/archetype/simpleapp-archetype/simpleapp-archetype-1.13.2.1-source-release.zip.md5">md5</a>)</p>
-</li>
-</ul>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_verifying_releases">Verifying Releases</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>It is essential that you verify the integrity of any downloaded files using the PGP or MD5 signatures. For more information on signing artifacts and why we do it, check out the <a href="http://www.apache.org/dev/release-signing.html">Release Signing FAQ</a>.</p>
-</div>
-<div class="paragraph">
-<p>The PGP signatures can be verified using PGP or GPG. First download the <a href="http://www.apache.org/dist/isis/KEYS">KEYS</a> as well as the asc signature file for the artifact. Make sure you get these files from the <a href="http://www.apache.org/dist/isis/">main distribution directory</a>, rather than from a mirror.</p>
-</div>
-<div class="paragraph">
-<p>Then verify the signatures using a command such as:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="bash">pgpk -a KEYS
-pgpv isis-1.13.2-source-release.zip.asc</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>or</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="bash">pgp -ka KEYS
-pgp isis-1.13.2-source-release.zip.asc</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>or</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="bash">gpg \u2013import KEYS
-gpg \u2013verify isis-1.13.2-source-release.zip.asc</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>Alternatively, you can verify the MD5 signature on the files. A Unix/Linux program called <code>md5</code> or <code>md5sum</code> is included in most distributions. It is also available as part of <a href="http://www.gnu.org/software/textutils/textutils.html">GNU Textutils</a>. Windows users can get binary md5 programs from these (and likely other) places:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="http://www.md5summer.org/">http://www.md5summer.org/</a></p>
-</li>
-<li>
-<p><a href="http://www.fourmilab.ch/md5/">http://www.fourmilab.ch/md5/</a></p>
-</li>
-<li>
-<p><a href="http://www.pc-tools.net/win32/md5sums/">http://www.pc-tools.net/win32/md5sums/</a></p>
-</li>
-</ul>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_downloads_source_code">Source Code</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>You can also download the Apache Isis source code using:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="bash">git clone git://git.apache.org/isis.git</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>or</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="bash">git clone http://git.apache.org/isis.git</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>The code is also mirrored on <a href="http://github.com/apache/isis">github</a>, where you can browse it or fork it. And if you’re interested in contributing back to Apache Isis, see <a href="contributors/contributing.html">here</a>.</p>
-</div>
-<div class="sect2">
-<h3 id="_committers">Committers</h3>
-<div class="paragraph">
-<p>Committers should use the read/write repo:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="bash">https://git-wip-us.apache.org/repos/asf/isis.git</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>You can browse the repo <a href="https://git-wip-us.apache.org/repos/asf/isis/repo?p=isis.git;a=summary">here</a>.</p>
-</div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_isis_add_ons">Isis add-ons</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>There are also a number of (open source, but not ASF) supporting modules and extensions for you to use; see <a href="http://www.isisaddons.org/">Isis Add-ons</a>.</p>
-</div>
-</div>
-</div>
- </div>
-
- <footer>
- <hr>
- <p class="small">
- Copyright © 2010~2016 The Apache Software Foundation, licensed under the Apache License, v2.0.
- <br/>
- Apache, the Apache feather logo, Apache Isis, and the Apache Isis project logo are all trademarks of The Apache Software Foundation.
- </p>
- </footer>
-
- </div>
-
- <div id="doc-content-right" class="large-3 medium-3 xcolumns">
- <div id="toc" class="toc2">
- <div class="fallback-toc">
- <ul class="sectlevel1">
-<li><a href="#_getting_started">Getting Started</a></li>
-<li><a href="#_formal_releases">Formal Releases</a></li>
-<li><a href="#_verifying_releases">Verifying Releases</a></li>
-<li><a href="#_downloads_source_code">Source Code</a>
-<ul class="sectlevel2">
-<li><a href="#_committers">Committers</a></li>
-</ul>
-</li>
-<li><a href="#_isis_add_ons">Isis add-ons</a></li>
-</ul>
- </div>
- </div>
- </div>
-
-</div>
-
-
-<script src="./js/foundation/5.5.1/vendor/jquery.js"></script>
-<script src="./js/foundation/5.5.1/foundation.min.js"></script>
-
-
-<link href="./css/jquery.tocify/1.9.0/jquery.tocify.css" rel="stylesheet">
-<script src="./js/jqueryui/1.11.4/jquery-ui.min.js"></script>
-<script src="./js/jquery.tocify/1.9.0/jquery.tocify.js"></script>
-
-
-
-<script type="text/javascript">
+ </style>
+ </head>
+ <body>
+ <div class="row">
+ <div class="fixed contain-to-grid header">
+ <nav class="top-bar" data-topbar role="navigation" style="max-width: 80rem">
+ <ul class="title-area">
+ <li class="name"> <h1> <a href="/index.html">Apache Isis\u2122</a> </h1> </li>
+ <!-- Remove the class "menu-icon" to get rid of menu icon. Take out "Menu" to just have icon alone -->
+ <li class="toggle-topbar menu-icon"><a href="#"><span>Menu</span></a></li>
+ </ul>
+ <section class="top-bar-section">
+ <ul class="right">
+ <li class="has-form">
+ <form class="searchbox navbar-form navbar-right" id="searchbox_012614087480249044419:dn-q5gtwxya" action="http://www.google.com/cse">
+ <div class="row collapse">
+ <input type="hidden" name="cx" value="012614087480249044419:dn-q5gtwxya">
+ <input type="hidden" name="cof" value="FORID:0">
+ <input class="form-control" name="q" type="text" placeholder="Search">
+ </div>
+ </form> </li>
+ </ul>
+ <!-- Left Nav Section -->
+ <ul class="left">
+ <li><a href="/documentation.html">Documentation</a></li>
+ <li><a href="/downloads.html">Downloads</a></li>
+ <li><a href="/help.html">Help</a></li>
+ <li><a href="/asf.html">@ASF</a></li>
+ </ul>
+ </section>
+ </nav>
+ </div>
+ </div>
+ <div class="row">
+ <div id="doc-content-left" class="large-9 medium-9 columns">
+ <div id="doc-content">
+ <button type="button" class="button secondary" onclick="window.location.href="https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/downloads.adoc"" style="float: right; font-size: small; padding: 6px; "><i class="fa fa-pencil-square-o"></i> Edit</button>
+ <div id="preamble">
+ <div class="sectionbody">
+ <div class="paragraph">
+ <p>Apache Isis\u2122 software is a framework for rapidly developing domain-driven apps in Java. Write your business logic in entities, domain services and repositories, and the framework dynamically generates a representation of that domain model as a webapp or RESTful API. Use for prototyping or production.</p>
+ </div>
+ </div>
+ </div>
+ <div class="sect1">
+ <h2 id="_getting_started">Getting Started</h2>
+ <button type="button" class="button secondary" onclick="window.location.href="https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/_getting_started.adoc"" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i> Edit</button>
+ <div class="sectionbody">
+ <div class="paragraph">
+ <p>If you just want to get going quickly, we suggest using our Maven archetype. For more information, see <a href="guides/ugfun.html#_ugfun_getting-started_simpleapp-archetype">SimpleApp archetype</a>[here].</p>
+ </div>
+ </div>
+ </div>
+ <div class="sect1">
+ <h2 id="_formal_releases">Formal Releases</h2>
+ <button type="button" class="button secondary" onclick="window.location.href="https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/_formal_releases.adoc"" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i> Edit</button>
+ <div class="sectionbody">
+ <div class="paragraph">
+ <p>If you want to build Apache Isis from formally released source tarballs, you can download from here:</p>
+ </div>
+ <div class="paragraph">
+ <p>Core:</p>
+ </div>
+ <div class="ulist">
+ <ul>
+ <li> <p><a href="https://www.apache.org/dyn/closer.cgi/isis/isis-core/isis-1.13.2-source-release.zip">isis-1.13.2</a> (<a href="http://www.apache.org/dist/isis/isis-core/isis-1.13.2-source-release.zip.asc">asc</a>, <a href="http://www.apache.org/dist/isis/isis-core/isis-1.13.2-source-release.zip.md5">md5</a>)</p> </li>
+ </ul>
+ </div>
+ <div class="paragraph">
+ <p>Archetypes:</p>
+ </div>
+ <div class="ulist">
+ <ul>
+ <li> <p><a href="https://www.apache.org/dyn/closer.cgi/isis/archetype/simpleapp-archetype/simpleapp-archetype-1.13.2.1-source-release.zip">simpleapp-archetype-1.13.2.1</a> (<a href="http://www.apache.org/dist/isis/archetype/simpleapp-archetype/simpleapp-archetype-1.13.2.1-source-release.zip.asc">asc</a>, <a href="http://www.apache.org/dist/isis/archetype/simpleapp-archetype/simpleapp-archetype-1.13.2.1-source-release.zip.md5">md5</a>)</p> </li>
+ </ul>
+ </div>
+ </div>
+ </div>
+ <div class="sect1">
+ <h2 id="_verifying_releases">Verifying Releases</h2>
+ <button type="button" class="button secondary" onclick="window.location.href="https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/_verifying_releases.adoc"" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i> Edit</button>
+ <div class="sectionbody">
+ <div class="paragraph">
+ <p>It is essential that you verify the integrity of any downloaded files using the PGP or MD5 signatures. For more information on signing artifacts and why we do it, check out the <a href="http://www.apache.org/dev/release-signing.html">Release Signing FAQ</a>.</p>
+ </div>
+ <div class="paragraph">
+ <p>The PGP signatures can be verified using PGP or GPG. First download the <a href="http://www.apache.org/dist/isis/KEYS">KEYS</a> as well as the asc signature file for the artifact. Make sure you get these files from the <a href="http://www.apache.org/dist/isis/">main distribution directory</a>, rather than from a mirror.</p>
+ </div>
+ <div class="paragraph">
+ <p>Then verify the signatures using a command such as:</p>
+ </div>
+ <div class="listingblock">
+ <div class="content">
+ <pre class="CodeRay highlight"><code data-lang="bash">pgpk -a KEYS
+pgpv isis-1.13.2-source-release.zip.asc</code></pre>
+ </div>
+ </div>
+ <div class="paragraph">
+ <p>or</p>
+ </div>
+ <div class="listingblock">
+ <div class="content">
+ <pre class="CodeRay highlight"><code data-lang="bash">pgp -ka KEYS
+pgp isis-1.13.2-source-release.zip.asc</code></pre>
+ </div>
+ </div>
+ <div class="paragraph">
+ <p>or</p>
+ </div>
+ <div class="listingblock">
+ <div class="content">
+ <pre class="CodeRay highlight"><code data-lang="bash">gpg �\u20ac\u201cimport KEYS
+gpg �\u20ac\u201cverify isis-1.13.2-source-release.zip.asc</code></pre>
+ </div>
+ </div>
+ <div class="paragraph">
+ <p>Alternatively, you can verify the MD5 signature on the files. A Unix/Linux program called <code>md5</code> or <code>md5sum</code> is included in most distributions. It is also available as part of <a href="http://www.gnu.org/software/textutils/textutils.html">GNU Textutils</a>. Windows users can get binary md5 programs from these (and likely other) places:</p>
+ </div>
+ <div class="ulist">
+ <ul>
+ <li> <p><a href="http://www.md5summer.org/">http://www.md5summer.org/</a></p> </li>
+ <li> <p><a href="http://www.fourmilab.ch/md5/">http://www.fourmilab.ch/md5/</a></p> </li>
+ <li> <p><a href="http://www.pc-tools.net/win32/md5sums/">http://www.pc-tools.net/win32/md5sums/</a></p> </li>
+ </ul>
+ </div>
+ </div>
+ </div>
+ <div class="sect1">
+ <h2 id="_downloads_source_code">Source Code</h2>
+ <button type="button" class="button secondary" onclick="window.location.href="https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/_downloads_source_code.adoc"" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i> Edit</button>
+ <div class="sectionbody">
+ <div class="paragraph">
+ <p>You can also download the Apache Isis source code using:</p>
+ </div>
+ <div class="listingblock">
+ <div class="content">
+ <pre class="CodeRay highlight"><code data-lang="bash">git clone git://git.apache.org/isis.git</code></pre>
+ </div>
+ </div>
+ <div class="paragraph">
+ <p>or</p>
+ </div>
+ <div class="listingblock">
+ <div class="content">
+ <pre class="CodeRay highlight"><code data-lang="bash">git clone http://git.apache.org/isis.git</code></pre>
+ </div>
+ </div>
+ <div class="paragraph">
+ <p>The code is also mirrored on <a href="http://github.com/apache/isis">github</a>, where you can browse it or fork it. And if you\u2019re interested in contributing back to Apache Isis, see <a href="contributors/contributing.html">here</a>.</p>
+ </div>
+ <div class="sect2">
+ <h3 id="_committers">Committers</h3>
+ <div class="paragraph">
+ <p>Committers should use the read/write repo:</p>
+ </div>
+ <div class="listingblock">
+ <div class="content">
+ <pre class="CodeRay highlight"><code data-lang="bash">https://git-wip-us.apache.org/repos/asf/isis.git</code></pre>
+ </div>
+ </div>
+ <div class="paragraph">
+ <p>You can browse the repo <a href="https://git-wip-us.apache.org/repos/asf/isis/repo?p=isis.git;a=summary">here</a>.</p>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="sect1">
+ <h2 id="_isis_add_ons_incode_catalog">Isis add-ons & Incode Catalog</h2>
+ <button type="button" class="button secondary" onclick="window.location.href="https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/_isis_add_ons_incode_catalog.adoc"" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i> Edit</button>
+ <div class="sectionbody">
+ <div class="paragraph">
+ <p>There are also a number of (open source, but not ASF) supporting modules and extensions for you to use:</p>
+ </div>
+ <div class="ulist">
+ <ul>
+ <li> <p>the <a href="http://www.isisaddons.org/">Isis Add-ons</a> provide technical extensions, such as security, commands, auditing and feature toggles</p> </li>
+ <li> <p>the <a href="http://catalog.incode.org">Incode Catalog</a> provides business modules, such as documents, notes and communications.</p> </li>
+ </ul>
+ </div>
+ <div class="paragraph">
+ <p>Each module is in a separate github repo, with a demo app to illustrate the module\u2019s functionality.</p>
+ </div>
+ </div>
+ </div>
+ </div>
+ <footer>
+ <hr>
+ <p class="small"> Copyright � 2010~2016 The Apache Software Foundation, licensed under the Apache License, v2.0. <br> Apache, the Apache feather logo, Apache Isis, and the Apache Isis project logo are all trademarks of The Apache Software Foundation. </p>
+ </footer>
+ </div>
+ <div id="doc-content-right" class="large-3 medium-3 xcolumns">
+ <div id="toc" class="toc2">
+ <div class="fallback-toc">
+ <ul class="sectlevel1">
+ <li><a href="#_getting_started">Getting Started</a></li>
+ <li><a href="#_formal_releases">Formal Releases</a></li>
+ <li><a href="#_verifying_releases">Verifying Releases</a></li>
+ <li><a href="#_downloads_source_code">Source Code</a>
+ <ul class="sectlevel2">
+ <li><a href="#_committers">Committers</a></li>
+ </ul> </li>
+ <li><a href="#_isis_add_ons_incode_catalog">Isis add-ons & Incode Catalog</a></li>
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+ <script src="./js/foundation/5.5.1/vendor/jquery.js"></script>
+ <script src="./js/foundation/5.5.1/foundation.min.js"></script>
+ <link href="./css/jquery.tocify/1.9.0/jquery.tocify.css" rel="stylesheet">
+ <script src="./js/jqueryui/1.11.4/jquery-ui.min.js"></script>
+ <script src="./js/jquery.tocify/1.9.0/jquery.tocify.js"></script>
+ <script type="text/javascript">
$(function () {
$("#toc").tocify({
scrollTo: 50,
@@ -705,9 +646,8 @@ gpg \u2013verify isis-1.13.2-source-release.zip.asc</code></pre>
});
$(".fallback-toc").hide();
});
-</script>
-
-<script type="text/javascript">
+</script>
+ <script type="text/javascript">
/****
@@ -817,9 +757,8 @@ gpg \u2013verify isis-1.13.2-source-release.zip.asc</code></pre>
***/
-</script>
-
-<script type="text/javascript">
+</script>
+ <script type="text/javascript">
$(document).ready(function(){
if("Documentation" === "Downloads") {
@@ -831,10 +770,8 @@ $(document).ready(function(){
});
-</script>
-
-
-<script>
+</script>
+ <script>
$( document ).ready(function() {
@@ -925,7 +862,6 @@ $( document ).ready(function() {
});
-</script>
-
-</body>
+</script>
+ </body>
</html>
[05/44] isis-site git commit: ISIS-1594: provide an 'edit' button
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/83a3755a/content/quotes.html
----------------------------------------------------------------------
diff --git a/content/quotes.html b/content/quotes.html
index ed80286..45700f7 100644
--- a/content/quotes.html
+++ b/content/quotes.html
@@ -1,12 +1,10 @@
<!doctype html>
<html class="no-js" lang="en">
-<head>
- <meta charset="utf-8"/>
- <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-
- <title>Quotes</title>
-
- <!--
+ <head>
+ <meta charset="utf-8">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+ <title>Quotes</title>
+ <!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
@@ -23,31 +21,21 @@
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
- -->
-
- <!-- No caching headers -->
- <meta http-equiv="cache-control" content="no-cache" />
- <meta http-equiv="pragma" content="no-cache" />
- <meta http-equiv="expires" content="-1" />
-
-
- <!-- TODO: need to (re)instate CDN in the future (not using for now just so can develop off-line -->
- <link href="./css/foundation/5.5.1/foundation.css" rel="stylesheet" />
- <script src="./js/foundation/5.5.1/vendor/modernizr.js"></script>
- <link href="./css/asciidoctor/colony.css" rel="stylesheet">
- <link href="./css/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet">
-
-
-
-
- <link href="./css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.css" rel="stylesheet" />
- <!--[if lt IE 9]>
+ -->
+ <!-- No caching headers -->
+ <meta http-equiv="cache-control" content="no-cache">
+ <meta http-equiv="pragma" content="no-cache">
+ <meta http-equiv="expires" content="-1">
+ <!-- TODO: need to (re)instate CDN in the future (not using for now just so can develop off-line -->
+ <link href="./css/foundation/5.5.1/foundation.css" rel="stylesheet">
+ <script src="./js/foundation/5.5.1/vendor/modernizr.js"></script>
+ <link href="./css/asciidoctor/colony.css" rel="stylesheet">
+ <link href="./css/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet">
+ <link href="./css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.css" rel="stylesheet">
+ <!--[if lt IE 9]>
<link href="./css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.ie.css" rel="stylesheet" />
- <![endif]-->
-
-
-
- <style type="text/css">
+ <![endif]-->
+ <style type="text/css">
pre code {
background-color: inherit;
border-style: none;
@@ -192,9 +180,8 @@ table.CodeRay td.code>pre{padding:0}
color:#fff;
font-size: 1.1em;
}
- </style>
-
- <style>
+ </style>
+ <style>
@media only screen and (min-width: 40.063em) {
.top-bar {
.contain-to-grid .top-bar {
@@ -205,9 +192,8 @@ table.CodeRay td.code>pre{padding:0}
.row {
max-width: 80rem;
}
- </style>
-
- <style>
+ </style>
+ <style>
.extended-quote,
.extended-quote-first {
margin-left: 40px;
@@ -231,9 +217,8 @@ table.CodeRay td.code>pre{padding:0}
text-shadow: 0 1px 2px rgba(0, 0, 0, 0.1);
}
- </style>
-
- <style>
+ </style>
+ <style>
body {
position: relative;
}
@@ -255,6 +240,7 @@ table.CodeRay td.code>pre{padding:0}
div#doc-content {
margin-top: 30px;
+ padding-top: 30px;
}
div.documentation-page table.frame-all {
@@ -286,9 +272,8 @@ table.CodeRay td.code>pre{padding:0}
min-height: 2000px;
}
- </style>
-
- <style>
+ </style>
+ <style>
@media only screen and (min-width: 768px) {
#toc.toc2 ul ul { margin-left: -10px; }
@@ -316,15 +301,13 @@ table.CodeRay td.code>pre{padding:0}
body div#toc2 li.tocify-item.active a {
color: red;
}
- </style>
-
- <style>
+ </style>
+ <style>
footer {
margin-top: 1000px;
}
- </style>
-
- <style>
+ </style>
+ <style>
/* overriding colony.css stylesheet */
.literalblock pre, .literalblock pre[class], .listingblock pre, .listingblock pre[class] {
/*padding: 1.25em 1.5625em 1.125em 1.5625em;*/
@@ -372,9 +355,8 @@ table.CodeRay td.code>pre{padding:0}
.imageblock img {
margin-bottom: 10px;
}
- </style>
-
- <style>
+ </style>
+ <style>
/* from http://ben.balter.com/2014/03/13/pages-anchor-links/ */
.header-link {
position: absolute;
@@ -395,9 +377,8 @@ table.CodeRay td.code>pre{padding:0}
h6:hover .header-link {
opacity: 1;
}
- </style>
-
- <style>
+ </style>
+ <style>
.top-bar
{
-webkit-transition-duration: .5s;
@@ -425,294 +406,318 @@ table.CodeRay td.code>pre{padding:0}
-webkit-transition-property: -webkit-transform;
transition-property: transform;
}
- </style>
-
- <style>
+ </style>
+ <style>
#doc-content a.guide {
color: white;
}
- </style>
-
- <style>
+ </style>
+ <style>
+ .tocify {
+ margin-top: 80px;
+ }
+ </style>
+ <style>
.tocify {
margin-top: 80px;
}
- </style>
-
-
-</script>
-
-</head>
-<body>
-
-<<div class="github-fork-ribbon-wrapper right" style="position: fixed;">
- <div class="github-fork-ribbon">
- <a href="https://github.com/apache/isis#fork-destination-box">Fork me on GitHub</a>
- </div>
-</div>
-
-
-<div class="row">
-
- <div class="fixed contain-to-grid header">
- <nav class="top-bar" data-topbar role="navigation" style="max-width: 80rem">
- <ul class="title-area">
- <li class="name">
- <h1>
- <a href="/index.html">Apache Isis™</a>
- </h1>
- </li>
- <!-- Remove the class "menu-icon" to get rid of menu icon. Take out "Menu" to just have icon alone -->
- <li class="toggle-topbar menu-icon"><a href="#"><span>Menu</span></a></li>
- </ul>
-
- <section class="top-bar-section">
- <ul class="right">
-
- <li class="has-form">
- <FORM class="searchbox navbar-form navbar-right" id="searchbox_012614087480249044419:dn-q5gtwxya" action="http://www.google.com/cse">
- <div class="row collapse">
- <input type="hidden" name="cx" value="012614087480249044419:dn-q5gtwxya">
- <INPUT type="hidden" name="cof" value="FORID:0">
- <INPUT class="form-control" name="q" type="text" placeholder="Search">
- </div>
- </FORM>
- </li>
-
- </ul>
-
- <!-- Left Nav Section -->
- <ul class="left">
-
- <li><a href="/documentation.html">Documentation</a></li>
- <li><a href="/downloads.html">Downloads</a></li>
- <li><a href="/help.html">Help</a></li>
- <li><a href="/asf.html">@ASF</a></li>
-
- </ul>
-
- </section>
- </nav>
- </div>
-</div>
-
-<div class="row">
-
- <div id="doc-content-left" class="large-9 medium-9 columns">
-
-
- <div id="doc-content">
- <div class="paragraph">
-<p><br/><br/></p>
-</div>
-<div class="paragraph">
-<p><div class="extended-quote-first"><p>
-Apache Isis enabled us to concentrate on modelling the domain and getting the UI and REST Interface with nearly no effort so we could build a fast and reliable application. Now we’ve started using it for the second project and I’m still very impressed by the framework and the community behind it.
-</p></div></p>
-</div>
-<div class="paragraph">
-<p><div class="extended-quote-attribution"><p> — Timothy Simecsek, NTT DATA Osterreich GmbH
-</p></div></p>
-</div>
-<div class="paragraph">
-<p><br/><br/>
-<div class="extended-quote-first"><p>
-We’d been looking for a RAD-tool for building our app; after trying different tools, Apache Isis gave us the most confidence for getting the job done. It’s really remarkable how easy it is to use, while contributors and users on the Isis' active mailing list are ready to help on more advanced topics.
-</p></div></p>
-</div>
-<div class="paragraph">
-<p><div class="extended-quote-attribution"><p> — Erik de Hair, pocos.nl
-</p></div></p>
-</div>
-<div class="paragraph">
-<p><br/><br/>
-<div class="extended-quote-first"><p>
-A fantastic framework! With Apache Isis we can prototype a deployable application in minutes rather than days.
-</p></div></p>
-</div>
-<div class="paragraph">
-<p><div class="extended-quote-attribution"><p> — Jeremy Branham
-</p></div></p>
-</div>
-<div class="paragraph">
-<p><br/><br/>
-<div class="extended-quote-first"><p>
-With its automatic UI and REST web services generation, Apache Isis kept our developers amazed and happy. Having had strenuous experiences with architecture and infrastructure concerns differing from project to project, it’s like having back the fun in software development
-</p></div></p>
-</div>
-<div class="paragraph">
-<p><div class="extended-quote-attribution"><p> — Willie Loyd Tandingan
-</p></div></p>
-</div>
-<div class="paragraph">
-<p><br/><br/>
-<div class="extended-quote-first"><p>
-Apache Isis' focus on the business domain improves communication between our end-users, architects and developers. Having a better application in a fraction of the time and cost is something we highly appreciate.
-</p></div></p>
-</div>
-<div class="paragraph">
-<p><div class="extended-quote-attribution"><p> — Cesar Lugo
-</p></div></p>
-</div>
-<div class="paragraph">
-<p><br/><br/>
-<div class="extended-quote-first"><p>
-I like the guidance Apache Isis gives me for structuring code along the lines of Domain Driven Design. My first web application in plain Java without writing a single line of DDL or HTML/*Script.
-</p></div></p>
-</div>
-<div class="paragraph">
-<p><div class="extended-quote-attribution"><p> — Joerg Rade
-</p></div></p>
-</div>
-<div class="paragraph">
-<p><br/><br/>
-<div class="extended-quote-first"><p>
-The Apache Isis team is very supportive. They even added new functionality for Summernote when I needed a WYSIWYG editor in my prototype project.
-</p></div></p>
-</div>
-<div class="paragraph">
-<p><div class="extended-quote-attribution"><p> — Marianne Hagaseth
-</p></div></p>
-</div>
-<div class="paragraph">
-<p><br/><br/>
-<div class="extended-quote-first"><p>
-What interests me most about Apache Isis is its goal of making both developers and users co-owners of their domain models. Apache Isis will be of interest to businesses who see their custom software as a strategic investment. It’s not trying to be all things to all people, but it has depth and also, I predict, a bright future.
-</p></div></p>
-</div>
-<div class="paragraph">
-<p><div class="extended-quote-attribution"><p> — Steve Cameron
-</p></div></p>
-</div>
-<div class="paragraph">
-<p><br/><br/>
-<div class="extended-quote-first"><p>
-As students most of us prefer sticking with business logic than spending much time with UX enhancements. Apache Isis provides a great platform to create a perfectly working prototypes with loads of inbuilt UX concerns and customizations without worrying a single bit on the GUI perspective.
-And I must say this: "Great Support from the development team"
-</p></div></p>
-</div>
-<div class="paragraph">
-<p><div class="extended-quote-attribution"><p> — Vishma Dias, University of Moratuwa, Sri Lanka.
-</p></div></p>
-</div>
-<div class="paragraph">
-<p><br/><br/>
-<div class="extended-quote-first"><p>
-Apache Isis has allowed us to be focused on the Domain instead of infrastructure issues. The extensive metamodel let us further automate and enhance our custom viewer and integrate with external frameworks.
-</p></div></p>
-</div>
-<div class="paragraph">
-<p><div class="extended-quote-attribution"><p> — Nacho Canovas
-</p></div></p>
-</div>
-<div class="paragraph">
-<p><br/><br/>
-<div class="extended-quote-first"><p>
-Support from the Apache Isis community is excellent. I sense a love and dedication that is inspiring.
-</p></div></p>
-</div>
-<div class="paragraph">
-<p><div class="extended-quote-attribution"><p> — Johan Doornenbal
-</p></div></p>
-</div>
-<div class="paragraph">
-<p><br/><br/>
-<div class="extended-quote-first"><p>
-Apache Isis provided us with a great starting point for our app; we simply took the todoapp archetype and used it as a template to help set up our integration tests and BDD specs. We were productive almost immediately
-</p></div></p>
-</div>
-<div class="paragraph">
-<p><div class="extended-quote-attribution"><p> — Vladimir Nisevic, A1 Telekom Austria
-</p></div></p>
-</div>
-<div class="paragraph">
-<p><br/><br/>
-<div class="extended-quote-first"><p>
-Apache Isis enabled us to focus on the problem domain and data quality and - because the UI was generated for us by the framework - not get distracted by UI concerns. Identified security issues were quickly addressed by the Apache Isis committers.
-</p></div></p>
-</div>
-<div class="paragraph">
-<p><div class="extended-quote-attribution"><p> — Architect
-</p></div></p>
-</div>
-<div class="paragraph">
-<p><br/><br/>
-<div class="extended-quote-first"><p>
-We use Apache Isis because of its simple and fast user interface generation.
-</p></div></p>
-</div>
-<div class="paragraph">
-<p><div class="extended-quote-attribution"><p> — Andreas Lechner
-</p></div></p>
-</div>
-<div class="paragraph">
-<p><br/><br/>
-<div class="extended-quote-first"><p>
-Apache Isis is an easy to learn, efficient and productive RAD platform. Further I can say it is evolving to be
-"the best RAD platform" without any exaggerations. The help from the community is simply wonderful.
-</p></div></p>
-</div>
-<div class="paragraph">
-<p><div class="extended-quote-attribution"><p> — Theekshana Dilshan, Computer Science and Engineering, University of Moratuwa, Sri Lanka.
-</p></div></p>
-</div>
-<div class="paragraph">
-<p><br/><br/>
-<div class="extended-quote-first"><p>
-Apache Isis is one of the best tools for hackathons. Given a 2 day hackathon challenge I have the perfect framework
-to create my prototype helping me to focus on business logic.
-</p></div></p>
-</div>
-<div class="paragraph">
-<p><div class="extended-quote-attribution"><p> — Sunand Padmanabhan
-</p></div></p>
-</div>
-<div class="paragraph">
-<p><br/><br/>
-From a Sprint retrospective, the criticism of one lead developer sounded more like praise:
-<div class="extended-quote-first"><p>
-The problem is that if we show this to the customer they will think that all the work is done.
-</p></div></p>
-</div>
-<div class="paragraph">
-<p><div class="extended-quote-attribution"><p> — provided by Ged Byrne
-</p></div></p>
-</div>
- </div>
-
- <footer>
- <hr>
- <p class="small">
- Copyright © 2010~2016 The Apache Software Foundation, licensed under the Apache License, v2.0.
- <br/>
- Apache, the Apache feather logo, Apache Isis, and the Apache Isis project logo are all trademarks of The Apache Software Foundation.
- </p>
- </footer>
-
- </div>
-
- <div id="doc-content-right" class="large-3 medium-3 xcolumns">
- <div id="toc" class="toc2">
- <div class="fallback-toc">
-
- </div>
- </div>
- </div>
-
-</div>
-
-
-<script src="./js/foundation/5.5.1/vendor/jquery.js"></script>
-<script src="./js/foundation/5.5.1/foundation.min.js"></script>
-
-
-<link href="./css/jquery.tocify/1.9.0/jquery.tocify.css" rel="stylesheet">
-<script src="./js/jqueryui/1.11.4/jquery-ui.min.js"></script>
-<script src="./js/jquery.tocify/1.9.0/jquery.tocify.js"></script>
-
-
-
-<script type="text/javascript">
+ </style>
+ </head>
+ <body>
+ <div class="row">
+ <div class="fixed contain-to-grid header">
+ <nav class="top-bar" data-topbar role="navigation" style="max-width: 80rem">
+ <ul class="title-area">
+ <li class="name"> <h1> <a href="/index.html">Apache Isis\u2122</a> </h1> </li>
+ <!-- Remove the class "menu-icon" to get rid of menu icon. Take out "Menu" to just have icon alone -->
+ <li class="toggle-topbar menu-icon"><a href="#"><span>Menu</span></a></li>
+ </ul>
+ <section class="top-bar-section">
+ <ul class="right">
+ <li class="has-form">
+ <form class="searchbox navbar-form navbar-right" id="searchbox_012614087480249044419:dn-q5gtwxya" action="http://www.google.com/cse">
+ <div class="row collapse">
+ <input type="hidden" name="cx" value="012614087480249044419:dn-q5gtwxya">
+ <input type="hidden" name="cof" value="FORID:0">
+ <input class="form-control" name="q" type="text" placeholder="Search">
+ </div>
+ </form> </li>
+ </ul>
+ <!-- Left Nav Section -->
+ <ul class="left">
+ <li><a href="/documentation.html">Documentation</a></li>
+ <li><a href="/downloads.html">Downloads</a></li>
+ <li><a href="/help.html">Help</a></li>
+ <li><a href="/asf.html">@ASF</a></li>
+ </ul>
+ </section>
+ </nav>
+ </div>
+ </div>
+ <div class="row">
+ <div id="doc-content-left" class="large-9 medium-9 columns">
+ <div id="doc-content">
+ <button type="button" class="button secondary" onclick="window.location.href="https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/quotes.adoc"" style="float: right; font-size: small; padding: 6px; "><i class="fa fa-pencil-square-o"></i> Edit</button>
+ <div class="paragraph">
+ <p><br><br></p>
+ </div>
+ <div class="paragraph">
+ <p></p>
+ <div class="extended-quote-first">
+ <p> Apache Isis enabled us to concentrate on modelling the domain and getting the UI and REST Interface with nearly no effort so we could build a fast and reliable application. Now we\u2019ve started using it for the second project and I\u2019m still very impressed by the framework and the community behind it. </p>
+ </div>
+ <p></p>
+ </div>
+ <div class="paragraph">
+ <p></p>
+ <div class="extended-quote-attribution">
+ <p>\u2009\u2014\u2009Timothy Simecsek, NTT DATA Osterreich GmbH </p>
+ </div>
+ <p></p>
+ </div>
+ <div class="paragraph">
+ <p><br><br> </p>
+ <div class="extended-quote-first">
+ <p> We\u2019d been looking for a RAD-tool for building our app; after trying different tools, Apache Isis gave us the most confidence for getting the job done. It\u2019s really remarkable how easy it is to use, while contributors and users on the Isis' active mailing list are ready to help on more advanced topics. </p>
+ </div>
+ <p></p>
+ </div>
+ <div class="paragraph">
+ <p></p>
+ <div class="extended-quote-attribution">
+ <p>\u2009\u2014\u2009Erik de Hair, pocos.nl </p>
+ </div>
+ <p></p>
+ </div>
+ <div class="paragraph">
+ <p><br><br> </p>
+ <div class="extended-quote-first">
+ <p> A fantastic framework! With Apache Isis we can prototype a deployable application in minutes rather than days. </p>
+ </div>
+ <p></p>
+ </div>
+ <div class="paragraph">
+ <p></p>
+ <div class="extended-quote-attribution">
+ <p>\u2009\u2014\u2009Jeremy Branham </p>
+ </div>
+ <p></p>
+ </div>
+ <div class="paragraph">
+ <p><br><br> </p>
+ <div class="extended-quote-first">
+ <p> With its automatic UI and REST web services generation, Apache Isis kept our developers amazed and happy. Having had strenuous experiences with architecture and infrastructure concerns differing from project to project, it\u2019s like having back the fun in software development </p>
+ </div>
+ <p></p>
+ </div>
+ <div class="paragraph">
+ <p></p>
+ <div class="extended-quote-attribution">
+ <p>\u2009\u2014\u2009Willie Loyd Tandingan </p>
+ </div>
+ <p></p>
+ </div>
+ <div class="paragraph">
+ <p><br><br> </p>
+ <div class="extended-quote-first">
+ <p> Apache Isis' focus on the business domain improves communication between our end-users, architects and developers. Having a better application in a fraction of the time and cost is something we highly appreciate. </p>
+ </div>
+ <p></p>
+ </div>
+ <div class="paragraph">
+ <p></p>
+ <div class="extended-quote-attribution">
+ <p>\u2009\u2014\u2009Cesar Lugo </p>
+ </div>
+ <p></p>
+ </div>
+ <div class="paragraph">
+ <p><br><br> </p>
+ <div class="extended-quote-first">
+ <p> I like the guidance Apache Isis gives me for structuring code along the lines of Domain Driven Design. My first web application in plain Java without writing a single line of DDL or HTML/*Script. </p>
+ </div>
+ <p></p>
+ </div>
+ <div class="paragraph">
+ <p></p>
+ <div class="extended-quote-attribution">
+ <p>\u2009\u2014\u2009Joerg Rade </p>
+ </div>
+ <p></p>
+ </div>
+ <div class="paragraph">
+ <p><br><br> </p>
+ <div class="extended-quote-first">
+ <p> The Apache Isis team is very supportive. They even added new functionality for Summernote when I needed a WYSIWYG editor in my prototype project. </p>
+ </div>
+ <p></p>
+ </div>
+ <div class="paragraph">
+ <p></p>
+ <div class="extended-quote-attribution">
+ <p>\u2009\u2014\u2009Marianne Hagaseth </p>
+ </div>
+ <p></p>
+ </div>
+ <div class="paragraph">
+ <p><br><br> </p>
+ <div class="extended-quote-first">
+ <p> What interests me most about Apache Isis is its goal of making both developers and users co-owners of their domain models. Apache Isis will be of interest to businesses who see their custom software as a strategic investment. It\u2019s not trying to be all things to all people, but it has depth and also, I predict, a bright future. </p>
+ </div>
+ <p></p>
+ </div>
+ <div class="paragraph">
+ <p></p>
+ <div class="extended-quote-attribution">
+ <p>\u2009\u2014\u2009Steve Cameron </p>
+ </div>
+ <p></p>
+ </div>
+ <div class="paragraph">
+ <p><br><br> </p>
+ <div class="extended-quote-first">
+ <p> As students most of us prefer sticking with business logic than spending much time with UX enhancements. Apache Isis provides a great platform to create a perfectly working prototypes with loads of inbuilt UX concerns and customizations without worrying a single bit on the GUI perspective. And I must say this: "Great Support from the development team" </p>
+ </div>
+ <p></p>
+ </div>
+ <div class="paragraph">
+ <p></p>
+ <div class="extended-quote-attribution">
+ <p>\u2009\u2014\u2009Vishma Dias, University of Moratuwa, Sri Lanka. </p>
+ </div>
+ <p></p>
+ </div>
+ <div class="paragraph">
+ <p><br><br> </p>
+ <div class="extended-quote-first">
+ <p> Apache Isis has allowed us to be focused on the Domain instead of infrastructure issues. The extensive metamodel let us further automate and enhance our custom viewer and integrate with external frameworks. </p>
+ </div>
+ <p></p>
+ </div>
+ <div class="paragraph">
+ <p></p>
+ <div class="extended-quote-attribution">
+ <p>\u2009\u2014\u2009Nacho Canovas </p>
+ </div>
+ <p></p>
+ </div>
+ <div class="paragraph">
+ <p><br><br> </p>
+ <div class="extended-quote-first">
+ <p> Support from the Apache Isis community is excellent. I sense a love and dedication that is inspiring. </p>
+ </div>
+ <p></p>
+ </div>
+ <div class="paragraph">
+ <p></p>
+ <div class="extended-quote-attribution">
+ <p>\u2009\u2014\u2009Johan Doornenbal </p>
+ </div>
+ <p></p>
+ </div>
+ <div class="paragraph">
+ <p><br><br> </p>
+ <div class="extended-quote-first">
+ <p> Apache Isis provided us with a great starting point for our app; we simply took the todoapp archetype and used it as a template to help set up our integration tests and BDD specs. We were productive almost immediately </p>
+ </div>
+ <p></p>
+ </div>
+ <div class="paragraph">
+ <p></p>
+ <div class="extended-quote-attribution">
+ <p>\u2009\u2014\u2009Vladimir Nisevic, A1 Telekom Austria </p>
+ </div>
+ <p></p>
+ </div>
+ <div class="paragraph">
+ <p><br><br> </p>
+ <div class="extended-quote-first">
+ <p> Apache Isis enabled us to focus on the problem domain and data quality and - because the UI was generated for us by the framework - not get distracted by UI concerns. Identified security issues were quickly addressed by the Apache Isis committers. </p>
+ </div>
+ <p></p>
+ </div>
+ <div class="paragraph">
+ <p></p>
+ <div class="extended-quote-attribution">
+ <p>\u2009\u2014\u2009Architect </p>
+ </div>
+ <p></p>
+ </div>
+ <div class="paragraph">
+ <p><br><br> </p>
+ <div class="extended-quote-first">
+ <p> We use Apache Isis because of its simple and fast user interface generation. </p>
+ </div>
+ <p></p>
+ </div>
+ <div class="paragraph">
+ <p></p>
+ <div class="extended-quote-attribution">
+ <p>\u2009\u2014\u2009Andreas Lechner </p>
+ </div>
+ <p></p>
+ </div>
+ <div class="paragraph">
+ <p><br><br> </p>
+ <div class="extended-quote-first">
+ <p> Apache Isis is an easy to learn, efficient and productive RAD platform. Further I can say it is evolving to be "the best RAD platform" without any exaggerations. The help from the community is simply wonderful. </p>
+ </div>
+ <p></p>
+ </div>
+ <div class="paragraph">
+ <p></p>
+ <div class="extended-quote-attribution">
+ <p>\u2009\u2014\u2009Theekshana Dilshan, Computer Science and Engineering, University of Moratuwa, Sri Lanka. </p>
+ </div>
+ <p></p>
+ </div>
+ <div class="paragraph">
+ <p><br><br> </p>
+ <div class="extended-quote-first">
+ <p> Apache Isis is one of the best tools for hackathons. Given a 2 day hackathon challenge I have the perfect framework to create my prototype helping me to focus on business logic. </p>
+ </div>
+ <p></p>
+ </div>
+ <div class="paragraph">
+ <p></p>
+ <div class="extended-quote-attribution">
+ <p>\u2009\u2014\u2009Sunand Padmanabhan </p>
+ </div>
+ <p></p>
+ </div>
+ <div class="paragraph">
+ <p><br><br> From a Sprint retrospective, the criticism of one lead developer sounded more like praise: </p>
+ <div class="extended-quote-first">
+ <p> The problem is that if we show this to the customer they will think that all the work is done. </p>
+ </div>
+ <p></p>
+ </div>
+ <div class="paragraph">
+ <p></p>
+ <div class="extended-quote-attribution">
+ <p>\u2009\u2014\u2009provided by Ged Byrne </p>
+ </div>
+ <p></p>
+ </div>
+ </div>
+ <footer>
+ <hr>
+ <p class="small"> Copyright � 2010~2016 The Apache Software Foundation, licensed under the Apache License, v2.0. <br> Apache, the Apache feather logo, Apache Isis, and the Apache Isis project logo are all trademarks of The Apache Software Foundation. </p>
+ </footer>
+ </div>
+ <div id="doc-content-right" class="large-3 medium-3 xcolumns">
+ <div id="toc" class="toc2">
+ <div class="fallback-toc">
+ </div>
+ </div>
+ </div>
+ </div>
+ <script src="./js/foundation/5.5.1/vendor/jquery.js"></script>
+ <script src="./js/foundation/5.5.1/foundation.min.js"></script>
+ <link href="./css/jquery.tocify/1.9.0/jquery.tocify.css" rel="stylesheet">
+ <script src="./js/jqueryui/1.11.4/jquery-ui.min.js"></script>
+ <script src="./js/jquery.tocify/1.9.0/jquery.tocify.js"></script>
+ <script type="text/javascript">
$(function () {
$("#toc").tocify({
scrollTo: 50,
@@ -725,9 +730,8 @@ The problem is that if we show this to the customer they will think that all the
});
$(".fallback-toc").hide();
});
-</script>
-
-<script type="text/javascript">
+</script>
+ <script type="text/javascript">
/****
@@ -837,9 +841,8 @@ The problem is that if we show this to the customer they will think that all the
***/
-</script>
-
-<script type="text/javascript">
+</script>
+ <script type="text/javascript">
$(document).ready(function(){
if("Documentation" === "Quotes") {
@@ -851,10 +854,8 @@ $(document).ready(function(){
});
-</script>
-
-
-<script>
+</script>
+ <script>
$( document ).ready(function() {
@@ -945,7 +946,6 @@ $( document ).ready(function() {
});
-</script>
-
-</body>
+</script>
+ </body>
</html>
[12/44] isis-site git commit: ISIS-1594: provide an 'edit' button
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/83a3755a/content/guides/ugvro.pdf
----------------------------------------------------------------------
diff --git a/content/guides/ugvro.pdf b/content/guides/ugvro.pdf
index 3b6f36e..07e5b92 100644
--- a/content/guides/ugvro.pdf
+++ b/content/guides/ugvro.pdf
@@ -4,16 +4,16 @@
<< /Title (Restful Objects Viewer)
/Creator (Asciidoctor PDF 1.5.0.alpha.11, based on Prawn 1.3.0)
/Producer (Asciidoctor PDF 1.5.0.alpha.11, based on Prawn 1.3.0)
-/CreationDate (D:20161103173533+00'00')
-/ModDate (D:20161103173533+00'00')
+/CreationDate (D:20170307234555+00'00')
+/ModDate (D:20170307234555+00'00')
>>
endobj
2 0 obj
<< /Type /Catalog
/Pages 3 0 R
/Names 14 0 R
-/Outlines 200 0 R
-/PageLabels 225 0 R
+/Outlines 199 0 R
+/PageLabels 224 0 R
/PageMode /UseOutlines
/OpenAction [7 0 R /FitH 842.89]
/ViewerPreferences << /DisplayDocTitle true
@@ -23,7 +23,7 @@ endobj
3 0 obj
<< /Type /Pages
/Count 21
-/Kids [7 0 R 10 0 R 12 0 R 35 0 R 43 0 R 48 0 R 64 0 R 70 0 R 79 0 R 89 0 R 92 0 R 95 0 R 99 0 R 101 0 R 110 0 R 115 0 R 128 0 R 136 0 R 141 0 R 143 0 R 150 0 R]
+/Kids [7 0 R 10 0 R 12 0 R 35 0 R 43 0 R 48 0 R 64 0 R 69 0 R 78 0 R 88 0 R 91 0 R 94 0 R 98 0 R 100 0 R 109 0 R 114 0 R 127 0 R 135 0 R 140 0 R 142 0 R 149 0 R]
>>
endobj
4 0 obj
@@ -78,13 +78,13 @@ endobj
endobj
8 0 obj
<< /Type /Font
-/BaseFont /AAAAEQ+NotoSerif
+/BaseFont /AAAAEC+NotoSerif
/Subtype /TrueType
-/FontDescriptor 227 0 R
+/FontDescriptor 226 0 R
/FirstChar 32
/LastChar 255
-/Widths 229 0 R
-/ToUnicode 228 0 R
+/Widths 228 0 R
+/ToUnicode 227 0 R
>>
endobj
9 0 obj
@@ -999,7 +999,7 @@ endobj
/F1.0 8 0 R
>>
>>
-/Annots [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 165 0 R 166 0 R 167 0 R 168 0 R 169 0 R 170 0 R 171 0 R 172 0 R 173 0 R 174 0 R 175 0 R 176 0 R 177 0 R 178 0 R 179 0 R 180 0 R 181 0 R 182 0 R 183 0 R 184 0 R 185 0 R 186 0 R 187 0 R 188 0 R 189 0 R 190 0 R 191 0 R 192 0 R 193 0 R 194 0 R 195 0 R 196 0 R 197 0 R 198 0 R]
+/Annots [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 165 0 R 166 0 R 167 0 R 168 0 R 169 0 R 170 0 R 171 0 R 172 0 R 173 0 R 174 0 R 175 0 R 176 0 R 177 0 R 178 0 R 179 0 R 180 0 R 181 0 R 182 0 R 183 0 R 184 0 R 185 0 R 186 0 R 187 0 R 188 0 R 189 0 R 190 0 R 191 0 R 192 0 R 193 0 R 194 0 R 195 0 R 196 0 R 197 0 R]
>>
endobj
11 0 obj
@@ -1718,7 +1718,7 @@ endobj
/Font << /F2.0 16 0 R
/F1.0 8 0 R
>>
-/XObject << /Stamp1 199 0 R
+/XObject << /Stamp1 198 0 R
>>
>>
/Annots [17 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 33 0 R]
@@ -1733,18 +1733,18 @@ endobj
>>
endobj
15 0 obj
-<< /Kids [112 0 R 113 0 R]
+<< /Kids [111 0 R 112 0 R]
>>
endobj
16 0 obj
<< /Type /Font
-/BaseFont /AAAAER+NotoSerif-Bold
+/BaseFont /AAAAED+NotoSerif-Bold
/Subtype /TrueType
-/FontDescriptor 231 0 R
+/FontDescriptor 230 0 R
/FirstChar 32
/LastChar 255
-/Widths 233 0 R
-/ToUnicode 232 0 R
+/Widths 232 0 R
+/ToUnicode 231 0 R
>>
endobj
17 0 obj
@@ -2416,7 +2416,7 @@ endobj
/Font << /F2.0 16 0 R
/F1.0 8 0 R
>>
-/XObject << /Stamp1 199 0 R
+/XObject << /Stamp1 198 0 R
>>
>>
/Annots [37 0 R]
@@ -3696,7 +3696,7 @@ endobj
/Contents 42 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/XObject << /I1 40 0 R
-/Stamp1 199 0 R
+/Stamp1 198 0 R
>>
/Font << /F1.0 8 0 R
/F3.1 45 0 R
@@ -3719,13 +3719,13 @@ endobj
endobj
45 0 obj
<< /Type /Font
-/BaseFont /AAAAES+FontAwesome
+/BaseFont /AAAAEE+FontAwesome
/Subtype /TrueType
-/FontDescriptor 235 0 R
+/FontDescriptor 234 0 R
/FirstChar 32
/LastChar 255
-/Widths 237 0 R
-/ToUnicode 236 0 R
+/Widths 236 0 R
+/ToUnicode 235 0 R
>>
endobj
46 0 obj
@@ -4954,7 +4954,7 @@ endobj
/F4.0 49 0 R
/F5.0 53 0 R
>>
-/XObject << /Stamp1 199 0 R
+/XObject << /Stamp1 198 0 R
>>
>>
/Annots [54 0 R 55 0 R 57 0 R 58 0 R 59 0 R 60 0 R 62 0 R]
@@ -4962,13 +4962,13 @@ endobj
endobj
49 0 obj
<< /Type /Font
-/BaseFont /AAAAET+NotoSerif-Italic
+/BaseFont /AAAAEF+NotoSerif-Italic
/Subtype /TrueType
-/FontDescriptor 239 0 R
+/FontDescriptor 238 0 R
/FirstChar 32
/LastChar 255
-/Widths 241 0 R
-/ToUnicode 240 0 R
+/Widths 240 0 R
+/ToUnicode 239 0 R
>>
endobj
50 0 obj
@@ -4982,13 +4982,13 @@ endobj
endobj
53 0 obj
<< /Type /Font
-/BaseFont /AAAAEU+mplus1mn-regular
+/BaseFont /AAAAEG+mplus1mn-regular
/Subtype /TrueType
-/FontDescriptor 243 0 R
+/FontDescriptor 242 0 R
/FirstChar 32
/LastChar 255
-/Widths 245 0 R
-/ToUnicode 244 0 R
+/Widths 244 0 R
+/ToUnicode 243 0 R
>>
endobj
54 0 obj
@@ -5066,7 +5066,7 @@ endobj
>>
endobj
63 0 obj
-<< /Length 11457
+<< /Length 11171
>>
stream
q
@@ -5618,35 +5618,13 @@ f
h
S
Q
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-59.24000000000001 276.33500000000026 Td
-/F6.0 11 Tf
-<697369732e7669657765722e7265737466756c6f626a656374732e686f6e6f72556948696e7473> 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
-273.74 276.33500000000026 Td
-/F5.0 11 Tf
-<3d> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
-
-BT
-279.24 276.33500000000026 Td
+59.24000000000001 276.33500000000026 Td
/F5.0 11 Tf
-<74727565> Tj
+<697369732e7669657765722e7265737466756c6f626a656374732e686f6e6f72556948696e74733d74727565> Tj
ET
0.000 0.000 0.000 SCN
@@ -5711,9 +5689,8 @@ endobj
/F5.0 53 0 R
/F2.0 16 0 R
/F4.0 49 0 R
-/F6.0 68 0 R
>>
-/XObject << /Stamp1 199 0 R
+/XObject << /Stamp1 198 0 R
>>
>>
/Annots [65 0 R 66 0 R]
@@ -5745,17 +5722,6 @@ endobj
[64 0 R /XYZ 0 431.9400000000002 null]
endobj
68 0 obj
-<< /Type /Font
-/BaseFont /AAAAEV+mplus1mn-bold
-/Subtype /TrueType
-/FontDescriptor 247 0 R
-/FirstChar 32
-/LastChar 255
-/Widths 249 0 R
-/ToUnicode 248 0 R
->>
-endobj
-69 0 obj
<< /Length 17729
>>
stream
@@ -6804,26 +6770,26 @@ Q
endstream
endobj
-70 0 obj
+69 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 69 0 R
+/Contents 68 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/Font << /F2.0 16 0 R
/F1.0 8 0 R
/F5.0 53 0 R
>>
-/XObject << /Stamp1 199 0 R
+/XObject << /Stamp1 198 0 R
>>
>>
-/Annots [72 0 R 73 0 R 74 0 R 75 0 R 76 0 R 77 0 R]
+/Annots [71 0 R 72 0 R 73 0 R 74 0 R 75 0 R 76 0 R]
>>
endobj
-71 0 obj
-[70 0 R /XYZ 0 841.89 null]
+70 0 obj
+[69 0 R /XYZ 0 841.89 null]
endobj
-72 0 obj
+71 0 obj
<< /Border [0 0 0]
/Dest ()
/Subtype /Link
@@ -6831,7 +6797,7 @@ endobj
/Type /Annot
>>
endobj
-73 0 obj
+72 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -6842,7 +6808,7 @@ endobj
/Type /Annot
>>
endobj
-74 0 obj
+73 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -6853,7 +6819,7 @@ endobj
/Type /Annot
>>
endobj
-75 0 obj
+74 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -6864,7 +6830,7 @@ endobj
/Type /Annot
>>
endobj
-76 0 obj
+75 0 obj
<< /Border [0 0 0]
/Dest (_ugvro_simplified-representations)
/Subtype /Link
@@ -6872,7 +6838,7 @@ endobj
/Type /Annot
>>
endobj
-77 0 obj
+76 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -6883,7 +6849,7 @@ endobj
/Type /Annot
>>
endobj
-78 0 obj
+77 0 obj
<< /Length 14805
>>
stream
@@ -7681,26 +7647,26 @@ Q
endstream
endobj
-79 0 obj
+78 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 78 0 R
+/Contents 77 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/Font << /F2.0 16 0 R
/F1.0 8 0 R
/F5.0 53 0 R
>>
-/XObject << /Stamp1 199 0 R
+/XObject << /Stamp1 198 0 R
>>
>>
-/Annots [81 0 R 82 0 R 83 0 R 84 0 R 86 0 R]
+/Annots [80 0 R 81 0 R 82 0 R 83 0 R 85 0 R]
>>
endobj
-80 0 obj
-[79 0 R /XYZ 0 841.89 null]
+79 0 obj
+[78 0 R /XYZ 0 841.89 null]
endobj
-81 0 obj
+80 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -7711,7 +7677,7 @@ endobj
/Type /Annot
>>
endobj
-82 0 obj
+81 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -7722,7 +7688,7 @@ endobj
/Type /Annot
>>
endobj
-83 0 obj
+82 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -7733,7 +7699,7 @@ endobj
/Type /Annot
>>
endobj
-84 0 obj
+83 0 obj
<< /Border [0 0 0]
/Dest (_ugvro_architecture)
/Subtype /Link
@@ -7741,10 +7707,10 @@ endobj
/Type /Annot
>>
endobj
-85 0 obj
-[79 0 R /XYZ 0 630.71 null]
+84 0 obj
+[78 0 R /XYZ 0 630.71 null]
endobj
-86 0 obj
+85 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -7755,10 +7721,10 @@ endobj
/Type /Annot
>>
endobj
-87 0 obj
-[79 0 R /XYZ 0 247.57000000000016 null]
+86 0 obj
+[78 0 R /XYZ 0 247.57000000000016 null]
endobj
-88 0 obj
+87 0 obj
<< /Length 3416
>>
stream
@@ -7953,22 +7919,22 @@ Q
endstream
endobj
-89 0 obj
+88 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 88 0 R
+/Contents 87 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/Font << /F1.0 8 0 R
/F5.0 53 0 R
>>
-/XObject << /Stamp1 199 0 R
+/XObject << /Stamp1 198 0 R
>>
>>
-/Annots [90 0 R]
+/Annots [89 0 R]
>>
endobj
-90 0 obj
+89 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -7979,7 +7945,7 @@ endobj
/Type /Annot
>>
endobj
-91 0 obj
+90 0 obj
<< /Length 12436
>>
stream
@@ -8699,33 +8665,33 @@ Q
endstream
endobj
-92 0 obj
+91 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 91 0 R
+/Contents 90 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/Font << /F5.0 53 0 R
-/F5.1 93 0 R
+/F5.1 92 0 R
/F1.0 8 0 R
>>
-/XObject << /Stamp1 199 0 R
+/XObject << /Stamp1 198 0 R
>>
>>
>>
endobj
-93 0 obj
+92 0 obj
<< /Type /Font
-/BaseFont /AAAAEW+mplus1mn-regular
+/BaseFont /AAAAEH+mplus1mn-regular
/Subtype /TrueType
-/FontDescriptor 251 0 R
+/FontDescriptor 246 0 R
/FirstChar 32
/LastChar 255
-/Widths 253 0 R
-/ToUnicode 252 0 R
+/Widths 248 0 R
+/ToUnicode 247 0 R
>>
endobj
-94 0 obj
+93 0 obj
<< /Length 6581
>>
stream
@@ -9060,26 +9026,26 @@ Q
endstream
endobj
-95 0 obj
+94 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 94 0 R
+/Contents 93 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/Font << /F5.0 53 0 R
/F2.0 16 0 R
/F1.0 8 0 R
>>
-/XObject << /Stamp1 199 0 R
+/XObject << /Stamp1 198 0 R
>>
>>
-/Annots [97 0 R]
+/Annots [96 0 R]
>>
endobj
-96 0 obj
-[95 0 R /XYZ 0 742.41 null]
+95 0 obj
+[94 0 R /XYZ 0 742.41 null]
endobj
-97 0 obj
+96 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -9090,7 +9056,7 @@ endobj
/Type /Annot
>>
endobj
-98 0 obj
+97 0 obj
<< /Length 12733
>>
stream
@@ -9827,22 +9793,22 @@ Q
endstream
endobj
-99 0 obj
+98 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 98 0 R
+/Contents 97 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/Font << /F5.0 53 0 R
-/F5.1 93 0 R
+/F5.1 92 0 R
/F1.0 8 0 R
>>
-/XObject << /Stamp1 199 0 R
+/XObject << /Stamp1 198 0 R
>>
>>
>>
endobj
-100 0 obj
+99 0 obj
<< /Length 12070
>>
stream
@@ -10481,29 +10447,29 @@ Q
endstream
endobj
-101 0 obj
+100 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 100 0 R
+/Contents 99 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/Font << /F2.0 16 0 R
/F1.0 8 0 R
/F5.0 53 0 R
>>
-/XObject << /Stamp1 199 0 R
+/XObject << /Stamp1 198 0 R
>>
>>
-/Annots [104 0 R 105 0 R 107 0 R 108 0 R]
+/Annots [103 0 R 104 0 R 106 0 R 107 0 R]
>>
endobj
+101 0 obj
+[100 0 R /XYZ 0 841.89 null]
+endobj
102 0 obj
-[101 0 R /XYZ 0 841.89 null]
+[100 0 R /XYZ 0 742.83 null]
endobj
103 0 obj
-[101 0 R /XYZ 0 742.83 null]
-endobj
-104 0 obj
<< /Border [0 0 0]
/Dest (_ugvro_simplified-representations_domain-object)
/Subtype /Link
@@ -10511,7 +10477,7 @@ endobj
/Type /Annot
>>
endobj
-105 0 obj
+104 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -10522,10 +10488,10 @@ endobj
/Type /Annot
>>
endobj
-106 0 obj
-[101 0 R /XYZ 0 171.03000000000029 null]
+105 0 obj
+[100 0 R /XYZ 0 171.03000000000029 null]
endobj
-107 0 obj
+106 0 obj
<< /Border [0 0 0]
/Dest (_ugvro_simplified-representations_object-collection)
/Subtype /Link
@@ -10533,7 +10499,7 @@ endobj
/Type /Annot
>>
endobj
-108 0 obj
+107 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -10544,7 +10510,7 @@ endobj
/Type /Annot
>>
endobj
-109 0 obj
+108 0 obj
<< /Length 10824
>>
stream
@@ -11159,35 +11125,35 @@ Q
endstream
endobj
-110 0 obj
+109 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 109 0 R
+/Contents 108 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/Font << /F5.0 53 0 R
/F1.0 8 0 R
/F2.0 16 0 R
>>
-/XObject << /Stamp1 199 0 R
+/XObject << /Stamp1 198 0 R
>>
>>
>>
endobj
-111 0 obj
-[110 0 R /XYZ 0 144.34999999999988 null]
+110 0 obj
+[109 0 R /XYZ 0 144.34999999999988 null]
endobj
-112 0 obj
+111 0 obj
<< /Limits [(_ugvro_architecture) (_ugvro_ro-spec_goals)]
-/Names [(_ugvro_architecture) 71 0 R (_ugvro_configuration-properties) 129 0 R (_ugvro_configuration-properties_deprecated) 134 0 R (_ugvro_configuration-properties_standard) 130 0 R (_ugvro_hints-and-tips) 144 0 R (_ugvro_ro-spec) 36 0 R (_ugvro_ro-spec_apache-isis-implementation) 46 0 R (_ugvro_ro-spec_extensions) 50 0 R (_ugvro_ro-spec_extensions_content-negotiation) 51 0 R (_ugvro_ro-spec_extensions_content-negotiation_apache-isis-profile) 56 0 R (_ugvro_ro-spec_extensions_content-negotiation_x-ro-domain-type) 52 0 R (_ugvro_ro-spec_extensions_minimizing-round-trips) 61 0 R (_ugvro_ro-spec_extensions_minimizing-round-trips_honor-ui-hints) 67 0 R (_ugvro_ro-spec_goals) 38 0 R]
+/Names [(_ugvro_architecture) 70 0 R (_ugvro_configuration-properties) 128 0 R (_ugvro_configuration-properties_deprecated) 133 0 R (_ugvro_configuration-properties_standard) 129 0 R (_ugvro_hints-and-tips) 143 0 R (_ugvro_ro-spec) 36 0 R (_ugvro_ro-spec_apache-isis-implementation) 46 0 R (_ugvro_ro-spec_extensions) 50 0 R (_ugvro_ro-spec_extensions_content-negotiation) 51 0 R (_ugvro_ro-spec_extensions_content-negotiation_apache-isis-profile) 56 0 R (_ugvro_ro-spec_extensions_content-negotiation_x-ro-domain-type) 52 0 R (_ugvro_ro-spec_extensions_minimizing-round-trips) 61 0 R (_ugvro_ro-spec_extensions_minimizing-round-trips_honor-ui-hints) 67 0 R (_ugvro_ro-spec_goals) 38 0 R]
>>
endobj
-113 0 obj
+112 0 obj
<< /Limits [(_ugvro_simplified-representations) (using-chrome-tools)]
-/Names [(_ugvro_simplified-representations) 80 0 R (_ugvro_simplified-representations_action-invocation) 102 0 R (_ugvro_simplified-representations_apache-isis-profile) 85 0 R (_ugvro_simplified-representations_configuration-properties) 125 0 R (_ugvro_simplified-representations_domain-object) 87 0 R (_ugvro_simplified-representations_object-collection) 96 0 R (_ugvro_simplified-representations_other-representations) 116 0 R (_ugvw) 13 0 R (angularjs-tips) 147 0 R (invoking-a-get-link-eg-invoking-a-query-action) 148 0 R (invoking-a-put-or-post-link) 151 0 R (other-guides) 18 0 R (pretty-printing) 153 0 R (resources-and-representations) 39 0 R (returning-a-list) 106 0 R (returning-an-object) 103 0 R (returning-scalar-nothing) 111 0 R (using-chrome-tools) 145 0 R]
+/Names [(_ugvro_simplified-representations) 79 0 R (_ugvro_simplified-representations_action-invocation) 101 0 R (_ugvro_simplified-representations_apache-isis-profile) 84 0 R (_ugvro_simplified-representations_configuration-properties) 124 0 R (_ugvro_simplified-representations_domain-object) 86 0 R (_ugvro_simplified-representations_object-collection) 95 0 R (_ugvro_simplified-representations_other-representations) 115 0 R (_ugvw) 13 0 R (angularjs-tips) 146 0 R (invoking-a-get-link-eg-invoking-a-query-action) 147 0 R (invoking-a-put-or-post-link) 150 0 R (other-guides) 18 0 R (pretty-printing) 152 0 R (resources-and-representations) 39 0 R (returning-a-list) 105 0 R (returning-an-object) 102 0 R (returning-scalar-nothing) 110 0 R (using-chrome-tools) 144 0 R]
>>
endobj
-114 0 obj
+113 0 obj
<< /Length 15289
>>
stream
@@ -12052,27 +12018,27 @@ Q
endstream
endobj
-115 0 obj
+114 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 114 0 R
+/Contents 113 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/Font << /F2.0 16 0 R
/F1.0 8 0 R
/F5.0 53 0 R
/F3.1 45 0 R
>>
-/XObject << /Stamp1 199 0 R
+/XObject << /Stamp1 198 0 R
>>
>>
-/Annots [117 0 R 118 0 R 119 0 R 120 0 R 121 0 R 122 0 R 123 0 R 124 0 R 126 0 R]
+/Annots [116 0 R 117 0 R 118 0 R 119 0 R 120 0 R 121 0 R 122 0 R 123 0 R 125 0 R]
>>
endobj
-116 0 obj
-[115 0 R /XYZ 0 841.89 null]
+115 0 obj
+[114 0 R /XYZ 0 841.89 null]
endobj
-117 0 obj
+116 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -12083,7 +12049,7 @@ endobj
/Type /Annot
>>
endobj
-118 0 obj
+117 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -12094,7 +12060,7 @@ endobj
/Type /Annot
>>
endobj
-119 0 obj
+118 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -12105,7 +12071,7 @@ endobj
/Type /Annot
>>
endobj
-120 0 obj
+119 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -12116,7 +12082,7 @@ endobj
/Type /Annot
>>
endobj
-121 0 obj
+120 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -12127,7 +12093,7 @@ endobj
/Type /Annot
>>
endobj
-122 0 obj
+121 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -12138,7 +12104,7 @@ endobj
/Type /Annot
>>
endobj
-123 0 obj
+122 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -12149,7 +12115,7 @@ endobj
/Type /Annot
>>
endobj
-124 0 obj
+123 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -12160,10 +12126,10 @@ endobj
/Type /Annot
>>
endobj
-125 0 obj
-[115 0 R /XYZ 0 295.45000000000016 null]
+124 0 obj
+[114 0 R /XYZ 0 295.45000000000016 null]
endobj
-126 0 obj
+125 0 obj
<< /Border [0 0 0]
/Dest (_ugvro_configuration-properties_deprecated)
/Subtype /Link
@@ -12171,7 +12137,7 @@ endobj
/Type /Annot
>>
endobj
-127 0 obj
+126 0 obj
<< /Length 21011
>>
stream
@@ -12639,7 +12605,7 @@ ET
BT
221.13950040000003 507.0430000000001 Td
-/F7.0 10.5 Tf
+/F6.0 10.5 Tf
<66616c7365> Tj
ET
@@ -12841,7 +12807,7 @@ ET
BT
221.13950040000003 455.2030000000002 Td
-/F7.0 10.5 Tf
+/F6.0 10.5 Tf
<66616c7365> Tj
ET
@@ -13458,7 +13424,7 @@ ET
BT
221.13950040000003 61.80300000000021 Td
-/F7.0 10.5 Tf
+/F6.0 10.5 Tf
<66616c7365> Tj
ET
@@ -13538,42 +13504,42 @@ Q
endstream
endobj
-128 0 obj
+127 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 127 0 R
+/Contents 126 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/Font << /F2.0 16 0 R
/F1.0 8 0 R
/F5.0 53 0 R
/F4.0 49 0 R
-/F7.0 131 0 R
+/F6.0 130 0 R
>>
-/XObject << /Stamp1 199 0 R
+/XObject << /Stamp1 198 0 R
>>
>>
-/Annots [132 0 R 133 0 R]
+/Annots [131 0 R 132 0 R]
>>
endobj
+128 0 obj
+[127 0 R /XYZ 0 841.89 null]
+endobj
129 0 obj
-[128 0 R /XYZ 0 841.89 null]
+[127 0 R /XYZ 0 662.2700000000001 null]
endobj
130 0 obj
-[128 0 R /XYZ 0 662.2700000000001 null]
-endobj
-131 0 obj
<< /Type /Font
-/BaseFont /AAAAEX+mplus1mn-italic
+/BaseFont /AAAAEI+mplus1mn-italic
/Subtype /TrueType
-/FontDescriptor 255 0 R
+/FontDescriptor 250 0 R
/FirstChar 32
/LastChar 255
-/Widths 257 0 R
-/ToUnicode 256 0 R
+/Widths 252 0 R
+/ToUnicode 251 0 R
>>
endobj
-132 0 obj
+131 0 obj
<< /Border [0 0 0]
/Dest (_ugvro_ro-spec_extensions_minimizing-round-trips_honor-ui-hints)
/Subtype /Link
@@ -13581,7 +13547,7 @@ endobj
/Type /Annot
>>
endobj
-133 0 obj
+132 0 obj
<< /Border [0 0 0]
/Dest (_ugvro_simplified-representations)
/Subtype /Link
@@ -13589,11 +13555,11 @@ endobj
/Type /Annot
>>
endobj
-134 0 obj
-[128 0 R /XYZ 0 335.71000000000026 null]
+133 0 obj
+[127 0 R /XYZ 0 335.71000000000026 null]
endobj
-135 0 obj
-<< /Length 27487
+134 0 obj
+<< /Length 25493
>>
stream
q
@@ -13937,7 +13903,7 @@ ET
BT
221.13950040000003 738.303 Td
-/F7.0 10.5 Tf
+/F6.0 10.5 Tf
<66616c7365> Tj
ET
@@ -14121,7 +14087,7 @@ ET
BT
221.13950040000003 700.7429999999999 Td
-/F7.0 10.5 Tf
+/F6.0 10.5 Tf
<66616c7365> Tj
ET
@@ -14312,7 +14278,7 @@ ET
BT
221.13950040000003 648.903 Td
-/F7.0 10.5 Tf
+/F6.0 10.5 Tf
<66616c7365> Tj
ET
@@ -14503,7 +14469,7 @@ ET
BT
221.13950040000003 597.063 Td
-/F7.0 10.5 Tf
+/F6.0 10.5 Tf
<66616c7365> Tj
ET
@@ -14694,7 +14660,7 @@ ET
BT
221.13950040000003 545.223 Td
-/F7.0 10.5 Tf
+/F6.0 10.5 Tf
<66616c7365> Tj
ET
@@ -14885,7 +14851,7 @@ ET
BT
221.13950040000003 493.3829999999999 Td
-/F7.0 10.5 Tf
+/F6.0 10.5 Tf
<66616c7365> Tj
ET
@@ -15031,13 +14997,13 @@ f
h
S
Q
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
59.24 407.465 Td
-/F6.0 11 Tf
-<697369732e7669657765722e7265737466756c6f626a656374732e737570707265737344657363726962656442794c696e6b73> Tj
+/F5.0 11 Tf
+<697369732e7669657765722e7265737466756c6f626a656374732e737570707265737344657363726962656442794c696e6b733d74727565> Tj
ET
0.000 0.000 0.000 SCN
@@ -15046,31 +15012,31 @@ ET
0.200 0.200 0.200 SCN
BT
-339.74 407.465 Td
+59.24 392.72499999999997 Td
/F5.0 11 Tf
-<3d> Tj
+<697369732e7669657765722e7265737466756c6f626a656374732e73757070726573735570646174654c696e6b3d74727565> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
-345.24 407.465 Td
+59.24 377.98499999999996 Td
/F5.0 11 Tf
-<74727565> Tj
+<697369732e7669657765722e7265737466756c6f626a656374732e73757070726573734d656d62657249643d74727565> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
-59.24 392.72499999999997 Td
-/F6.0 11 Tf
-<697369732e7669657765722e7265737466756c6f626a656374732e73757070726573735570646174654c696e6b> Tj
+59.24 363.24499999999995 Td
+/F5.0 11 Tf
+<697369732e7669657765722e7265737466756c6f626a656374732e73757070726573734d656d6265724c696e6b733d74727565> Tj
ET
0.000 0.000 0.000 SCN
@@ -15079,31 +15045,42 @@ ET
0.200 0.200 0.200 SCN
BT
-306.73999999999995 392.72499999999997 Td
+59.24 348.50499999999994 Td
/F5.0 11 Tf
-<3d> Tj
+<697369732e7669657765722e7265737466756c6f626a656374732e73757070726573734d656d626572457874656e73696f6e733d74727565> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
-312.23999999999995 392.72499999999997 Td
+59.24 333.765 Td
/F5.0 11 Tf
-<74727565> Tj
+<697369732e7669657765722e7265737466756c6f626a656374732e73757070726573734d656d62657244697361626c6564526561736f6e3d74727565> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+q
+0.5 w
+0.933 0.933 0.933 SCN
+113.807 252.510 m
+113.807 307.850 l
+S
+Q
+0.098 0.251 0.486 scn
+0.098 0.251 0.486 SCN
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.098 0.251 0.486 scn
+0.098 0.251 0.486 SCN
BT
-59.24 377.98499999999996 Td
-/F6.0 11 Tf
-<697369732e7669657765722e7265737466756c6f626a656374732e73757070726573734d656d6265724964> Tj
+76.73933333333333 271.59999999999997 Td
+/F3.1 24 Tf
+<21> Tj
ET
0.000 0.000 0.000 SCN
@@ -15111,225 +15088,82 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
+1.357 Tw
+
BT
-295.74 377.98499999999996 Td
-/F5.0 11 Tf
-<3d> Tj
+125.80666666666667 291.88599999999997 Td
+/F1.0 10.5 Tf
+[<496620746865736520636f6e6669677572> 20.01953125 <6174696f6e2073657474696e6773206172652073657420696e20636f6e6a756e6374696f6e2077697468207573696e672074686520>] TJ
ET
+
+0.000 Tw
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+
+1.357 Tw
BT
-301.24 377.98499999999996 Td
-/F5.0 11 Tf
-<74727565> Tj
+477.1092051323784 291.88599999999997 Td
+/F1.0 10.5 Tf
+<4170616368652049736973> Tj
ET
+
+0.000 Tw
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+
+1.700 Tw
BT
-59.24 363.24499999999995 Td
-/F6.0 11 Tf
-<697369732e7669657765722e7265737466756c6f626a656374732e73757070726573734d656d6265724c696e6b73> Tj
+125.80666666666667 276.106 Td
+/F1.0 10.5 Tf
+<70726f66696c65> 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
-312.23999999999995 363.24499999999995 Td
-/F5.0 11 Tf
-<3d> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+1.700 Tw
BT
-317.74 363.24499999999995 Td
-/F5.0 11 Tf
-<74727565> Tj
+159.34366666666668 276.106 Td
+/F1.0 10.5 Tf
+<2c207468656e20746865207370656369616c20> Tj
ET
+
+0.000 Tw
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
+
+1.700 Tw
BT
-59.24 348.50499999999994 Td
-/F6.0 11 Tf
-<697369732e7669657765722e7265737466756c6f626a656374732e73757070726573734d656d626572457874656e73696f6e73> Tj
+252.81983333333332 276.106 Td
+/F5.0 10.5 Tf
+<2424726f> 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
-339.74 348.50499999999994 Td
-/F5.0 11 Tf
-<3d> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
-
-BT
-345.24 348.50499999999994 Td
-/F5.0 11 Tf
-<74727565> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-59.24 333.765 Td
-/F6.0 11 Tf
-<697369732e7669657765722e7265737466756c6f626a656374732e73757070726573734d656d62657244697361626c6564526561736f6e> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-BT
-361.74 333.765 Td
-/F5.0 11 Tf
-<3d> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
-
-BT
-367.24 333.765 Td
-/F5.0 11 Tf
-<74727565> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-q
-0.5 w
-0.933 0.933 0.933 SCN
-113.807 252.510 m
-113.807 307.850 l
-S
-Q
-0.098 0.251 0.486 scn
-0.098 0.251 0.486 SCN
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.098 0.251 0.486 scn
-0.098 0.251 0.486 SCN
-
-BT
-76.73933333333333 271.59999999999997 Td
-/F3.1 24 Tf
-<21> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-1.357 Tw
-
-BT
-125.80666666666667 291.88599999999997 Td
-/F1.0 10.5 Tf
-[<496620746865736520636f6e6669677572> 20.01953125 <6174696f6e2073657474696e6773206172652073657420696e20636f6e6a756e6374696f6e2077697468207573696e672074686520>] TJ
-ET
-
-
-0.000 Tw
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-
-1.357 Tw
-
-BT
-477.1092051323784 291.88599999999997 Td
-/F1.0 10.5 Tf
-<4170616368652049736973> Tj
-ET
-
-
-0.000 Tw
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-
-1.700 Tw
-
-BT
-125.80666666666667 276.106 Td
-/F1.0 10.5 Tf
-<70726f66696c65> 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.700 Tw
-
-BT
-159.34366666666668 276.106 Td
-/F1.0 10.5 Tf
-<2c207468656e20746865207370656369616c20> 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.700 Tw
-
-BT
-252.81983333333332 276.106 Td
-/F5.0 10.5 Tf
-<2424726f> 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.700 Tw
+
+1.700 Tw
BT
273.81983333333335 276.106 Td
@@ -15412,35 +15246,13 @@ f
h
S
Q
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-59.24000000000001 189.90499999999997 Td
-/F6.0 11 Tf
-<697369732e7669657765722e7265737466756c6f626a656374732e6f626a65637450726f706572747956616c7565734f6e6c79> 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
-339.74 189.90499999999997 Td
-/F5.0 11 Tf
-<3d> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
-
-BT
-345.24 189.90499999999997 Td
+59.24000000000001 189.90499999999997 Td
/F5.0 11 Tf
-<74727565> Tj
+<697369732e7669657765722e7265737466756c6f626a656374732e6f626a65637450726f706572747956616c7565734f6e6c793d74727565> Tj
ET
0.000 0.000 0.000 SCN
@@ -15480,27 +15292,26 @@ Q
endstream
endobj
-136 0 obj
+135 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 135 0 R
+/Contents 134 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/Font << /F2.0 16 0 R
/F4.0 49 0 R
/F5.0 53 0 R
/F1.0 8 0 R
-/F7.0 131 0 R
-/F6.0 68 0 R
+/F6.0 130 0 R
/F3.1 45 0 R
>>
-/XObject << /Stamp1 199 0 R
+/XObject << /Stamp1 198 0 R
>>
>>
-/Annots [137 0 R 138 0 R 139 0 R]
+/Annots [136 0 R 137 0 R 138 0 R]
>>
endobj
-137 0 obj
+136 0 obj
<< /Border [0 0 0]
/Dest (_ugvro_simplified-representations_configuration-properties_object-property-values-only)
/Subtype /Link
@@ -15508,7 +15319,7 @@ endobj
/Type /Annot
>>
endobj
-138 0 obj
+137 0 obj
<< /Border [0 0 0]
/Dest (_ugvro_simplified-representations_apache-isis-profile)
/Subtype /Link
@@ -15516,7 +15327,7 @@ endobj
/Type /Annot
>>
endobj
-139 0 obj
+138 0 obj
<< /Border [0 0 0]
/Dest (_ugvro_simplified-representations_apache-isis-profile)
/Subtype /Link
@@ -15524,8 +15335,8 @@ endobj
/Type /Annot
>>
endobj
-140 0 obj
-<< /Length 31077
+139 0 obj
+<< /Length 45276
>>
stream
q
@@ -15582,13 +15393,35 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
81.24000000000001 768.3249999999999 Td
/F5.0 11 Tf
-<227469746c6522> 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
+
+BT
+86.74000000000001 768.3249999999999 Td
+/F5.0 11 Tf
+<7469746c65> 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
+114.24000000000001 768.3249999999999 Td
+/F5.0 11 Tf
+<22> Tj
ET
0.000 0.000 0.000 SCN
@@ -15604,46 +15437,1102 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.651 0.090 0.090 scn
-0.651 0.090 0.090 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
125.24000000000001 768.3249999999999 Td
/F5.0 11 Tf
-<3a> Tj
+<3a> 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
+130.74 768.3249999999999 Td
+/F5.0 11 Tf
+<20> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+136.24 768.3249999999999 Td
+/F5.0 11 Tf
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+141.74 768.3249999999999 Td
+/F5.0 11 Tf
+<427579206d696c6b2064756520627920323031342d31302d3237> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+284.74 768.3249999999999 Td
+/F5.0 11 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
+
+BT
+290.24 768.3249999999999 Td
+/F5.0 11 Tf
+<2c> 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 753.585 Td
+/F5.0 11 Tf
+<ca202020> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
+
+BT
+81.24000000000001 753.585 Td
+/F5.0 11 Tf
+<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
+
+BT
+86.74000000000001 753.585 Td
+/F5.0 11 Tf
+<646f6d61696e54797065> 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
+141.74 753.585 Td
+/F5.0 11 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
+
+BT
+147.24 753.585 Td
+/F5.0 11 Tf
+<20> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+152.74 753.585 Td
+/F5.0 11 Tf
+<3a> 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
+158.24 753.585 Td
+/F5.0 11 Tf
+<20> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+163.74 753.585 Td
+/F5.0 11 Tf
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+169.24 753.585 Td
+/F5.0 11 Tf
+<544f444f> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+191.24 753.585 Td
+/F5.0 11 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
+
+BT
+196.74 753.585 Td
+/F5.0 11 Tf
+<2c> 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 738.845 Td
+/F5.0 11 Tf
+<ca202020> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
+
+BT
+81.24000000000001 738.845 Td
+/F5.0 11 Tf
+<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
+
+BT
+86.74000000000001 738.845 Td
+/F5.0 11 Tf
+<696e7374616e63654964> 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
+141.74 738.845 Td
+/F5.0 11 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
+
+BT
+147.24 738.845 Td
+/F5.0 11 Tf
+<20> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+152.74 738.845 Td
+/F5.0 11 Tf
+<3a> 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
+158.24 738.845 Td
+/F5.0 11 Tf
+<20> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+163.74 738.845 Td
+/F5.0 11 Tf
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+169.24 738.845 Td
+/F5.0 11 Tf
+<30> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+174.74 738.845 Td
+/F5.0 11 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
+
+BT
+180.24 738.845 Td
+/F5.0 11 Tf
+<2c> 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 724.105 Td
+/F5.0 11 Tf
+<ca202020> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
+
+BT
+81.24000000000001 724.105 Td
+/F5.0 11 Tf
+<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
+
+BT
+86.74000000000001 724.105 Td
+/F5.0 11 Tf
+<6d656d62657273> 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
+125.24000000000001 724.105 Td
+/F5.0 11 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
+
+BT
+130.74 724.105 Td
+/F5.0 11 Tf
+<20> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+136.24 724.105 Td
+/F5.0 11 Tf
+<3a> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+141.74 724.105 Td
+/F5.0 11 Tf
+<20> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+147.24 724.105 Td
+/F5.0 11 Tf
+<7b> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+59.24 709.365 Td
+/F5.0 11 Tf
+<ca20202020202020> 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
+103.24000000000001 709.365 Td
+/F5.0 11 Tf
+<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
+
+BT
+108.74000000000001 709.365 Td
+/F5.0 11 Tf
+<6465736372697074696f6e> 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
+169.24 709.365 Td
+/F5.0 11 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
+
+BT
+174.74 709.365 Td
+/F5.0 11 Tf
+<20> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+180.24 709.365 Td
+/F5.0 11 Tf
+<3a> 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
+185.74 709.365 Td
+/F5.0 11 Tf
+<20> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+191.24 709.365 Td
+/F5.0 11 Tf
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+196.74 709.365 Td
+/F5.0 11 Tf
+<427579206d696c6b> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+240.74 709.365 Td
+/F5.0 11 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
+
+BT
+246.24 709.365 Td
+/F5.0 11 Tf
+<2c> 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 694.625 Td
+/F5.0 11 Tf
+<ca20202020202020> 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
+103.24000000000001 694.625 Td
+/F5.0 11 Tf
+<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
+
+BT
+108.74000000000001 694.625 Td
+/F5.0 11 Tf
+<63617465676f7279> 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
+152.74 694.625 Td
+/F5.0 11 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
+
+BT
+158.24 694.625 Td
+/F5.0 11 Tf
+<20> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+163.74 694.625 Td
+/F5.0 11 Tf
+<3a> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+169.24 694.625 Td
+/F5.0 11 Tf
+<20> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+174.74 694.625 Td
+/F5.0 11 Tf
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+180.24 694.625 Td
+/F5.0 11 Tf
+<446f6d6573746963> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+224.24 694.625 Td
+/F5.0 11 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
+
+BT
+229.74 694.625 Td
+/F5.0 11 Tf
+<2c> 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 679.885 Td
+/F5.0 11 Tf
+<ca20202020202020> 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
+103.24000000000001 679.885 Td
+/F5.0 11 Tf
+<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
+
+BT
+108.74000000000001 679.885 Td
+/F5.0 11 Tf
+<73756263617465676f7279> 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
+169.24 679.885 Td
+/F5.0 11 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
+
+BT
+174.74 679.885 Td
+/F5.0 11 Tf
+<20> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+180.24 679.885 Td
+/F5.0 11 Tf
+<3a> 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
+185.74 679.885 Td
+/F5.0 11 Tf
+<20> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+191.24 679.885 Td
+/F5.0 11 Tf
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+196.74 679.885 Td
+/F5.0 11 Tf
+<53686f7070696e67> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+240.74 679.885 Td
+/F5.0 11 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
+
+BT
+246.24 679.885 Td
+/F5.0 11 Tf
+<2c> 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 665.145 Td
+/F5.0 11 Tf
+<ca20202020202020> 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
+103.24000000000001 665.145 Td
+/F5.0 11 Tf
+<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
+
+BT
+108.74000000000001 665.145 Td
+/F5.0 11 Tf
+<636f6d706c657465> 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
+152.74 665.145 Td
+/F5.0 11 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
+
+BT
+158.24 665.145 Td
+/F5.0 11 Tf
+<20> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+163.74 665.145 Td
+/F5.0 11 Tf
+<3a> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+169.24 665.145 Td
+/F5.0 11 Tf
+<20> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+174.74 665.145 Td
+/F5.0 11 Tf
+<66616c7365> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+202.24 665.145 Td
+/F5.0 11 Tf
+<2c> 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 650.405 Td
+/F5.0 11 Tf
+<ca20202020202020> 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
+103.24000000000001 650.405 Td
+/F5.0 11 Tf
+<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
+
+BT
+108.74000000000001 650.405 Td
+/F5.0 11 Tf
+<76657273696f6e53657175656e6365> 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
+191.24 650.405 Td
+/F5.0 11 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
+
+BT
+196.74 650.405 Td
+/F5.0 11 Tf
+<20> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+202.24 650.405 Td
+/F5.0 11 Tf
+<3a> 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
+207.74 650.405 Td
+/F5.0 11 Tf
+<20> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+1.000 0.400 0.000 scn
+1.000 0.400 0.000 SCN
+
+BT
+213.24 650.405 Td
+/F5.0 11 Tf
+<31> 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
+218.74 650.405 Td
+/F5.0 11 Tf
+<2c> 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 635.665 Td
+/F5.0 11 Tf
+<ca20202020202020> 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
+103.24000000000001 635.665 Td
+/F5.0 11 Tf
+<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
+
+BT
+108.74000000000001 635.665 Td
+/F5.0 11 Tf
+<72656c61746976655072696f72697479> 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
+196.74 635.665 Td
+/F5.0 11 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
+
+BT
+202.24 635.665 Td
+/F5.0 11 Tf
+<20> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+207.74 635.665 Td
+/F5.0 11 Tf
+<3a> 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 635.665 Td
+/F5.0 11 Tf
+<20> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+1.000 0.400 0.000 scn
+1.000 0.400 0.000 SCN
+
+BT
+218.74 635.665 Td
+/F5.0 11 Tf
+<32> 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
+224.24 635.665 Td
+/F5.0 11 Tf
+<2c> 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 620.925 Td
+/F5.0 11 Tf
+<ca20202020202020> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
-130.74 768.3249999999999 Td
+103.24000000000001 620.925 Td
/F5.0 11 Tf
-<20> Tj
+<22> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
-136.24 768.3249999999999 Td
+108.74000000000001 620.925 Td
/F5.0 11 Tf
-<22427579206d696c6b2064756520627920323031342d31302d323722> Tj
+<6475654279> 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
-290.24 768.3249999999999 Td
+136.24 620.925 Td
/F5.0 11 Tf
-<2c> Tj
+<22> Tj
ET
0.000 0.000 0.000 SCN
@@ -15652,20 +16541,20 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 753.585 Td
+141.74 620.925 Td
/F5.0 11 Tf
-<ca202020> Tj
+<20> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
-81.24000000000001 753.585 Td
+147.24 620.925 Td
/F5.0 11 Tf
-<22646f6d61696e5479706522> Tj
+<3a> Tj
ET
0.000 0.000 0.000 SCN
@@ -15674,42 +16563,42 @@ ET
0.200 0.200 0.200 SCN
BT
-147.24 753.585 Td
+152.74 620.925 Td
/F5.0 11 Tf
<20> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.651 0.090 0.090 scn
-0.651 0.090 0.090 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
BT
-152.74 753.585 Td
+158.24 620.925 Td
/F5.0 11 Tf
-<3a> 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
-158.24 753.585 Td
+163.74 620.925 Td
/F5.0 11 Tf
-<20> Tj
+<323031342d31302d3237> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
BT
-163.74 753.585 Td
+218.74 620.925 Td
/F5.0 11 Tf
-<22544f444f22> Tj
+<22> Tj
ET
0.000 0.000 0.000 SCN
@@ -15718,7 +16607,7 @@ ET
0.200 0.200 0.200 SCN
BT
-196.74 753.585 Td
+224.24 620.925 Td
/F5.0 11 Tf
<2c> Tj
ET
@@ -15729,42 +16618,42 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 738.845 Td
+59.24 606.185 Td
/F5.0 11 Tf
-<ca202020> Tj
+<ca20202020202020> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
-81.24000000000001 738.845 Td
+103.24000000000001 606.185 Td
/F5.0 11 Tf
-<22696e7374616e6365496422> 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.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
-147.24 738.845 Td
+108.74000000000001 606.185 Td
/F5.0 11 Tf
-<20> Tj
+<636f7374> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.651 0.090 0.090 scn
-0.651 0.090 0.090 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
-152.74 738.845 Td
+130.74 606.185 Td
/F5.0 11 Tf
-<3a> Tj
+<22> Tj
ET
0.000 0.000 0.000 SCN
@@ -15773,20 +16662,20 @@ ET
0.200 0.200 0.200 SCN
BT
-158.24 738.845 Td
+136.24 606.185 Td
/F5.0 11 Tf
<20> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
-163.74 738.845 Td
+141.74 606.185 Td
/F5.0 11 Tf
-<223022> Tj
+<3a> Tj
ET
0.000 0.000 0.000 SCN
@@ -15795,53 +16684,53 @@ ET
0.200 0.200 0.200 SCN
BT
-180.24 738.845 Td
+147.24 606.185 Td
/F5.0 11 Tf
-<2c> 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.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
BT
-59.24 724.105 Td
+152.74 606.185 Td
/F5.0 11 Tf
-<ca202020> Tj
+<22> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
BT
-81.24000000000001 724.105 Td
+158.24 606.185 Td
/F5.0 11 Tf
-<226d656d6265727322> Tj
+<302e3735> 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
-130.74 724.105 Td
+180.24 606.185 Td
/F5.0 11 Tf
-<20> Tj
+<22> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.651 0.090 0.090 scn
-0.651 0.090 0.090 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
-136.24 724.105 Td
+185.74 606.185 Td
/F5.0 11 Tf
-<3a> Tj
+<2c> Tj
ET
0.000 0.000 0.000 SCN
@@ -15850,42 +16739,42 @@ ET
0.200 0.200 0.200 SCN
BT
-141.74 724.105 Td
+59.24 591.4449999999999 Td
/F5.0 11 Tf
-<20> Tj
+<ca20202020202020> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
-147.24 724.105 Td
+103.24000000000001 591.4449999999999 Td
/F5.0 11 Tf
-<7b> 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.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
-59.24 709.365 Td
+108.74000000000001 591.4449999999999 Td
/F5.0 11 Tf
-<ca20202020202020> Tj
+<6e6f746573> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
-103.24000000000001 709.365 Td
+136.24 591.4449999999999 Td
/F5.0 11 Tf
-<226465736372697074696f6e22> Tj
+<22> Tj
ET
0.000 0.000 0.000 SCN
@@ -15894,18 +16783,18 @@ ET
0.200 0.200 0.200 SCN
BT
-174.74 709.365 Td
+141.74 591.4449999999999 Td
/F5.0 11 Tf
<20> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.651 0.090 0.090 scn
-0.651 0.090 0.090 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
-180.24 709.365 Td
+147.24 591.4449999999999 Td
/F5.0 11 Tf
<3a> Tj
ET
@@ -15916,20 +16805,20 @@ ET
0.200 0.200 0.200 SCN
BT
-185.74 709.365 Td
+152.74 591.4449999999999 Td
/F5.0 11 Tf
<20> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
-191.24 709.365 Td
+158.24 591.4449999999999 Td
/F5.0 11 Tf
-<22427579206d696c6b22> Tj
+<6e756c6c> Tj
ET
0.000 0.000 0.000 SCN
@@ -15938,7 +16827,7 @@ ET
0.200 0.200 0.200 SCN
BT
-246.24 709.365 Td
+180.24 591.4449999999999 Td
/F5.0 11 Tf
<2c> Tj
ET
@@ -15949,42 +16838,42 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 694.625 Td
+59.24 576.7049999999999 Td
/F5.0 11 Tf
<ca20202020202020> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
-103.24000000000001 694.625 Td
+103.24000000000001 576.7049999999999 Td
/F5.0 11 Tf
-<2263617465676f727922> 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.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
-158.24 694.625 Td
+108.74000000000001 576.7049999999999 Td
/F5.0 11 Tf
-<20> Tj
+<6174746163686d656e74> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.651 0.090 0.090 scn
-0.651 0.090 0.090 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
-163.74 694.625 Td
+163.74 576.7049999999999 Td
/F5.0 11 Tf
-<3a> Tj
+<22> Tj
ET
0.000 0.000 0.000 SCN
@@ -15993,20 +16882,20 @@ ET
0.200 0.200 0.200 SCN
BT
-169.24 694.625 Td
+169.24 576.7049999999999 Td
/F5.0 11 Tf
<20> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
-174.74 694.625 Td
+174.74 576.7049999999999 Td
/F5.0 11 Tf
-<22446f6d657374696322> Tj
+<3a> Tj
ET
0.000 0.000 0.000 SCN
@@ -16015,9 +16904,9 @@ ET
0.200 0.200 0.200 SCN
BT
-229.74 694.625 Td
+180.24 576.7049999999999 Td
/F5.0 11 Tf
-<2c> Tj
+<20> Tj
ET
0.000 0.000 0.000 SCN
@@ -16026,20 +16915,20 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 679.885 Td
+185.74 576.7049999999999 Td
/F5.0 11 Tf
-<ca20202020202020> Tj
+<6e756c6c> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
-103.24000000000001 679.885 Td
+207.74 576.7049999999999 Td
/F5.0 11 Tf
-<2273756263617465676f727922> Tj
+<2c> Tj
ET
0.000 0.000 0.000 SCN
@@ -16048,42 +16937,42 @@ ET
0.200 0.200 0.200 SCN
BT
-174.74 679.885 Td
+59.24 561.9649999999999 Td
/F5.0 11 Tf
-<20> Tj
+<ca20202020202020> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.651 0.090 0.090 scn
-0.651 0.090 0.090 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
-180.24 679.885 Td
+103.24000000000001 561.9649999999999 Td
/F5.0 11 Tf
-<3a> 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.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
-185.74 679.885 Td
+108.74000000000001 561.9649999999999 Td
/F5.0 11 Tf
-<20> Tj
+<646f63> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
-191.24 679.885 Td
+125.24000000000001 561.9649999999999 Td
/F5.0 11 Tf
-<2253686f7070696e6722> Tj
+<22> Tj
ET
0.000 0.000 0.000 SCN
@@ -16092,9 +16981,9 @@ ET
0.200 0.200 0.200 SCN
BT
-246.24 679.885 Td
+130.74 561.9649999999999 Td
/F5.0 11 Tf
-<2c> Tj
+<20> Tj
ET
0.000 0.000 0.000 SCN
@@ -16103,20 +16992,9 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 665.145 Td
-/F5.0 11 Tf
-<ca20202020202020> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
-
-BT
-103.24000000000001 665.145 Td
+136.24 561.9649999999999 Td
/F5.0 11 Tf
-<22636f6d706c65746522> Tj
+<3a> Tj
ET
0.000 0.000 0.000 SCN
@@ -16125,20 +17003,20 @@ ET
0.200 0.200 0.200 SCN
BT
-158.24 665.145 Td
+141.74 561.9649999999999 Td
/F5.0 11 Tf
<20> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.651 0.090 0.090 scn
-0.651 0.090 0.090 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
-163.74 665.145 Td
+147.24 561.9649999999999 Td
/F5.0 11 Tf
-<3a> Tj
+<6e756c6c> Tj
ET
0.000 0.000 0.000 SCN
@@ -16147,20 +17025,20 @@ ET
0.200 0.200 0.200 SCN
BT
-169.24 665.145 Td
+59.24 547.2249999999999 Td
/F5.0 11 Tf
-<20> Tj
+<ca202020> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
-174.74 665.145 Td
-/F6.0 11 Tf
-<66616c7365> Tj
+81.24000000000001 547.2249999999999 Td
+/F5.0 11 Tf
+<7d> Tj
ET
0.000 0.000 0.000 SCN
@@ -16169,7 +17047,7 @@ ET
0.200 0.200 0.200 SCN
BT
-202.24 665.145 Td
+86.74000000000001 547.2249999999999 Td
/F5.0 11 Tf
<2c> Tj
ET
@@ -16180,42 +17058,42 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 650.405 Td
+59.24 532.4849999999999 Td
/F5.0 11 Tf
-<ca20202020202020> Tj
+<ca202020> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
-103.24000000000001 650.405 Td
+81.24000000000001 532.4849999999999 Td
/F5.0 11 Tf
-<2276657273696f6e53657175656e636522> 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.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
-196.74 650.405 Td
+86.74000000000001 532.4849999999999 Td
/F5.0 11 Tf
-<20> Tj
+<6c696e6b73> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.651 0.090 0.090 scn
-0.651 0.090 0.090 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
-202.24 650.405 Td
+114.24000000000001 532.4849999999999 Td
/F5.0 11 Tf
-<3a> Tj
+<22> Tj
ET
0.000 0.000 0.000 SCN
@@ -16224,31 +17102,20 @@ ET
0.200 0.200 0.200 SCN
BT
-207.74 650.405 Td
+119.74000000000001 532.4849999999999 Td
/F5.0 11 Tf
<20> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.000 0.867 scn
-0.000 0.000 0.867 SCN
-
-BT
-213.24 650.405 Td
-/F6.0 11 Tf
-<31> 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
-218.74 650.405 Td
+125.24000000000001 532.4849999999999 Td
/F5.0 11 Tf
-<2c> Tj
+<3a> Tj
ET
0.000 0.000 0.000 SCN
@@ -16257,20 +17124,20 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 635.665 Td
+130.74 532.4849999999999 Td
/F5.0 11 Tf
-<ca20202020202020> Tj
+<20> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
-103.24000000000001 635.665 Td
+136.24 532.4849999999999 Td
/F5.0 11 Tf
-<2272656c61746976655072696f7269747922> Tj
+<5b> Tj
ET
0.000 0.000 0.000 SCN
@@ -16279,20 +17146,20 @@ ET
0.200 0.200 0.200 SCN
BT
-202.24 635.665 Td
+59.24 517.7449999999999 Td
/F5.0 11 Tf
-<20> Tj
+<ca20202020202020> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.651 0.090 0.090 scn
-0.651 0.090 0.090 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
-207.74 635.665 Td
+103.24000000000001 517.7449999999999 Td
/F5.0 11 Tf
-<3a> Tj
+<7b> Tj
ET
0.000 0.000 0.000 SCN
@@ -16301,53 +17168,42 @@ ET
0.200 0.200 0.200 SCN
BT
-213.24 635.665 Td
+59.24 503.00499999999994 Td
/F5.0 11 Tf
-<20> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.000 0.000 0.867 scn
-0.000 0.000 0.867 SCN
-
-BT
-218.74 635.665 Td
-/F6.0 11 Tf
-<32> Tj
+<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.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
-224.24 635.665 Td
+125.24000000000001 503.00499999999994 Td
/F5.0 11 Tf
-<2c> 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.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
-59.24 620.925 Td
+130.74 503.00499999999994 Td
/F5.0 11 Tf
-<ca20202020202020> Tj
+<72656c> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
-103.24000000000001 620.925 Td
+147.24 503.00499999999994 Td
/F5.0 11 Tf
-<22647565427922> Tj
+<22> Tj
ET
0.000 0.000 0.000 SCN
@@ -16356,18 +17212,18 @@ ET
0.200 0.200 0.200 SCN
BT
-141.74 620.925 Td
+152.74 503.00499999999994 Td
/F5.0 11 Tf
<20> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.651 0.090 0.090 scn
-0.651 0.090 0.090 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
-147.24 620.925 Td
+158.24 503.00499999999994 Td
/F5.0 11 Tf
<3a> Tj
ET
@@ -16378,53 +17234,53 @@ ET
0.200 0.200 0.200 SCN
BT
-152.74 620.925 Td
+163.74 503.00499999999994 Td
/F5.0 11 Tf
<20> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
BT
-158.24 620.925 Td
+169.24 503.00499999999994 Td
/F5.0 11 Tf
-<22323031342d31302d323722> 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
-224.24 620.925 Td
+174.74 503.00499999999994 Td
/F5.0 11 Tf
-<2c> Tj
+<73656c66> 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 606.185 Td
+196.74 503.00499999999994 Td
/F5.0 11 Tf
-<ca20202020202020> Tj
+<22> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
-103.24000000000001 606.185 Td
+202.24 503.00499999999994 Td
/F5.0 11 Tf
-<22636f737422> Tj
+<2c> Tj
ET
0.000 0.000 0.000 SCN
@@ -16433,42 +17289,42 @@ ET
0.200 0.200 0.200 SCN
BT
-136.24 606.185 Td
+59.24 488.26499999999993 Td
/F5.0 11 Tf
-<20> Tj
+<ca2020202020202020202020> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.651 0.090 0.090 scn
-0.651 0.090 0.090 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
-141.74 606.185 Td
+125.24000000000001 488.26499999999993 Td
/F5.0 11 Tf
-<3a> 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.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
-147.24 606.185 Td
+130.74 488.26499999999993 Td
/F5.0 11 Tf
-<20> Tj
+<68726566> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
-152.74 606.185 Td
+152.74 488.26499999999993 Td
/F5.0 11 Tf
-<22302e373522> Tj
+<22> Tj
ET
0.000 0.000 0.000 SCN
@@ -16477,9 +17333,9 @@ ET
0.200 0.200 0.200 SCN
BT
-185.74 606.185 Td
+158.24 488.26499999999993 Td
/F5.0 11 Tf
-<2c> Tj
+<20> Tj
ET
0.000 0.000 0.000 SCN
@@ -16488,20 +17344,9 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 591.4449999999999 Td
-/F5.0 11 Tf
-<ca20202020202020> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
-
-BT
-103.24000000000001 591.4449999999999 Td
+163.74 488.26499999999993 Td
/F5.0 11 Tf
-<226e6f74657322> Tj
+<3a> Tj
ET
0.000 0.000 0.000 SCN
@@ -16510,42 +17355,42 @@ ET
0.200 0.200 0.200 SCN
BT
-141.74 591.4449999999999 Td
+169.24 488.26499999999993 Td
/F5.0 11 Tf
<20> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.651 0.090 0.090 scn
-0.651 0.090 0.090 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
BT
-147.24 591.4449999999999 Td
+174.74 488.26499999999993 Td
/F5.0 11 Tf
-<3a> 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
-152.74 591.4449999999999 Td
+180.24 488.26499999999993 Td
/F5.0 11 Tf
-<20> Tj
+<687474703a2f2f6c6f63616c686f73743a383038302f7265737466756c2f6f626a656374732f544f444f2f30> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
BT
-158.24 591.4449999999999 Td
-/F6.0 11 Tf
-<6e756c6c> Tj
+422.24 488.26499999999993 Td
+/F5.0 11 Tf
+<22> Tj
ET
0.000 0.000 0.000 SCN
@@ -16554,7 +17399,7 @@ ET
0.200 0.200 0.200 SCN
BT
-180.24 591.4449999999999 Td
+427.74 488.26499999999993 Td
/F5.0 11 Tf
<2c> Tj
ET
@@ -16565,42 +17410,42 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 576.7049999999999 Td
+59.24 473.5249999999999 Td
/F5.0 11 Tf
-<ca20202020202020> Tj
+<ca2020202020202020202020> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
-103.24000000000001 576.7049999999999 Td
+125.24000000000001 473.5249999999999 Td
/F5.0 11 Tf
-<226174746163686d656e7422> 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.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
-169.24 576.7049999999999 Td
+130.74 473.5249999999999 Td
/F5.0 11 Tf
-<20> Tj
+<6d6574686f64> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.651 0.090 0.090 scn
-0.651 0.090 0.090 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
-174.74 576.7049999999999 Td
+163.74 473.5249999999999 Td
/F5.0 11 Tf
-<3a> Tj
+<22> Tj
ET
0.000 0.000 0.000 SCN
@@ -16609,31 +17454,20 @@ ET
0.200 0.200 0.200 SCN
BT
-180.24 576.7049999999999 Td
+169.24 473.5249999999999 Td
/F5.0 11 Tf
<20> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
-
-BT
-185.74 576.7049999999999 Td
-/F6.0 11 Tf
-<6e756c6c> 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
-207.74 576.7049999999999 Td
+174.74 473.5249999999999 Td
/F5.0 11 Tf
-<2c> Tj
+<3a> Tj
ET
0.000 0.000 0.000 SCN
@@ -16642,42 +17476,42 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 561.9649999999999 Td
+180.24 473.5249999999999 Td
/F5.0 11 Tf
-<ca20202020202020> Tj
+<20> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
BT
-103.24000000000001 561.9649999999999 Td
+185.74 473.5249999999999 Td
/F5.0 11 Tf
-<22646f6322> 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
-130.74 561.9649999999999 Td
+191.24 473.5249999999999 Td
/F5.0 11 Tf
-<20> Tj
+<474554> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.651 0.090 0.090 scn
-0.651 0.090 0.090 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
BT
-136.24 561.9649999999999 Td
+207.74 473.5249999999999 Td
/F5.0 11 Tf
-<3a> Tj
+<22> Tj
ET
0.000 0.000 0.000 SCN
@@ -16686,20 +17520,9 @@ ET
0.200 0.200 0.200 SCN
BT
-141.74 561.9649999999999 Td
+213.24 473.5249999999999 Td
/F5.0 11 Tf
-<20> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
-
-BT
-147.24 561.9649999999999 Td
-/F6.0 11 Tf
-<6e756c6c> Tj
+<2c> Tj
ET
0.000 0.000 0.000 SCN
@@ -16708,42 +17531,42 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 547.2249999999999 Td
+59.24 458.7849999999999 Td
/F5.0 11 Tf
-<ca202020> Tj
+<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.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
-81.24000000000001 547.2249999999999 Td
+125.24000000000001 458.7849999999999 Td
/F5.0 11 Tf
-<7d2c> 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.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
-59.24 532.4849999999999 Td
+130.74 458.7849999999999 Td
/F5.0 11 Tf
-<ca202020> Tj
+<74797065> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
-81.24000000000001 532.4849999999999 Td
+152.74 458.7849999999999 Td
/F5.0 11 Tf
-<226c696e6b7322> Tj
+<22> Tj
ET
0.000 0.000 0.000 SCN
@@ -16752,18 +17575,18 @@ ET
0.200 0.200 0.200 SCN
BT
-119.74000000000001 532.4849999999999 Td
+158.24 458.7849999999999 Td
/F5.0 11 Tf
<20> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.651 0.090 0.090 scn
-0.651 0.090 0.090 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
-125.24000000000001 532.4849999999999 Td
+163.74 458.7849999999999 Td
/F5.0 11 Tf
<3a> Tj
ET
@@ -16774,86 +17597,86 @@ ET
0.200 0.200 0.200 SCN
BT
-130.74 532.4849999999999 Td
+169.24 458.7849999999999 Td
/F5.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.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
BT
-136.24 532.4849999999999 Td
+174.74 458.7849999999999 Td
/F5.0 11 Tf
-<5b> 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
-59.24 517.7449999999999 Td
+180.24 458.7849999999999 Td
/F5.0 11 Tf
-<ca20202020202020> Tj
+<6170706c69636174696f6e2f6a736f6e3b70726f66696c653d> 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
-103.24000000000001 517.7449999999999 Td
+317.74 458.7849999999999 Td
/F5.0 11 Tf
-<7b> Tj
+<5c22> 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 503.00499999999994 Td
+328.74 458.7849999999999 Td
/F5.0 11 Tf
-<ca2020202020202020202020> Tj
+<75726e3a6f72672e7265737466756c6f626a656374733a726570722d> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
BT
-125.24000000000001 503.00499999999994 Td
+59.24 444.0449999999999 Td
/F5.0 11 Tf
-<2272656c22> Tj
+<74797065732f6f626a656374> 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
-152.74 503.00499999999994 Td
+125.24000000000001 444.0449999999999 Td
/F5.0 11 Tf
-<20> Tj
+<5c22> 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
-158.24 503.00499999999994 Td
+136.24 444.0449999999999 Td
/F5.0 11 Tf
-<3a> Tj
+<22> Tj
ET
0.000 0.000 0.000 SCN
@@ -16862,53 +17685,53 @@ ET
0.200 0.200 0.200 SCN
BT
-163.74 503.00499999999994 Td
+141.74 444.0449999999999 Td
/F5.0 11 Tf
-<20> Tj
+<2c> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
-169.24 503.00499999999994 Td
+59.24 429.3049999999999 Td
/F5.0 11 Tf
-<2273656c6622> Tj
+<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.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
-202.24 503.00499999999994 Td
+125.24000000000001 429.3049999999999 Td
/F5.0 11 Tf
-<2c> 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.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
-59.24 488.26499999999993 Td
+130.74 429.3049999999999 Td
/F5.0 11 Tf
-<ca2020202020202020202020> Tj
+<7469746c65> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
-125.24000000000001 488.26499999999993 Td
+158.24 429.3049999999999 Td
/F5.0 11 Tf
-<226872656622> Tj
+<22> Tj
ET
0.000 0.000 0.000 SCN
@@ -16917,7 +17740,7 @@ ET
0.200 0.200 0.200 SCN
BT
-158.24 488.26499999999993 Td
+163.74 429.3049999999999 Td
/F5.0 11 Tf
<20> Tj
ET
@@ -16928,7 +17751,7 @@ ET
0.200 0.200 0.200 SCN
BT
-163.74 488.26499999999993 Td
+169.24 429.3049999999999 Td
/F5.0 11 Tf
<3a> Tj
ET
@@ -16939,53 +17762,53 @@ ET
0.200 0.200 0.200 SCN
BT
-169.24 488.26499999999993 Td
+174.74 429.3049999999999 Td
/F5.0 11 Tf
<20> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
BT
-174.74 488.26499999999993 Td
+180.24 429.3049999999999 Td
/F5.0 11 Tf
-<22687474703a2f2f6c6f63616c686f73743a383038302f7265737466756c2f6f626a656374732f544f444f2f3022> 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
-427.74 488.26499999999993 Td
+185.74 429.3049999999999 Td
/F5.0 11 Tf
-<2c> Tj
+<427579206d696c6b2064756520627920323031342d31302d3237> 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 473.5249999999999 Td
+328.74 429.3049999999999 Td
/F5.0 11 Tf
-<ca2020202020202020202020> Tj
+<22> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
-125.24000000000001 473.5249999999999 Td
+59.24 414.5649999999999 Td
/F5.0 11 Tf
-<226d6574686f6422> Tj
+<ca20202020202020> Tj
ET
0.000 0.000 0.000 SCN
@@ -16994,9 +17817,9 @@ ET
0.200 0.200 0.200 SCN
BT
-169.24 473.5249999999999 Td
+103.24000000000001 414.5649999999999 Td
/F5.0 11 Tf
-<20> Tj
+<7d> Tj
ET
0.000 0.000 0.000 SCN
@@ -17005,9 +17828,9 @@ ET
0.200 0.200 0.200 SCN
BT
-174.74 473.5249999999999 Td
+108.74000000000001 414.5649999999999 Td
/F5.0 11 Tf
-<3a> Tj
+<2c> Tj
ET
0.000 0.000 0.000 SCN
@@ -17016,20 +17839,20 @@ ET
0.200 0.200 0.200 SCN
BT
-180.24 473.5249999999999 Td
+59.24 399.8249999999999 Td
/F5.0 11 Tf
-<20> Tj
+<ca20202020202020> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
-185.74 473.5249999999999 Td
+103.24000000000001 399.8249999999999 Td
/F5.0 11 Tf
-<2247455422> Tj
+<7b> Tj
ET
0.000 0.000 0.000 SCN
@@ -17038,31 +17861,42 @@ ET
0.200 0.200 0.200 SCN
BT
-213.24 473.5249999999999 Td
+59.24 385.08499999999987 Td
+/F5.0 11 Tf
+<ca2020202020202020202020> 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
+125.24000000000001 385.08499999999987 Td
/F5.0 11 Tf
-<2c> 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.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
-59.24 458.7849999999999 Td
+130.74 385.08499999999987 Td
/F5.0 11 Tf
-<ca2020202020202020202020> Tj
+<72656c> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
-125.24000000000001 458.7849999999999 Td
+147.24 385.08499999999987 Td
/F5.0 11 Tf
-<227479706522> Tj
+<22> Tj
ET
0.000 0.000 0.000 SCN
@@ -17071,7 +17905,7 @@ ET
0.200 0.200 0.200 SCN
BT
-158.24 458.7849999999999 Td
+152.74 385.08499999999987 Td
/F5.0 11 Tf
<20> Tj
ET
@@ -17082,7 +17916,7 @@ ET
0.200 0.200 0.200 SCN
BT
-163.74 458.7849999999999 Td
+158.24 385.08499999999987 Td
/F5.0 11 Tf
<3a> Tj
ET
@@ -17093,42 +17927,42 @@ ET
0.200 0.200 0.200 SCN
BT
-169.24 458.7849999999999 Td
+163.74 385.08499999999987 Td
/F5.0 11 Tf
<20> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
BT
-174.74 458.7849999999999 Td
+169.24 385.08499999999987 Td
/F5.0 11 Tf
-<226170706c69636174696f6e2f6a736f6e3b70726f66696c653d5c2275726e3a6f72672e7265737466756c6f626a656374733a726570722d> Tj
+<22> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
BT
-59.24 444.0449999999999 Td
+174.74 385.08499999999987 Td
/F5.0 11 Tf
-<74797065732f6f626a6563745c2222> Tj
+<6465736372696265646279> 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
-141.74 444.0449999999999 Td
+235.24 385.08499999999987 Td
/F5.0 11 Tf
-<2c> Tj
+<22> Tj
ET
0.000 0.000 0.000 SCN
@@ -17137,20 +17971,9 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 429.3049999999999 Td
-/F5.0 11 Tf
-<ca2020202020202020202020> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
-
-BT
-125.24000000000001 429.3049999999999 Td
+240.74 385.08499999999987 Td
/F5.0 11 Tf
-<227469746c6522> Tj
+<2c> Tj
ET
0.000 0.000 0.000 SCN
@@ -17159,42 +17982,42 @@ ET
0.200 0.200 0.200 SCN
BT
-163.74 429.3049999999999 Td
+59.24 370.34499999999986 Td
/F5.0 11 Tf
-<20> Tj
+<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.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
-169.24 429.3049999999999 Td
+125.24000000000001 370.34499999999986 Td
/F5.0 11 Tf
-<3a> 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.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
-174.74 429.3049999999999 Td
+130.74 370.34499999999986 Td
/F5.0 11 Tf
-<20> Tj
+<68726566> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
-180.24 429.3049999999999 Td
+152.74 370.34499999999986 Td
/F5.0 11 Tf
-<22427579206d696c6b2064756520627920323031342d31302d323722> Tj
+<22> Tj
ET
0.000 0.000 0.000 SCN
@@ -17203,9 +18026,9 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 414.5649999999999 Td
+158.24 370.34499999999986 Td
/F5.0 11 Tf
-<ca20202020202020> Tj
+<20> Tj
ET
0.000 0.000 0.000 SCN
@@ -17214,9 +18037,9 @@ ET
0.200 0.200 0.200 SCN
BT
-103.24000000000001 414.5649999999999 Td
+163.74 370.34499999999986 Td
/F5.0 11 Tf
-<7d2c> Tj
+<3a> Tj
ET
0.000 0.000 0.000 SCN
@@ -17225,42 +18048,42 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 399.8249999999999 Td
+169.24 370.34499999999986 Td
/F5.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.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
BT
-103.24000000000001 399.8249999999999 Td
+174.74 370.34499999999986 Td
/F5.0 11 Tf
-<7b> 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
-59.24 385.08499999999987 Td
+180.24 370.34499999999986 Td
/F5.0 11 Tf
-<ca2020202020202020202020> Tj
+<687474703a2f2f6c6f63616c686f73743a383038302f7265737466756c2f646f6d61696e2d74797065732f544f444f> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
BT
-125.24000000000001 385.08499999999987 Td
+438.74 370.34499999999986 Td
/F5.0 11 Tf
-<2272656c22> Tj
+<22> Tj
ET
0.000 0.000 0.000 SCN
@@ -17269,9 +18092,9 @@ ET
0.200 0.200 0.200 SCN
BT
-152.74 385.08499999999987 Td
+444.24 370.34499999999986 Td
/F5.0 11 Tf
-<20> Tj
+<2c> Tj
ET
0.000 0.000 0.000 SCN
@@ -17280,42 +18103,42 @@ ET
0.200 0.200 0.200 SCN
BT
-158.24 385.08499999999987 Td
+59.24 355.60499999999985 Td
/F5.0 11 Tf
-<3a> Tj
+<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.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
-163.74 385.08499999999987 Td
+125.24000000000001 355.60499999999985 Td
/F5.0 11 Tf
-<20> Tj
+<22> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
-169.24 385.08499999999987 Td
+130.74 355.60499999999985 Td
/F5.0 11 Tf
-<22646573637269626564627922> Tj
+<6d6574686f64> 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
-240.74 385.08499999999987 Td
+163.74 355.60499999999985 Td
/F5.0 11 Tf
-<2c> Tj
+<22> Tj
ET
0.000 0.000 0.000 SCN
@@ -17324,20 +18147,20 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 370.34499999999986 Td
+169.24 355.60499999999985 Td
/F5.0 11 Tf
-<ca2020202020202020202020> Tj
+<20> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
-125.24000000000001 370.34499999999986 Td
+174.74 355.60499999999985 Td
/F5.0 11 Tf
-<226872656622> Tj
+<3a> Tj
ET
0.000 0.000 0.000 SCN
@@ -17346,42 +18169,42 @@ ET
0.200 0.200 0.200 SCN
BT
-158.24 370.34499999999986 Td
+180.24 355.60499999999985 Td
/F5.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.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
BT
-163.74 370.34499999999986 Td
+185.74 355.60499999999985 Td
/F5.0 11 Tf
-<3a> 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
-169.24 370.34499999999986 Td
+191.24 355.60499999999985 Td
/F5.0 11 Tf
-<20> Tj
+<474554> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
BT
-174.74 370.34499999999986 Td
+207.74 355.60499999999985 Td
/F5.0 11 Tf
-<22687474703a2f2f6c6f63616c686f73743a383038302f7265737466756c2f646f6d61696e2d74797065732f544f444f22> Tj
+<22> Tj
ET
0.000 0.000 0.000 SCN
@@ -17390,7 +18213,7 @@ ET
0.200 0.200 0.200 SCN
BT
-444.24 370.34499999999986 Td
+213.24 355.60499999999985 Td
/F5.0 11 Tf
<2c> Tj
ET
@@ -17401,42 +18224,42 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 355.60499999999985 Td
+59.24 340.86499999999984 Td
/F5.0 11 Tf
<ca2020202020202020202020> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
-125.24000000000001 355.60499999999985 Td
+125.24000000000001 340.86499999999984 Td
/F5.0 11 Tf
-<226d6574686f6422> 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.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
-169.24 355.60499999999985 Td
+130.74 340.86499999999984 Td
/F5.0 11 Tf
-<20> Tj
+<74797065> 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
-174.74 355.60499999999985 Td
+152.74 340.86499999999984 Td
/F5.0 11 Tf
-<3a> Tj
+<22> Tj
ET
0.000 0.000 0.000 SCN
@@ -17445,20 +18268,20 @@ ET
0.200 0.200 0.200 SCN
BT
-180.24 355.60499999999985 Td
+158.24 340.86499999999984 Td
/F5.0 11 Tf
<20> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
-185.74 355.60499999999985 Td
+163.74 340.86499999999984 Td
/F5.0 11 Tf
-<2247455422> Tj
+<3a> Tj
ET
0.000 0.000 0.000 SCN
@@ -17467,86 +18290,86 @@ ET
0.200 0.200 0.200 SCN
BT
-213.24 355.60499999999985 Td
+169.24 340.86499999999984 Td
/F5.0 11 Tf
-<2c> 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.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
BT
-59.24 340.86499999999984 Td
+174.74 340.86499999999984 Td
/F5.0 11 Tf
-<ca2020202020202020202020> Tj
+<22> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
BT
-125.24000000000001 340.86499999999984 Td
+180.24 340.86499999999984 Td
/F5.0 11 Tf
-<227479706522> Tj
+<6170706c69636174696f6e2f6a736f6e3b70726f66696c653d> 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
-158.24 340.86499999999984 Td
+317.74 340.86499999999984 Td
/F5.0 11 Tf
-<20> Tj
+<5c22> 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
-163.74 340.86499999999984 Td
+328.74 340.86499999999984 Td
/F5.0 11 Tf
-<3a> Tj
+<75726e3a6f72672e7265737466756c6f626a656374733a726570722d> 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
-169.24 340.86499999999984 Td
+59.24 326.12499999999983 Td
/F5.0 11 Tf
-<20> Tj
+<74797065732f646f6d61696e2d74797065> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
BT
-174.74 340.86499999999984 Td
+152.74 326.12499999999983 Td
/F5.0 11 Tf
-<226170706c69636174696f6e2f6a736f6e3b70726f66696c653d5c2275726e3a6f72672e7265737466756c6f626a656374733a726570722d> Tj
+<5c22> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
BT
-59.24 326.12499999999983 Td
+163.74 326.12499999999983 Td
/F5.0 11 Tf
-<74797065732f646f6d61696e2d747970655c2222> Tj
+<22> Tj
ET
0.000 0.000 0.000 SCN
@@ -17590,7 +18413,18 @@ ET
BT
81.24000000000001 296.6449999999998 Td
/F5.0 11 Tf
-<5d2c> Tj
+<5d> 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
+86.74000000000001 296.6449999999998 Td
+/F5.0 11 Tf
+<2c> Tj
ET
0.000 0.000 0.000 SCN
@@ -17606,13 +18440,35 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
81.24000000000001 281.9049999999998 Td
/F5.0 11 Tf
-<22657874656e73696f6e7322> 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
+
+BT
+86.74000000000001 281.9049999999998 Td
+/F5.0 11 Tf
+<657874656e73696f6e73> 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
+141.74 281.9049999999998 Td
+/F5.0 11 Tf
+<22> Tj
ET
0.000 0.000 0.000 SCN
@@ -17628,8 +18484,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.651 0.090 0.090 scn
-0.651 0.090 0.090 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
152.74 281.9049999999998 Td
@@ -17672,13 +18528,35 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
103.24000000000001 267.16499999999985 Td
/F5.0 11 Tf
-<226f696422> 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
+
+BT
+108.74000000000001 267.16499999999985 Td
+/F5.0 11 Tf
+<6f6964> 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
+125.24000000000001 267.16499999999985 Td
+/F5.0 11 Tf
+<22> Tj
ET
0.000 0.000 0.000 SCN
@@ -17694,8 +18572,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.651 0.090 0.090 scn
-0.651 0.090 0.090 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
136.24 267.16499999999985 Td
@@ -17716,13 +18594,35 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
BT
147.24 267.16499999999985 Td
/F5.0 11 Tf
-<22544f444f3a3022> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+152.74 267.16499999999985 Td
+/F5.0 11 Tf
+<544f444f3a30> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+185.74 267.16499999999985 Td
+/F5.0 11 Tf
+<22> Tj
ET
0.000 0.000 0.000 SCN
@@ -17744,7 +18644,18 @@ ET
BT
81.24000000000001 252.42499999999984 Td
/F5.0 11 Tf
-<7d2c> Tj
+<7d> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+86.74000000000001 252.42499999999984 Td
+/F5.0 11 Tf
+<2c> Tj
ET
0.000 0.000 0.000 SCN
@@ -17784,23 +18695,22 @@ Q
endstream
endobj
-141 0 obj
+140 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 140 0 R
+/Contents 139 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/Font << /F5.0 53 0 R
-/F6.0 68 0 R
/F1.0 8 0 R
>>
-/XObject << /Stamp1 199 0 R
+/XObject << /Stamp1 198 0 R
>>
>>
>>
endobj
-142 0 obj
-<< /Length 15517
+141 0 obj
+<< /Length 16537
>>
stream
q
@@ -18077,12 +18987,12 @@ f
h
S
Q
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
59.24 399.1050000000003 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
<7075626c6963> Tj
ET
@@ -18099,12 +19009,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
BT
97.74000000000001 399.1050000000003 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
<636c617373> Tj
ET
@@ -18121,12 +19031,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
BT
130.74 399.1050000000003 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
<437573746f6d657253657276696365> Tj
ET
@@ -18165,12 +19075,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
81.24000000000001 384.3650000000003 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
<7075626c6963> Tj
ET
@@ -18186,9 +19096,9 @@ BT
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.000 0.000 scn
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
BT
119.74000000000001 384.3650000000003 Td
@@ -18226,7 +19136,18 @@ ET
BT
169.24 384.3650000000003 Td
/F5.0 11 Tf
-<2829> 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
+
+BT
+174.74 384.3650000000003 Td
+/F5.0 11 Tf
+<29> Tj
ET
0.000 0.000 0.000 SCN
@@ -18264,12 +19185,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000
<TRUNCATED>
[02/44] isis-site git commit: ISIS-1594: provide an 'edit' button
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/83a3755a/content/screencasts.html
----------------------------------------------------------------------
diff --git a/content/screencasts.html b/content/screencasts.html
index 16e1731..12f0aa5 100644
--- a/content/screencasts.html
+++ b/content/screencasts.html
@@ -1,12 +1,10 @@
<!doctype html>
<html class="no-js" lang="en">
-<head>
- <meta charset="utf-8"/>
- <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-
- <title>Screencasts</title>
-
- <!--
+ <head>
+ <meta charset="utf-8">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+ <title>Screencasts</title>
+ <!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
@@ -23,31 +21,21 @@
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
- -->
-
- <!-- No caching headers -->
- <meta http-equiv="cache-control" content="no-cache" />
- <meta http-equiv="pragma" content="no-cache" />
- <meta http-equiv="expires" content="-1" />
-
-
- <!-- TODO: need to (re)instate CDN in the future (not using for now just so can develop off-line -->
- <link href="./css/foundation/5.5.1/foundation.css" rel="stylesheet" />
- <script src="./js/foundation/5.5.1/vendor/modernizr.js"></script>
- <link href="./css/asciidoctor/colony.css" rel="stylesheet">
- <link href="./css/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet">
-
-
-
-
- <link href="./css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.css" rel="stylesheet" />
- <!--[if lt IE 9]>
+ -->
+ <!-- No caching headers -->
+ <meta http-equiv="cache-control" content="no-cache">
+ <meta http-equiv="pragma" content="no-cache">
+ <meta http-equiv="expires" content="-1">
+ <!-- TODO: need to (re)instate CDN in the future (not using for now just so can develop off-line -->
+ <link href="./css/foundation/5.5.1/foundation.css" rel="stylesheet">
+ <script src="./js/foundation/5.5.1/vendor/modernizr.js"></script>
+ <link href="./css/asciidoctor/colony.css" rel="stylesheet">
+ <link href="./css/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet">
+ <link href="./css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.css" rel="stylesheet">
+ <!--[if lt IE 9]>
<link href="./css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.ie.css" rel="stylesheet" />
- <![endif]-->
-
-
-
- <style type="text/css">
+ <![endif]-->
+ <style type="text/css">
pre code {
background-color: inherit;
border-style: none;
@@ -192,9 +180,8 @@ table.CodeRay td.code>pre{padding:0}
color:#fff;
font-size: 1.1em;
}
- </style>
-
- <style>
+ </style>
+ <style>
@media only screen and (min-width: 40.063em) {
.top-bar {
.contain-to-grid .top-bar {
@@ -205,9 +192,8 @@ table.CodeRay td.code>pre{padding:0}
.row {
max-width: 80rem;
}
- </style>
-
- <style>
+ </style>
+ <style>
.extended-quote,
.extended-quote-first {
margin-left: 40px;
@@ -231,9 +217,8 @@ table.CodeRay td.code>pre{padding:0}
text-shadow: 0 1px 2px rgba(0, 0, 0, 0.1);
}
- </style>
-
- <style>
+ </style>
+ <style>
body {
position: relative;
}
@@ -255,6 +240,7 @@ table.CodeRay td.code>pre{padding:0}
div#doc-content {
margin-top: 30px;
+ padding-top: 30px;
}
div.documentation-page table.frame-all {
@@ -286,9 +272,8 @@ table.CodeRay td.code>pre{padding:0}
min-height: 2000px;
}
- </style>
-
- <style>
+ </style>
+ <style>
@media only screen and (min-width: 768px) {
#toc.toc2 ul ul { margin-left: -10px; }
@@ -316,15 +301,13 @@ table.CodeRay td.code>pre{padding:0}
body div#toc2 li.tocify-item.active a {
color: red;
}
- </style>
-
- <style>
+ </style>
+ <style>
footer {
margin-top: 1000px;
}
- </style>
-
- <style>
+ </style>
+ <style>
/* overriding colony.css stylesheet */
.literalblock pre, .literalblock pre[class], .listingblock pre, .listingblock pre[class] {
/*padding: 1.25em 1.5625em 1.125em 1.5625em;*/
@@ -372,9 +355,8 @@ table.CodeRay td.code>pre{padding:0}
.imageblock img {
margin-bottom: 10px;
}
- </style>
-
- <style>
+ </style>
+ <style>
/* from http://ben.balter.com/2014/03/13/pages-anchor-links/ */
.header-link {
position: absolute;
@@ -395,9 +377,8 @@ table.CodeRay td.code>pre{padding:0}
h6:hover .header-link {
opacity: 1;
}
- </style>
-
- <style>
+ </style>
+ <style>
.top-bar
{
-webkit-transition-duration: .5s;
@@ -425,2518 +406,4262 @@ table.CodeRay td.code>pre{padding:0}
-webkit-transition-property: -webkit-transform;
transition-property: transform;
}
- </style>
-
- <style>
+ </style>
+ <style>
#doc-content a.guide {
color: white;
}
- </style>
-
- <style>
+ </style>
+ <style>
+ .tocify {
+ margin-top: 80px;
+ }
+ </style>
+ <style>
.tocify {
margin-top: 80px;
}
- </style>
-
-
-</script>
-
-</head>
-<body>
-
-<<div class="github-fork-ribbon-wrapper right" style="position: fixed;">
- <div class="github-fork-ribbon">
- <a href="https://github.com/apache/isis#fork-destination-box">Fork me on GitHub</a>
- </div>
-</div>
-
-
-<div class="row">
-
- <div class="fixed contain-to-grid header">
- <nav class="top-bar" data-topbar role="navigation" style="max-width: 80rem">
- <ul class="title-area">
- <li class="name">
- <h1>
- <a href="/index.html">Apache Isis™</a>
- </h1>
- </li>
- <!-- Remove the class "menu-icon" to get rid of menu icon. Take out "Menu" to just have icon alone -->
- <li class="toggle-topbar menu-icon"><a href="#"><span>Menu</span></a></li>
- </ul>
-
- <section class="top-bar-section">
- <ul class="right">
-
- <li class="has-form">
- <FORM class="searchbox navbar-form navbar-right" id="searchbox_012614087480249044419:dn-q5gtwxya" action="http://www.google.com/cse">
- <div class="row collapse">
- <input type="hidden" name="cx" value="012614087480249044419:dn-q5gtwxya">
- <INPUT type="hidden" name="cof" value="FORID:0">
- <INPUT class="form-control" name="q" type="text" placeholder="Search">
- </div>
- </FORM>
- </li>
-
- </ul>
-
- <!-- Left Nav Section -->
- <ul class="left">
-
- <li><a href="/documentation.html">Documentation</a></li>
- <li><a href="/downloads.html">Downloads</a></li>
- <li><a href="/help.html">Help</a></li>
- <li><a href="/asf.html">@ASF</a></li>
-
- </ul>
-
- </section>
- </nav>
- </div>
-</div>
-
-<div class="row">
-
- <div id="doc-content-left" class="large-9 medium-9 columns">
-
-
- <div id="doc-content">
- <div class="paragraph">
-<p><br/><br/></p>
-</div>
-<div class="paragraph">
-<p>We’ve prepared a number of screencasts to help you see what Apache Isis has to offer; the following were recorded using Apache Isis v1.12.x.</p>
-</div>
-<div class="paragraph">
-<p>While these each follow on from each other, you should be able to watch them in any order; the typical duration is
-3 minutes. the number of each screencast (eg '<a href="https://www.youtube.com/watch?v=OTNHR5EdAs8" target="_blank">001</a>') is a link over
-to youtube.</p>
-</div>
-<div class="paragraph">
-<p>Or, if you have a little more time, you can watch the screencasts by playlist. You can either watch
-<a href="https://www.youtube.com/playlist?list=PLbRpnAmQ6xsA-m4d2iwAuWrX1icJz0SnM">ALL</a> of them one after the other, or you
-can use one of the themed playlists to explore particular aspects of the framework. The table below indicates which screencasts are in which playlist.</p>
-</div>
-<div class="paragraph">
-<p>There are some screencasts relating to the Apache Isis documentation: <a href="https://www.youtube.com/watch?v=vJYeuVfrctc" target="_blank">using/searching</a> docs, and <a href="https://www.youtube.com/watch?v=RQ_FFYd7npU" target="_blank">contributing patches/editing </a>.</p>
-</div>
-<div class="paragraph">
-<p>Finally, you can also find some screencasts for earlier versions of the framework <a href="./screencasts-older.html">here</a>.</p>
-</div>
-<table class="tableblock frame-all grid-all spread">
-<colgroup>
-<col style="width: 15.3846%;">
-<col style="width: 7.6923%;">
-<col style="width: 7.6923%;">
-<col style="width: 7.6923%;">
-<col style="width: 7.6923%;">
-<col style="width: 7.6923%;">
-<col style="width: 7.6923%;">
-<col style="width: 7.6923%;">
-<col style="width: 7.6923%;">
-<col style="width: 7.6923%;">
-<col style="width: 7.6923%;">
-<col style="width: 7.6924%;">
-</colgroup>
-<tbody>
-<tr>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top" colspan="11"><div><div class="paragraph">
-<p><span class="big"><strong>Playlists</strong></span></p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top" colspan="12"><div><div class="paragraph">
-<p><span class="big"><strong>Archetype, IDE, layouts</strong></span></p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=OTNHR5EdAs8&list=PLbRpnAmQ6xsBGB_mRAUob8WRBsSL_IsBO">Basic</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=pH02g0l2GKY&list=PLbRpnAmQ6xsDjiy7vxKMB35ZKziuF6Aj8">Test</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=xVTjtiJM8XM&list=PLbRpnAmQ6xsAcWmFO5WgK9XWylNR-Fwut">End-<br>
-user</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=KCJ1ZPPB3pA&list=PLbRpnAmQ6xsBFovjRmBTku5tTUYYdoI9u">Layout</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=AXuxULuRtm0&list=PLbRpnAmQ6xsDOfBbGIpIBQsXcR6snkkQ8">Add-<br>
-ons</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=7ToRKBOeemM&list=PLbRpnAmQ6xsB4AopkyXgU3SkHK0bOwXDf">Design</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=3n_70HJ23uY&list=PLbRpnAmQ6xsDwGTagOtuh5RAwVlqwwbPd">DB</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=6GPtec5Hu5Q&list=PLbRpnAmQ6xsADOku9ewo08h-E-_Qf10vg">Dev</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=dfRZeYqzMtI&list=PLbRpnAmQ6xsDKK0dXmJsmKvp9X7iJsfsG">Prog<br>
-mdl</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=lkZxRSS0Zwg&list=PLbRpnAmQ6xsCHI10N1s25mWAHbAz5diHf">Misc</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/playlist?list=PLbRpnAmQ6xsA6NZtY0kW9epG9VclXl6e2">Con-<br>
-trib</a></p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=RQ_FFYd7npU" target="_blank">000</a><br>
-Searching and using the Apache Isis docs</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>x</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></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><a href="https://www.youtube.com/watch?v=OTNHR5EdAs8" target="_blank">001</a><br>
-Generating an app using the <a href="guides/ugfun.html#_ugfun_getting-started_simpleapp-archetype">SimpleApp archetype</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>x</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></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><a href="https://www.youtube.com/watch?v=6GPtec5Hu5Q" target="_blank">002</a><br>
-Importing the generated app into an <a href="guides/dg.html#_dg_ide">IDE</a><br></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>x</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>x</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></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><a href="https://www.youtube.com/watch?v=xVTjtiJM8XM" target="_blank">003</a><br>
-Walking through the main classes that make up the SimpleApp: <code>SimpleObject</code> persistent entity, <code>HomePageViewModel</code> <a href="guides/ugbtb.html#_ugbtb_view-models">view model</a> and <code>SimpleObjects</code> domain service (repository).</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>x</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></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><a href="https://www.youtube.com/watch?v=KCJ1ZPPB3pA" target="_blank">004</a><br>
-Using the optional <code>Xxx.layout.xml</code> file to provide <a href="guides/ugfun.html#_ugfun_object-layout_dynamic_xml">layout metadata</a> to dynamically render a domain object using the <a href="http://getbootstrap.com">Bootstrap 3</a> grid system.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>x</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top" colspan="12"><div><div class="paragraph">
-<p><span class="big"><strong>Fixture scripts, rules, tests</strong></span></p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=OTNHR5EdAs8&list=PLbRpnAmQ6xsBGB_mRAUob8WRBsSL_IsBO">Basic</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=pH02g0l2GKY&list=PLbRpnAmQ6xsDjiy7vxKMB35ZKziuF6Aj8">Test</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=xVTjtiJM8XM&list=PLbRpnAmQ6xsAcWmFO5WgK9XWylNR-Fwut">End-<br>
-user</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=KCJ1ZPPB3pA&list=PLbRpnAmQ6xsBFovjRmBTku5tTUYYdoI9u">Layout</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=AXuxULuRtm0&list=PLbRpnAmQ6xsDOfBbGIpIBQsXcR6snkkQ8">Add-<br>
-ons</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=7ToRKBOeemM&list=PLbRpnAmQ6xsB4AopkyXgU3SkHK0bOwXDf">Design</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=3n_70HJ23uY&list=PLbRpnAmQ6xsDwGTagOtuh5RAwVlqwwbPd">DB</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=6GPtec5Hu5Q&list=PLbRpnAmQ6xsADOku9ewo08h-E-_Qf10vg">Dev</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=dfRZeYqzMtI&list=PLbRpnAmQ6xsDKK0dXmJsmKvp9X7iJsfsG">Prog<br>
-mdl</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=lkZxRSS0Zwg&list=PLbRpnAmQ6xsCHI10N1s25mWAHbAz5diHf">Misc</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/playlist?list=PLbRpnAmQ6xsA6NZtY0kW9epG9VclXl6e2">Con-<br>
-trib</a></p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=pH02g0l2GKY" target="_blank">005</a><br>
-Using <a href="guides/ugtst.html#_ugtst_fixture-scripts">fixture scripts</a> to initialize the database, eg while prototyping and for demos</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>x</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></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><a href="https://www.youtube.com/watch?v=dXtmxmYxa30" target="_blank">006</a><br>
-Implementing <a href="guides/ugfun.html#_ugfun_how-tos_business-rules">business rules</a>for domain object members, using supporting methods ("see it, use it, do it")</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>x</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></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><a href="https://www.youtube.com/watch?v=imHfxQGUgV8" target="_blank">007</a><br>
-Writing <a href="guides/ugtst.html#_ugtst_unit-test-support">unit tests</a> for a domain object responsibility</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>x</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></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><a href="https://www.youtube.com/watch?v=-lAt4UWiBjE" target="_blank">008</a><br>
-Writing end-to-end <a href="guides/ugtst.html#_ugtst_integ-test-support">integration tests</a> for a domain object responsibility</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>x</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top" colspan="12"><div><div class="paragraph">
-<p><span class="big"><strong>Swagger UI, Maven plugin</strong></span></p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=OTNHR5EdAs8&list=PLbRpnAmQ6xsBGB_mRAUob8WRBsSL_IsBO">Basic</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=pH02g0l2GKY&list=PLbRpnAmQ6xsDjiy7vxKMB35ZKziuF6Aj8">Test</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=xVTjtiJM8XM&list=PLbRpnAmQ6xsAcWmFO5WgK9XWylNR-Fwut">End-<br>
-user</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=KCJ1ZPPB3pA&list=PLbRpnAmQ6xsBFovjRmBTku5tTUYYdoI9u">Layout</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=AXuxULuRtm0&list=PLbRpnAmQ6xsDOfBbGIpIBQsXcR6snkkQ8">Add-<br>
-ons</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=7ToRKBOeemM&list=PLbRpnAmQ6xsB4AopkyXgU3SkHK0bOwXDf">Design</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=3n_70HJ23uY&list=PLbRpnAmQ6xsDwGTagOtuh5RAwVlqwwbPd">DB</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=6GPtec5Hu5Q&list=PLbRpnAmQ6xsADOku9ewo08h-E-_Qf10vg">Dev</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=dfRZeYqzMtI&list=PLbRpnAmQ6xsDKK0dXmJsmKvp9X7iJsfsG">Prog<br>
-mdl</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=lkZxRSS0Zwg&list=PLbRpnAmQ6xsCHI10N1s25mWAHbAz5diHf">Misc</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/playlist?list=PLbRpnAmQ6xsA6NZtY0kW9epG9VclXl6e2">Con-<br>
-trib</a></p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=lkZxRSS0Zwg" target="_blank">009</a><br>
-Using the Swagger UI to access the <a href="guides/ugvro.html">REST API</a> automatically exposed for domain services, entities, and/or view models</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>x</p>
-</div></div></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><a href="https://www.youtube.com/watch?v=yOh3WphhR1E" target="_blank">010</a><br>
-Using the <a href="#guides/rgmvn.adoc">Apache Isis maven plugin</a> to validate domain object models during the build process (rather than at runtime).</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>x</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top" colspan="12"><div><div class="paragraph">
-<p><span class="big"><strong>App Manifest</strong></span></p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=1sNiR3Y84c0" target="_blank">011</a><br>
-How the framework uses the <a href="guides/rgcms.html#_rgcms_classes_AppManifest-bootstrapping"><code>AppManifest</code></a> is used to bootstrap the application</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>x</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top" colspan="12"><div><div class="paragraph">
-<p><span class="big"><strong>Actions</strong></span></p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=OTNHR5EdAs8&list=PLbRpnAmQ6xsBGB_mRAUob8WRBsSL_IsBO">Basic</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=pH02g0l2GKY&list=PLbRpnAmQ6xsDjiy7vxKMB35ZKziuF6Aj8">Test</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=xVTjtiJM8XM&list=PLbRpnAmQ6xsAcWmFO5WgK9XWylNR-Fwut">End-<br>
-user</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=KCJ1ZPPB3pA&list=PLbRpnAmQ6xsBFovjRmBTku5tTUYYdoI9u">Layout</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=AXuxULuRtm0&list=PLbRpnAmQ6xsDOfBbGIpIBQsXcR6snkkQ8">Add-<br>
-ons</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=7ToRKBOeemM&list=PLbRpnAmQ6xsB4AopkyXgU3SkHK0bOwXDf">Design</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=3n_70HJ23uY&list=PLbRpnAmQ6xsDwGTagOtuh5RAwVlqwwbPd">DB</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=6GPtec5Hu5Q&list=PLbRpnAmQ6xsADOku9ewo08h-E-_Qf10vg">Dev</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=dfRZeYqzMtI&list=PLbRpnAmQ6xsDKK0dXmJsmKvp9X7iJsfsG">Prog<br>
-mdl</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=lkZxRSS0Zwg&list=PLbRpnAmQ6xsCHI10N1s25mWAHbAz5diHf">Misc</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/playlist?list=PLbRpnAmQ6xsA6NZtY0kW9epG9VclXl6e2">Con-<br>
-trib</a></p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=dfRZeYqzMtI" target="_blank">012</a><br>
-Implementing business logic using a (no-arg) action, and associating with a property using either the <a href="guides/rgant.html#_rgant-MemberOrder"><code>@MemberOrder</code></a> annotations or using <a href="guides/ugfun.html#_ugfun_object-layout_dynamic_xml">dynamic (XML) layouts</a>.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>x</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>x</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></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><a href="https://www.youtube.com/watch?v=0naoVsWppuQ" target="_blank">013</a><br>
-Invoking (no-arg) action on multiple objects at once (using <a href="guides/rgant.html#_rgant-Action_invokeOn"><code>@Action#invokeOn()</code></a>, and using the <a href="guides/rgsvc.html#_rgsvc_api_ActionInvocationContext"><code>ActionInvocationContext</code></a> domain service for a smoother end-user experience.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>x</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>x</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top" colspan="12"><div><div class="paragraph">
-<p><span class="big"><strong>Titles and icons, UI event subscribers</strong></span></p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=OTNHR5EdAs8&list=PLbRpnAmQ6xsBGB_mRAUob8WRBsSL_IsBO">Basic</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=pH02g0l2GKY&list=PLbRpnAmQ6xsDjiy7vxKMB35ZKziuF6Aj8">Test</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=xVTjtiJM8XM&list=PLbRpnAmQ6xsAcWmFO5WgK9XWylNR-Fwut">End-<br>
-user</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=KCJ1ZPPB3pA&list=PLbRpnAmQ6xsBFovjRmBTku5tTUYYdoI9u">Layout</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=AXuxULuRtm0&list=PLbRpnAmQ6xsDOfBbGIpIBQsXcR6snkkQ8">Add-<br>
-ons</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=7ToRKBOeemM&list=PLbRpnAmQ6xsB4AopkyXgU3SkHK0bOwXDf">Design</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=3n_70HJ23uY&list=PLbRpnAmQ6xsDwGTagOtuh5RAwVlqwwbPd">DB</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=6GPtec5Hu5Q&list=PLbRpnAmQ6xsADOku9ewo08h-E-_Qf10vg">Dev</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=dfRZeYqzMtI&list=PLbRpnAmQ6xsDKK0dXmJsmKvp9X7iJsfsG">Prog<br>
-mdl</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=lkZxRSS0Zwg&list=PLbRpnAmQ6xsCHI10N1s25mWAHbAz5diHf">Misc</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/playlist?list=PLbRpnAmQ6xsA6NZtY0kW9epG9VclXl6e2">Con-<br>
-trib</a></p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=CwM430UH5WE" target="_blank">014</a><br>
-Using the <a href="guides/rgcms.html#_rgcms_methods_reserved_title"><code>title()</code></a>, <a href="guides/rgcms.html#_rgcms_methods_reserved_iconName"><code>iconName()</code></a> and <a href="guides/rgcms.html#_rgcms_methods_reserved_cssClass"><code>cssClass()</code></a> so that end-users can distinguish domain objects within the UI.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>x</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>x</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>x</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></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><a href="https://www.youtube.com/watch?v=7ToRKBOeemM" target="_blank">015</a><br>
-Moving the responsibility to specify the icon for a domain object out and into a subscriber, using the <a href="guides/rgcms.html#_rgcms_classes_uievent_IconUiEvent"><code>IconUiEvent</code></a> as per the <a href="guides/rgant.html#_rgant-DomainObjectLayout_iconUiEvent"><code>@DomainObjectLayout#iconUiEvent()</code></a> annotation</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>x</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top" colspan="12"><div><div class="paragraph">
-<p><span class="big"><strong>Derived collections</strong></span></p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=ckT8Lt20SE4" target="_blank">016</a><br>
-How to implement a derived collection on a domain object.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>x</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top" colspan="12"><div><div class="paragraph">
-<p><span class="big"><strong>More on fixture scripts</strong></span></p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=l_oZymgb65I" target="_blank">017</a><br>
-Extending a <a href="guides/ugtst.html#_ugtst_fixture-scripts">fixture script</a> to more easily demonstrate new functionality.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>x</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top" colspan="12"><div><div class="paragraph">
-<p><span class="big"><strong>Page size of collections</strong></span></p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=39Hpd7C4Kvo" target="_blank">018</a><br>
-Using <a href="guides/ugfun.html#_ugfun_object-layout_dynamic_xml">dynamic (XML) layouts</a> to specify the page size for a domain object’s collection.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>x</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top" colspan="12"><div><div class="paragraph">
-<p><span class="big"><strong>Hints and end-user features</strong></span></p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=OTNHR5EdAs8&list=PLbRpnAmQ6xsBGB_mRAUob8WRBsSL_IsBO">Basic</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=pH02g0l2GKY&list=PLbRpnAmQ6xsDjiy7vxKMB35ZKziuF6Aj8">Test</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=xVTjtiJM8XM&list=PLbRpnAmQ6xsAcWmFO5WgK9XWylNR-Fwut">End-<br>
-user</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=KCJ1ZPPB3pA&list=PLbRpnAmQ6xsBFovjRmBTku5tTUYYdoI9u">Layout</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=AXuxULuRtm0&list=PLbRpnAmQ6xsDOfBbGIpIBQsXcR6snkkQ8">Add-<br>
-ons</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=7ToRKBOeemM&list=PLbRpnAmQ6xsB4AopkyXgU3SkHK0bOwXDf">Design</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=3n_70HJ23uY&list=PLbRpnAmQ6xsDwGTagOtuh5RAwVlqwwbPd">DB</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=6GPtec5Hu5Q&list=PLbRpnAmQ6xsADOku9ewo08h-E-_Qf10vg">Dev</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=dfRZeYqzMtI&list=PLbRpnAmQ6xsDKK0dXmJsmKvp9X7iJsfsG">Prog<br>
-mdl</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=lkZxRSS0Zwg&list=PLbRpnAmQ6xsCHI10N1s25mWAHbAz5diHf">Misc</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/playlist?list=PLbRpnAmQ6xsA6NZtY0kW9epG9VclXl6e2">Con-<br>
-trib</a></p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=0d713-V4vrg" target="_blank">019</a><br>
-Demonstrates how Apache Isis' <a href="#guides/ugvw.adoc">Wicket viewer</a> remembers the state of rendered domain objects, and how the end-user of the
- application can clear these UI hints using the (framework-provided) <a href="guides/rgcms.html#_rgcms_classes_mixins_Object_clearHints">"clear hints"</a> action.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>x</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></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><a href="https://www.youtube.com/watch?v=Kqch-XNlBMA" target="_blank">020</a><br>
-Demonstrates how the end-user can copy and share URLs for domain objects - including UI hints - using Apache Isis' <a href="#guides/ugvw.adoc">Wicket viewer</a>.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>x</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></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><a href="https://www.youtube.com/watch?v=a0QQLT_16To" target="_blank">021</a><br>
-Demonstrates how the end-user can use bookmarks and breadcrumbs within Apache Isis' <a href="#guides/ugvw.adoc">Wicket viewer</a>, and how the developer can ensure that <a href="guides/rgant.html#_rgant-DomainObjectLayout_bookmarking">domain objects</a> and (<a href="guides/rgant.html#_rgant-Action_semantics">query-only</a>) <a href="guides/rgant.html#_rgant-ActionLayout_bookmarking">actions</a> can be bookmarked.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>x</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top" colspan="12"><div><div class="paragraph">
-<p><span class="big"><strong>Decoupling (mixins & subscribers)</strong></span></p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=OTNHR5EdAs8&list=PLbRpnAmQ6xsBGB_mRAUob8WRBsSL_IsBO">Basic</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=pH02g0l2GKY&list=PLbRpnAmQ6xsDjiy7vxKMB35ZKziuF6Aj8">Test</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=xVTjtiJM8XM&list=PLbRpnAmQ6xsAcWmFO5WgK9XWylNR-Fwut">End-<br>
-user</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=KCJ1ZPPB3pA&list=PLbRpnAmQ6xsBFovjRmBTku5tTUYYdoI9u">Layout</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=AXuxULuRtm0&list=PLbRpnAmQ6xsDOfBbGIpIBQsXcR6snkkQ8">Add-<br>
-ons</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=7ToRKBOeemM&list=PLbRpnAmQ6xsB4AopkyXgU3SkHK0bOwXDf">Design</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=3n_70HJ23uY&list=PLbRpnAmQ6xsDwGTagOtuh5RAwVlqwwbPd">DB</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=6GPtec5Hu5Q&list=PLbRpnAmQ6xsADOku9ewo08h-E-_Qf10vg">Dev</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=dfRZeYqzMtI&list=PLbRpnAmQ6xsDKK0dXmJsmKvp9X7iJsfsG">Prog<br>
-mdl</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=lkZxRSS0Zwg&list=PLbRpnAmQ6xsCHI10N1s25mWAHbAz5diHf">Misc</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/playlist?list=PLbRpnAmQ6xsA6NZtY0kW9epG9VclXl6e2">Con-<br>
-trib</a></p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=Wn5215K7_Jg" target="_blank">022</a><br>
-Shows how to refactor a domain object to move an action implementation out of the domain object itself, and instead implement as a <a href="guides/ugbtb.html#_ugbtb_decoupling_mixins">mixin</a> (useful for decoupling).</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>x</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>x</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></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><a href="https://www.youtube.com/watch?v=m633OEBpWqQ" target="_blank">023</a><br>
-Shows how to refactor a domain object to move (derived) collections out of the domain object and reimplement as a <a href="guides/ugbtb.html#_ugbtb_decoupling_mixins">mixin</a>.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>x</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></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><a href="https://www.youtube.com/watch?v=-AQJb9GtIqI" target="_blank">024</a><br>
-Using a domain event <a href="guides/rgcms.html#_rgcms_classes_super_AbstractSubscriber">subscriber</a> to <a href="guides/ugbtb.html#_ugbtb_decoupling_event-bus">decouple</a> and abstract business rules ( <a href="guides/rgcms.html#_rgcms_methods_prefixes_validate">validation</a>).</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>x</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></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><a href="https://www.youtube.com/watch?v=6GjLW0hlrm4" target="_blank">025</a><br>
-Using a domain event <a href="guides/rgcms.html#_rgcms_classes_super_AbstractSubscriber">subscriber</a> to hide functionality, in this
- case the <a href="guides/rgcms.html#_rgcms_classes_mixins_Object_clearHints">"clear hints"</a> action automatically provided by the framework.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>x</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top" colspan="12"><div><div class="paragraph">
-<p><span class="big"><strong>Titles using the @Title annotation</strong></span></p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=qj4bMkQRBUY" target="_blank">026</a><br>
-Using the <a href="guides/rgant.html#_rgant-Title"><code>@Title</code></a> annotation (instead of the <a href="guides/rgcms.html#_rgcms_methods_reserved_title"><code>title()</code></a> reserved method) to obtain the title of a domain object, so that the end-user can distinguish one object from another.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>x</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>x</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top" colspan="12"><div><div class="paragraph">
-<p><span class="big"><strong>Integration testing of mixins</strong></span></p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=yi52Gbd3lmY" target="_blank">027</a><br>
-How to write an <a href="guides/ugtst.html#_ugtst_integ-test-support">integration test</a> for an <a href="guides/rgant.html#_rgant-Mixin">mixin</a>.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>x</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top" colspan="12"><div><div class="paragraph">
-<p><span class="big"><strong>Removing boilerplate</strong></span></p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=OTNHR5EdAs8&list=PLbRpnAmQ6xsBGB_mRAUob8WRBsSL_IsBO">Basic</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=pH02g0l2GKY&list=PLbRpnAmQ6xsDjiy7vxKMB35ZKziuF6Aj8">Test</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=xVTjtiJM8XM&list=PLbRpnAmQ6xsAcWmFO5WgK9XWylNR-Fwut">End-<br>
-user</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=KCJ1ZPPB3pA&list=PLbRpnAmQ6xsBFovjRmBTku5tTUYYdoI9u">Layout</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=AXuxULuRtm0&list=PLbRpnAmQ6xsDOfBbGIpIBQsXcR6snkkQ8">Add-<br>
-ons</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=7ToRKBOeemM&list=PLbRpnAmQ6xsB4AopkyXgU3SkHK0bOwXDf">Design</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=3n_70HJ23uY&list=PLbRpnAmQ6xsDwGTagOtuh5RAwVlqwwbPd">DB</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=6GPtec5Hu5Q&list=PLbRpnAmQ6xsADOku9ewo08h-E-_Qf10vg">Dev</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=dfRZeYqzMtI&list=PLbRpnAmQ6xsDKK0dXmJsmKvp9X7iJsfsG">Prog<br>
-mdl</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=lkZxRSS0Zwg&list=PLbRpnAmQ6xsCHI10N1s25mWAHbAz5diHf">Misc</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/playlist?list=PLbRpnAmQ6xsA6NZtY0kW9epG9VclXl6e2">Con-<br>
-trib</a></p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=SLJPBruFMKY" target="_blank">028</a><br>
-Using <a href="https://projectlombok.org/">Project Lombok</a> to remove boilerplate from your domain objects (getters and setters).</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>x</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></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><a href="https://www.youtube.com/watch?v=AXuxULuRtm0" target="_blank">029</a><br>
-Using the (non-ASF) <a href="http://github.com/isisaddons/isis-metamodel-paraname8">Isis addons' paraname8</a> module to remove boilerplate from your domain object (<a href="guides/rgant.html#_rgant-ParameterLayout_named"><code>@ParameterLayout#named()</code></a> annotation attribute on action parameters).</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>x</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>x</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top" colspan="12"><div><div class="paragraph">
-<p><span class="big"><strong>Action validation</strong></span></p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=OTNHR5EdAs8&list=PLbRpnAmQ6xsBGB_mRAUob8WRBsSL_IsBO">Basic</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=pH02g0l2GKY&list=PLbRpnAmQ6xsDjiy7vxKMB35ZKziuF6Aj8">Test</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=xVTjtiJM8XM&list=PLbRpnAmQ6xsAcWmFO5WgK9XWylNR-Fwut">End-<br>
-user</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=KCJ1ZPPB3pA&list=PLbRpnAmQ6xsBFovjRmBTku5tTUYYdoI9u">Layout</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=AXuxULuRtm0&list=PLbRpnAmQ6xsDOfBbGIpIBQsXcR6snkkQ8">Add-<br>
-ons</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=7ToRKBOeemM&list=PLbRpnAmQ6xsB4AopkyXgU3SkHK0bOwXDf">Design</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=3n_70HJ23uY&list=PLbRpnAmQ6xsDwGTagOtuh5RAwVlqwwbPd">DB</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=6GPtec5Hu5Q&list=PLbRpnAmQ6xsADOku9ewo08h-E-_Qf10vg">Dev</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=dfRZeYqzMtI&list=PLbRpnAmQ6xsDKK0dXmJsmKvp9X7iJsfsG">Prog<br>
-mdl</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=lkZxRSS0Zwg&list=PLbRpnAmQ6xsCHI10N1s25mWAHbAz5diHf">Misc</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/playlist?list=PLbRpnAmQ6xsA6NZtY0kW9epG9VclXl6e2">Con-<br>
-trib</a></p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=ORoEYlg6XFM" target="_blank">030</a><br>
-How to validate action parameters using a supporting <a href="guides/rgcms.html#_rgcms_methods_prefixes_validate"><code>validateNXxx()</code></a> method.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>x</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>x</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></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><a href="https://www.youtube.com/watch?v=1Vlzob89pYI" target="_blank">031</a><br>
-How to validate action parameters using the <a href="guides/rgant.html#_rgant-Parameter_mustSatisfy"><code>@Parameter#mustSatisfy()</code></a> and the Specification interface.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>x</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top" colspan="12"><div><div class="paragraph">
-<p><span class="big"><strong>Instantiating/Initializing Objects</strong></span></p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=fYJjXAepWAs" target="_blank">032</a><br>
-How to instantiate/initialize objects using <a href="guides/rgsvc.html#_rgsvc_api_RepositoryService"><code>RepositoryService</code></a>, <a href="guides/rgsvc.html#_rgsvc_api_ServiceRegistry"><code>ServiceRegistry</code></a> and/or <a href="guides/rgsvc.html#_rgsvc_api_FactoryService"><code>FactoryService</code></a>.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>x</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>x</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top" colspan="12"><div><div class="paragraph">
-<p><span class="big"><strong>Property and parameter choices</strong></span></p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=OTNHR5EdAs8&list=PLbRpnAmQ6xsBGB_mRAUob8WRBsSL_IsBO">Basic</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=pH02g0l2GKY&list=PLbRpnAmQ6xsDjiy7vxKMB35ZKziuF6Aj8">Test</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=xVTjtiJM8XM&list=PLbRpnAmQ6xsAcWmFO5WgK9XWylNR-Fwut">End-<br>
-user</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=KCJ1ZPPB3pA&list=PLbRpnAmQ6xsBFovjRmBTku5tTUYYdoI9u">Layout</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=AXuxULuRtm0&list=PLbRpnAmQ6xsDOfBbGIpIBQsXcR6snkkQ8">Add-<br>
-ons</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=7ToRKBOeemM&list=PLbRpnAmQ6xsB4AopkyXgU3SkHK0bOwXDf">Design</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=3n_70HJ23uY&list=PLbRpnAmQ6xsDwGTagOtuh5RAwVlqwwbPd">DB</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=6GPtec5Hu5Q&list=PLbRpnAmQ6xsADOku9ewo08h-E-_Qf10vg">Dev</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=dfRZeYqzMtI&list=PLbRpnAmQ6xsDKK0dXmJsmKvp9X7iJsfsG">Prog<br>
-mdl</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=lkZxRSS0Zwg&list=PLbRpnAmQ6xsCHI10N1s25mWAHbAz5diHf">Misc</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/playlist?list=PLbRpnAmQ6xsA6NZtY0kW9epG9VclXl6e2">Con-<br>
-trib</a></p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=cQ06PoMNDPw" target="_blank">033</a><br>
-How to provide a set of <a href="guides/rgcms.html#_rgcms_methods_prefixes_choices">choices</a> (a drop-down list) when editing a property.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>x</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>x</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></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><a href="https://www.youtube.com/watch?v=afEnYKljBQs" target="_blank">034</a><br>
-How to provide a set of <a href="guides/rgcms.html#_rgcms_methods_prefixes_choices">choices</a> (a drop-down list) when invoking an action.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>x</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></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><a href="https://www.youtube.com/watch?v=fKo6aTPK-gk" target="_blank">035</a><br>
-How to use the <a href="guides/rgcms.html#_rgcms_methods_prefixes_choices">choices</a> supporting methods as a source for default values within a <a href="guides/ugtst.html#_ugtst_fixture-scripts">fixture script</a>.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>x</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>x</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></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><a href="https://www.youtube.com/watch?v=ZWOzmwCJVzA" target="_blank">036</a><br>
-How to use an enum for choices (drop down list) for both a property or an action parameter.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>x</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top" colspan="12"><div><div class="paragraph">
-<p><span class="big"><strong>Hiding columns</strong></span></p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=OTNHR5EdAs8&list=PLbRpnAmQ6xsBGB_mRAUob8WRBsSL_IsBO">Basic</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=pH02g0l2GKY&list=PLbRpnAmQ6xsDjiy7vxKMB35ZKziuF6Aj8">Test</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=xVTjtiJM8XM&list=PLbRpnAmQ6xsAcWmFO5WgK9XWylNR-Fwut">End-<br>
-user</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=KCJ1ZPPB3pA&list=PLbRpnAmQ6xsBFovjRmBTku5tTUYYdoI9u">Layout</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=AXuxULuRtm0&list=PLbRpnAmQ6xsDOfBbGIpIBQsXcR6snkkQ8">Add-<br>
-ons</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=7ToRKBOeemM&list=PLbRpnAmQ6xsB4AopkyXgU3SkHK0bOwXDf">Design</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=3n_70HJ23uY&list=PLbRpnAmQ6xsDwGTagOtuh5RAwVlqwwbPd">DB</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=6GPtec5Hu5Q&list=PLbRpnAmQ6xsADOku9ewo08h-E-_Qf10vg">Dev</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=dfRZeYqzMtI&list=PLbRpnAmQ6xsDKK0dXmJsmKvp9X7iJsfsG">Prog<br>
-mdl</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=lkZxRSS0Zwg&list=PLbRpnAmQ6xsCHI10N1s25mWAHbAz5diHf">Misc</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/playlist?list=PLbRpnAmQ6xsA6NZtY0kW9epG9VclXl6e2">Con-<br>
-trib</a></p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=1SCyBlMM2Bo" target="_blank">037</a><br>
-How to hide properties as columns in tables (parented collections or standalone collections), using the dynamic XML layout (equivalent to <a href="guides/rgant.html#_rgant-PropertyLayout_hidden"><code>@PropertyLayout#hidden()</code></a>).</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>x</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></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><a href="https://www.youtube.com/watch?v=H11yby1Xkbc" target="_blank">038</a><br>
-How to hide properties as columns in tables, using CSS.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>x</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top" colspan="12"><div><div class="paragraph">
-<p><span class="big"><strong>Fixture scripts defaults / fake data</strong></span></p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=OTNHR5EdAs8&list=PLbRpnAmQ6xsBGB_mRAUob8WRBsSL_IsBO">Basic</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=pH02g0l2GKY&list=PLbRpnAmQ6xsDjiy7vxKMB35ZKziuF6Aj8">Test</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=xVTjtiJM8XM&list=PLbRpnAmQ6xsAcWmFO5WgK9XWylNR-Fwut">End-<br>
-user</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=KCJ1ZPPB3pA&list=PLbRpnAmQ6xsBFovjRmBTku5tTUYYdoI9u">Layout</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=AXuxULuRtm0&list=PLbRpnAmQ6xsDOfBbGIpIBQsXcR6snkkQ8">Add-<br>
-ons</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=7ToRKBOeemM&list=PLbRpnAmQ6xsB4AopkyXgU3SkHK0bOwXDf">Design</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=3n_70HJ23uY&list=PLbRpnAmQ6xsDwGTagOtuh5RAwVlqwwbPd">DB</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=6GPtec5Hu5Q&list=PLbRpnAmQ6xsADOku9ewo08h-E-_Qf10vg">Dev</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=dfRZeYqzMtI&list=PLbRpnAmQ6xsDKK0dXmJsmKvp9X7iJsfsG">Prog<br>
-mdl</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=lkZxRSS0Zwg&list=PLbRpnAmQ6xsCHI10N1s25mWAHbAz5diHf">Misc</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/playlist?list=PLbRpnAmQ6xsA6NZtY0kW9epG9VclXl6e2">Con-<br>
-trib</a></p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=NKaR7ZedI8E" target="_blank">039</a><br>
-Using the <a href="guides/rgcms.html#_rgcms_classes_super_FixtureScript"><code>FixtureScript</code></a> <code>defaultParam(…​)</code> method to reflectively default parameters to fixture scripts that have not been set by the caller.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>x</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></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><a href="https://www.youtube.com/watch?v=-jMiD9n1L5U" target="_blank">040</a><br>
-Using the (non-ASF) <a href="http://github.com/isisaddons/isis-module-fakedata">Isis addons' fakedata</a> module’s <code>FakeDataService</code> to provide fake (random) names within a fixture script.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>x</p>
-</div></div></td>
-<td class="tableblock halign-left
<TRUNCATED>
[27/44] isis-site git commit: ISIS-1594: provide an 'edit' button
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/83a3755a/content/guides/rgsvc.html
----------------------------------------------------------------------
diff --git a/content/guides/rgsvc.html b/content/guides/rgsvc.html
index b4ba83e..5ab2ef1 100644
--- a/content/guides/rgsvc.html
+++ b/content/guides/rgsvc.html
@@ -1,12 +1,10 @@
<!doctype html>
<html class="no-js" lang="en">
-<head>
- <meta charset="utf-8"/>
- <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-
- <title>Domain Services</title>
-
- <!--
+ <head>
+ <meta charset="utf-8">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+ <title>Domain Services</title>
+ <!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
@@ -23,31 +21,21 @@
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
- -->
-
- <!-- No caching headers -->
- <meta http-equiv="cache-control" content="no-cache" />
- <meta http-equiv="pragma" content="no-cache" />
- <meta http-equiv="expires" content="-1" />
-
-
- <!-- TODO: need to (re)instate CDN in the future (not using for now just so can develop off-line -->
- <link href="../css/foundation/5.5.1/foundation.css" rel="stylesheet" />
- <script src="../js/foundation/5.5.1/vendor/modernizr.js"></script>
- <link href="../css/asciidoctor/colony.css" rel="stylesheet">
- <link href="../css/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet">
-
-
-
-
- <link href="../css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.css" rel="stylesheet" />
- <!--[if lt IE 9]>
+ -->
+ <!-- No caching headers -->
+ <meta http-equiv="cache-control" content="no-cache">
+ <meta http-equiv="pragma" content="no-cache">
+ <meta http-equiv="expires" content="-1">
+ <!-- TODO: need to (re)instate CDN in the future (not using for now just so can develop off-line -->
+ <link href="../css/foundation/5.5.1/foundation.css" rel="stylesheet">
+ <script src="../js/foundation/5.5.1/vendor/modernizr.js"></script>
+ <link href="../css/asciidoctor/colony.css" rel="stylesheet">
+ <link href="../css/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet">
+ <link href="../css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.css" rel="stylesheet">
+ <!--[if lt IE 9]>
<link href="../css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.ie.css" rel="stylesheet" />
- <![endif]-->
-
-
-
- <style type="text/css">
+ <![endif]-->
+ <style type="text/css">
pre code {
background-color: inherit;
border-style: none;
@@ -192,9 +180,8 @@ table.CodeRay td.code>pre{padding:0}
color:#fff;
font-size: 1.1em;
}
- </style>
-
- <style>
+ </style>
+ <style>
@media only screen and (min-width: 40.063em) {
.top-bar {
.contain-to-grid .top-bar {
@@ -205,9 +192,8 @@ table.CodeRay td.code>pre{padding:0}
.row {
max-width: 80rem;
}
- </style>
-
- <style>
+ </style>
+ <style>
.extended-quote,
.extended-quote-first {
margin-left: 40px;
@@ -231,9 +217,8 @@ table.CodeRay td.code>pre{padding:0}
text-shadow: 0 1px 2px rgba(0, 0, 0, 0.1);
}
- </style>
-
- <style>
+ </style>
+ <style>
body {
position: relative;
}
@@ -255,6 +240,7 @@ table.CodeRay td.code>pre{padding:0}
div#doc-content {
margin-top: 30px;
+ padding-top: 30px;
}
div.documentation-page table.frame-all {
@@ -286,9 +272,8 @@ table.CodeRay td.code>pre{padding:0}
min-height: 2000px;
}
- </style>
-
- <style>
+ </style>
+ <style>
@media only screen and (min-width: 768px) {
#toc.toc2 ul ul { margin-left: -10px; }
@@ -316,15 +301,13 @@ table.CodeRay td.code>pre{padding:0}
body div#toc2 li.tocify-item.active a {
color: red;
}
- </style>
-
- <style>
+ </style>
+ <style>
footer {
margin-top: 1000px;
}
- </style>
-
- <style>
+ </style>
+ <style>
/* overriding colony.css stylesheet */
.literalblock pre, .literalblock pre[class], .listingblock pre, .listingblock pre[class] {
/*padding: 1.25em 1.5625em 1.125em 1.5625em;*/
@@ -372,9 +355,8 @@ table.CodeRay td.code>pre{padding:0}
.imageblock img {
margin-bottom: 10px;
}
- </style>
-
- <style>
+ </style>
+ <style>
/* from http://ben.balter.com/2014/03/13/pages-anchor-links/ */
.header-link {
position: absolute;
@@ -395,9 +377,8 @@ table.CodeRay td.code>pre{padding:0}
h6:hover .header-link {
opacity: 1;
}
- </style>
-
- <style>
+ </style>
+ <style>
.top-bar
{
-webkit-transition-duration: .5s;
@@ -425,224 +406,153 @@ table.CodeRay td.code>pre{padding:0}
-webkit-transition-property: -webkit-transform;
transition-property: transform;
}
- </style>
-
- <style>
+ </style>
+ <style>
#doc-content a.guide {
color: white;
}
- </style>
-
- <style>
+ </style>
+ <style>
+ .tocify {
+ margin-top: 80px;
+ }
+ </style>
+ <style>
.tocify {
margin-top: 80px;
}
- </style>
-
-
-</script>
-
-</head>
-<body>
-
-<<div class="github-fork-ribbon-wrapper right" style="position: fixed;">
- <div class="github-fork-ribbon">
- <a href="https://github.com/apache/isis#fork-destination-box">Fork me on GitHub</a>
- </div>
-</div>
-
-
-<div class="row">
-
- <div class="fixed contain-to-grid header">
- <nav class="top-bar" data-topbar role="navigation" style="max-width: 80rem">
- <ul class="title-area">
- <li class="name">
- <h1>
- <a href="/index.html">Apache Isis™</a>
- </h1>
- </li>
- <!-- Remove the class "menu-icon" to get rid of menu icon. Take out "Menu" to just have icon alone -->
- <li class="toggle-topbar menu-icon"><a href="#"><span>Menu</span></a></li>
- </ul>
-
- <section class="top-bar-section">
- <ul class="right">
-
- <li class="has-form">
- <FORM class="searchbox navbar-form navbar-right" id="searchbox_012614087480249044419:dn-q5gtwxya" action="http://www.google.com/cse">
- <div class="row collapse">
- <input type="hidden" name="cx" value="012614087480249044419:dn-q5gtwxya">
- <INPUT type="hidden" name="cof" value="FORID:0">
- <INPUT class="form-control" name="q" type="text" placeholder="Search">
- </div>
- </FORM>
- </li>
-
- </ul>
-
- <!-- Left Nav Section -->
- <ul class="left">
-
- <li><a href="/documentation.html">Documentation</a></li>
- <li><a href="/downloads.html">Downloads</a></li>
- <li><a href="/help.html">Help</a></li>
- <li><a href="/asf.html">@ASF</a></li>
-
- </ul>
-
- </section>
- </nav>
- </div>
-</div>
-
-<div class="row">
-
- <div id="doc-content-left" class="large-9 medium-9 columns">
-
-
- <div id="doc-content">
- <div class="sect1">
-<h2 id="_rgsvc">1. Domain Services</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>This guide documents Apache Isis' domain services, both those that act as an API (implemented by the framework for
-your domain objects to call), and those domain services that act as an SPI (implemented by your domain application and
-which are called by the framework).</p>
-</div>
-<div class="sect2">
-<h3 id="_other_guides">1.1. Other Guides</h3>
-<div class="paragraph">
-<p>Apache Isis documentation is broken out into a number of user, reference and "supporting procedures" guides.</p>
-</div>
-<div class="paragraph">
-<p>The user guides available are:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="ugfun.html">Fundamentals</a></p>
-</li>
-<li>
-<p><a href="ugvw.html">Wicket viewer</a></p>
-</li>
-<li>
-<p><a href="ugvro.html">Restful Objects viewer</a></p>
-</li>
-<li>
-<p><a href="ugdno.html">DataNucleus object store</a></p>
-</li>
-<li>
-<p><a href="ugsec.html">Security</a></p>
-</li>
-<li>
-<p><a href="ugtst.html">Testing</a></p>
-</li>
-<li>
-<p><a href="ugbtb.html">Beyond the Basics</a></p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>The reference guides are:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="rgant.html">Annotations</a></p>
-</li>
-<li>
-<p><a href="#">Domain Services</a> (this guide)</p>
-</li>
-<li>
-<p><a href="rgcfg.html">Configuration Properties</a></p>
-</li>
-<li>
-<p><a href="rgcms.html">Classes, Methods and Schema</a></p>
-</li>
-<li>
-<p><a href="rgmvn.html">Apache Isis Maven plugin</a></p>
-</li>
-<li>
-<p><a href="rgfis.html">Framework Internal Services</a></p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>The remaining guides are:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="dg.html">Developers' Guide</a> (how to set up a development environment
-for Apache Isis and contribute back to the project)</p>
-</li>
-<li>
-<p><a href="cgcom.html">Committers' Guide</a> (release procedures and related practices)</p>
-</li>
-</ul>
-</div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_rgsvc_intro">2. Introduction</h2>
-<div class="sectionbody">
-<div class="sect2">
-<h3 id="_rgsvc_intro_types-of-domain-services">2.1. Types of Domain Service</h3>
-<div class="paragraph">
-<p>The domain services also group into various broad categories. Many support functionality of the various layers of the
-system (presentation layer, application layer, core domain, persistence layer); others exist to allow the domain objects
-to integrate with other bounded contexts, or provide various metadata (eg for development-time tooling). The diagram
-below shows these categories:</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<a class="image" href="images/reference-services/categories.png"><img src="images/reference-services/categories.png" alt="categories" width="600px"></a>
-</div>
-</div>
-<div class="paragraph">
-<p>A small number of domain services can be considered both API and SPI; a good example is the <a href="#_rgsvc_api_EmailService"><code>EmailService</code></a> that is of direct use for domain objects wishing to send out emails,
-but is also used by the framework to support the <a href="ugvw.html#_ugvw_features_user-registration">user registration</a>
-functionality supported by the <a href="ugvw.html">Wicket viewer</a>. The same is true of the <a href="#_rgsvc_api_EventBusService"><code>EventBusService</code></a>; this can be used by domain objects to broadcast arbitrary events,
-but is also used by the framework to automatically emit events for
-<a href="rgant.html#_rgant-Action_domainEvent"><code>@Action#domainEvent()</code></a> etc.</p>
-</div>
-<div class="paragraph">
-<p>For these hybrid services we have categorized the service as an "API" service. This chapter therefore contains only
-the strictly SPI services.</p>
-</div>
-<div class="paragraph">
-<p>This rest of this guide is broken out into several chapters, one for each of the various types/categories of domain
-service.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_rgsvc_intro_public-api">2.2. Public API vs Internal Services</h3>
-<div class="paragraph">
-<p>The vast majority of Apache Isis' domain services are defined in Apache Isis' applib (<code>o.a.i.core:isis-core-applib</code>
-module) as stable, public classes. Importantly, this also minimizes the coupling between your code and Apache Isis,
-allowing you to easily mock out these services in your unit tests.</p>
-</div>
-<div class="paragraph">
-<p>The framework also defines a number of "internal" services. These are not part of the framework’s formal API, in that
-they use classes that are outside of the applib. These internal framework services should be thought of as part of the
-internal design of the framework, and are liable to change from release to release. The internal framework services
-are documented in the <a href="rgfis.html">Framework Internal Services</a> guide.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_rgsvc_intro_using-the-services">2.3. Using the services</h3>
-<div class="paragraph">
-<p>Apache Isis includes an extensive number of domain services for your domain objects to use; simply define the service
-as an annotated field and Apache Isis will inject the service into your object.</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">Customer</span> {
+ </style>
+ </head>
+ <body>
+ <div class="row">
+ <div class="fixed contain-to-grid header">
+ <nav class="top-bar" data-topbar role="navigation" style="max-width: 80rem">
+ <ul class="title-area">
+ <li class="name"> <h1> <a href="/index.html">Apache Isis\u2122</a> </h1> </li>
+ <!-- Remove the class "menu-icon" to get rid of menu icon. Take out "Menu" to just have icon alone -->
+ <li class="toggle-topbar menu-icon"><a href="#"><span>Menu</span></a></li>
+ </ul>
+ <section class="top-bar-section">
+ <ul class="right">
+ <li class="has-form">
+ <form class="searchbox navbar-form navbar-right" id="searchbox_012614087480249044419:dn-q5gtwxya" action="http://www.google.com/cse">
+ <div class="row collapse">
+ <input type="hidden" name="cx" value="012614087480249044419:dn-q5gtwxya">
+ <input type="hidden" name="cof" value="FORID:0">
+ <input class="form-control" name="q" type="text" placeholder="Search">
+ </div>
+ </form> </li>
+ </ul>
+ <!-- Left Nav Section -->
+ <ul class="left">
+ <li><a href="/documentation.html">Documentation</a></li>
+ <li><a href="/downloads.html">Downloads</a></li>
+ <li><a href="/help.html">Help</a></li>
+ <li><a href="/asf.html">@ASF</a></li>
+ </ul>
+ </section>
+ </nav>
+ </div>
+ </div>
+ <div class="row">
+ <div id="doc-content-left" class="large-9 medium-9 columns">
+ <div id="doc-content">
+ <button type="button" class="button secondary" onclick="window.location.href="https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/rgsvc.adoc"" style="float: right; font-size: small; padding: 6px; "><i class="fa fa-pencil-square-o"></i> Edit</button>
+ <div class="sect1">
+ <h2 id="_rgsvc">1. Domain Services</h2>
+ <button type="button" class="button secondary" onclick="window.location.href="https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/_rgsvc.adoc"" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i> Edit</button>
+ <div class="sectionbody">
+ <div class="paragraph">
+ <p>This guide documents Apache Isis' domain services, both those that act as an API (implemented by the framework for your domain objects to call), and those domain services that act as an SPI (implemented by your domain application and which are called by the framework).</p>
+ </div>
+ <div class="sect2">
+ <h3 id="_other_guides">1.1. Other Guides</h3>
+ <div class="paragraph">
+ <p>Apache Isis documentation is broken out into a number of user, reference and "supporting procedures" guides.</p>
+ </div>
+ <div class="paragraph">
+ <p>The user guides available are:</p>
+ </div>
+ <div class="ulist">
+ <ul>
+ <li> <p><a href="ugfun.html">Fundamentals</a></p> </li>
+ <li> <p><a href="ugvw.html">Wicket viewer</a></p> </li>
+ <li> <p><a href="ugvro.html">Restful Objects viewer</a></p> </li>
+ <li> <p><a href="ugdno.html">DataNucleus object store</a></p> </li>
+ <li> <p><a href="ugsec.html">Security</a></p> </li>
+ <li> <p><a href="ugtst.html">Testing</a></p> </li>
+ <li> <p><a href="ugbtb.html">Beyond the Basics</a></p> </li>
+ </ul>
+ </div>
+ <div class="paragraph">
+ <p>The reference guides are:</p>
+ </div>
+ <div class="ulist">
+ <ul>
+ <li> <p><a href="rgant.html">Annotations</a></p> </li>
+ <li> <p><a href="#">Domain Services</a> (this guide)</p> </li>
+ <li> <p><a href="rgcfg.html">Configuration Properties</a></p> </li>
+ <li> <p><a href="rgcms.html">Classes, Methods and Schema</a></p> </li>
+ <li> <p><a href="rgmvn.html">Apache Isis Maven plugin</a></p> </li>
+ <li> <p><a href="rgfis.html">Framework Internal Services</a></p> </li>
+ </ul>
+ </div>
+ <div class="paragraph">
+ <p>The remaining guides are:</p>
+ </div>
+ <div class="ulist">
+ <ul>
+ <li> <p><a href="dg.html">Developers' Guide</a> (how to set up a development environment for Apache Isis and contribute back to the project)</p> </li>
+ <li> <p><a href="cgcom.html">Committers' Guide</a> (release procedures and related practices)</p> </li>
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="sect1">
+ <h2 id="_rgsvc_intro">2. Introduction</h2>
+ <button type="button" class="button secondary" onclick="window.location.href="https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/_rgsvc_intro.adoc"" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i> Edit</button>
+ <div class="sectionbody">
+ <div class="sect2">
+ <h3 id="_rgsvc_intro_types-of-domain-services">2.1. Types of Domain Service</h3>
+ <div class="paragraph">
+ <p>The domain services also group into various broad categories. Many support functionality of the various layers of the system (presentation layer, application layer, core domain, persistence layer); others exist to allow the domain objects to integrate with other bounded contexts, or provide various metadata (eg for development-time tooling). The diagram below shows these categories:</p>
+ </div>
+ <div class="imageblock">
+ <div class="content">
+ <a class="image" href="images/reference-services/categories.png"><img src="images/reference-services/categories.png" alt="categories" width="600px"></a>
+ </div>
+ </div>
+ <div class="paragraph">
+ <p>A small number of domain services can be considered both API and SPI; a good example is the <a href="#_rgsvc_api_EmailService"><code>EmailService</code></a> that is of direct use for domain objects wishing to send out emails, but is also used by the framework to support the <a href="ugvw.html#_ugvw_features_user-registration">user registration</a> functionality supported by the <a href="ugvw.html">Wicket viewer</a>. The same is true of the <a href="#_rgsvc_api_EventBusService"><code>EventBusService</code></a>; this can be used by domain objects to broadcast arbitrary events, but is also used by the framework to automatically emit events for <a href="rgant.html#_rgant-Action_domainEvent"><code>@Action#domainEvent()</code></a> etc.</p>
+ </div>
+ <div class="paragraph">
+ <p>For these hybrid services we have categorized the service as an "API" service. This chapter therefore contains only the strictly SPI services.</p>
+ </div>
+ <div class="paragraph">
+ <p>This rest of this guide is broken out into several chapters, one for each of the various types/categories of domain service.</p>
+ </div>
+ </div>
+ <div class="sect2">
+ <h3 id="_rgsvc_intro_public-api">2.2. Public API vs Internal Services</h3>
+ <div class="paragraph">
+ <p>The vast majority of Apache Isis' domain services are defined in Apache Isis' applib (<code>o.a.i.core:isis-core-applib</code> module) as stable, public classes. Importantly, this also minimizes the coupling between your code and Apache Isis, allowing you to easily mock out these services in your unit tests.</p>
+ </div>
+ <div class="paragraph">
+ <p>The framework also defines a number of "internal" services. These are not part of the framework\u2019s formal API, in that they use classes that are outside of the applib. These internal framework services should be thought of as part of the internal design of the framework, and are liable to change from release to release. The internal framework services are documented in the <a href="rgfis.html">Framework Internal Services</a> guide.</p>
+ </div>
+ </div>
+ <div class="sect2">
+ <h3 id="_rgsvc_intro_using-the-services">2.3. Using the services</h3>
+ <div class="paragraph">
+ <p>Apache Isis includes an extensive number of domain services for your domain objects to use; simply define the service as an annotated field and Apache Isis will inject the service into your object.</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">Customer</span> {
<span class="directive">public</span> <span class="type">void</span> sendEmail( <span class="predefined-type">String</span> subject, <span class="predefined-type">String</span> body) {
<span class="predefined-type">List</span><<span class="predefined-type">String</span>> cc = <span class="predefined-type">Collections</span>.emptyList;
@@ -655,98 +565,87 @@ as an annotated field and Apache Isis will inject the service into your object.<
<span class="annotation">@Inject</span> <i class="conum" data-value="1"></i><b>(1)</b>
EmailService emailService;
-}</code></pre>
-</div>
-</div>
-<div class="colist arabic">
-<table>
-<tr>
-<td><i class="conum" data-value="1"></i><b>1</b></td>
-<td>Service automatically injected by the framework.</td>
-</tr>
-</table>
-</div>
-<div class="paragraph">
-<p>For objects that are already persisted, the service is automatically injected just after the object is rehydrated by
-JDO/DataNucleus.</p>
-</div>
-<div class="paragraph">
-<p>For transient objects (instantiated programmatically), the <a href="#_rgsvc_api_FactoryService"><code>FactoryService</code></a>'s
-<code>instantiate()</code> method (or the deprecated <a href="#_rgsvc_api_DomainObjectContainer"><code>DomainObjectContainer</code></a>'s
-<code>newTransientInstance()</code> method) will automatically inject the services.</p>
-</div>
-<div class="paragraph">
-<p>Alternatively the object can be instantiated simply using <code>new</code>, then services injected using
-<a href="#_rgsvc_api_ServiceRegistry"><code>ServiceRegistry</code></a>'s <code>injectServicesInto(…​)</code> method (or the deprecated
-<a href="#_rgsvc_api_DomainObjectContainer"><code>DomainObjectContainer</code></a>'s <code>injectServicesInto(…​)</code> method).</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_rgsvc_intro_overriding-the-services">2.4. Overriding the services</h3>
-<div class="paragraph">
-<p>The framework provides default implementations for many of the domain services. This is convenient, but sometimes you
-will want to replace the default implementation with your own service implementation.</p>
-</div>
-<div class="paragraph">
-<p>The trick is to use the <a href="rgant.html#_rgant-DomainServiceLayout_menuOrder"><code>@DomainServiceLayout#menuOrder()</code></a>
-attribute, specifying a low number (typically <code>"1"</code>).</p>
-</div>
-<div class="admonitionblock note">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-note" title="Note"></i>
-</td>
-<td class="content">
-<div class="paragraph">
-<p>For a small number of domain services, all implementations are used (following the chain-of-responsibility pattern),
-not just the first one. The services in question are:
-<a href="#_rgsvc_spi_ContentMappingService"><code>ContentMappingService</code></a>,
-<a href="#_rgsvc_spi_GridSystemService"><code>GridSystemService</code></a>, and
-<a href="#_rgsvc_spi_RoutingService"><code>RoutingService</code></a>.</p>
-</div>
-</td>
-</tr>
-</table>
-</div>
-<div class="paragraph">
-<p>For example, suppose you wanted to provide your own implementation of
-<a href="#_rgsvc_api_LocaleProvider"><code>LocaleProvider</code></a>. Here’s how:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="java"><span class="annotation">@DomainService</span>(
+}</code></pre>
+ </div>
+ </div>
+ <div class="colist arabic">
+ <table>
+ <tbody>
+ <tr>
+ <td><i class="conum" data-value="1"></i><b>1</b></td>
+ <td>Service automatically injected by the framework.</td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ <div class="paragraph">
+ <p>For objects that are already persisted, the service is automatically injected just after the object is rehydrated by JDO/DataNucleus.</p>
+ </div>
+ <div class="paragraph">
+ <p>For transient objects (instantiated programmatically), the <a href="#_rgsvc_api_FactoryService"><code>FactoryService</code></a>'s <code>instantiate()</code> method (or the deprecated <a href="#_rgsvc_api_DomainObjectContainer"><code>DomainObjectContainer</code></a>'s <code>newTransientInstance()</code> method) will automatically inject the services.</p>
+ </div>
+ <div class="paragraph">
+ <p>Alternatively the object can be instantiated simply using <code>new</code>, then services injected using <a href="#_rgsvc_api_ServiceRegistry"><code>ServiceRegistry</code></a>'s <code>injectServicesInto(\u2026\u200b)</code> method (or the deprecated <a href="#_rgsvc_api_DomainObjectContainer"><code>DomainObjectContainer</code></a>'s <code>injectServicesInto(\u2026\u200b)</code> method).</p>
+ </div>
+ </div>
+ <div class="sect2">
+ <h3 id="_rgsvc_intro_overriding-the-services">2.4. Overriding the services</h3>
+ <div class="paragraph">
+ <p>The framework provides default implementations for many of the domain services. This is convenient, but sometimes you will want to replace the default implementation with your own service implementation.</p>
+ </div>
+ <div class="paragraph">
+ <p>The trick is to use the <a href="rgant.html#_rgant-DomainServiceLayout_menuOrder"><code>@DomainServiceLayout#menuOrder()</code></a> attribute, specifying a low number (typically <code>"1"</code>).</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>For a small number of domain services, all implementations are used (following the chain-of-responsibility pattern), not just the first one. The services in question are: <a href="#_rgsvc_spi_ContentMappingService"><code>ContentMappingService</code></a>, <a href="#_rgsvc_spi_GridSystemService"><code>GridSystemService</code></a>, and <a href="#_rgsvc_spi_RoutingService"><code>RoutingService</code></a>.</p>
+ </div> </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ <div class="paragraph">
+ <p>For example, suppose you wanted to provide your own implementation of <a href="#_rgsvc_api_LocaleProvider"><code>LocaleProvider</code></a>. Here\u2019s how:</p>
+ </div>
+ <div class="listingblock">
+ <div class="content">
+ <pre class="CodeRay highlight"><code data-lang="java"><span class="annotation">@DomainService</span>(
nature = NatureOfService.DOMAIN
)
<span class="annotation">@DomainServiceLayout</span>(
- menuOrder = <span class="string"><span class="delimiter">"</span><span class="content">1</span><span class="delimiter">"</span></span> <i class="conum" data-value="1"></i><b>(1)</b>
+ menuOrder = <span class="string"><span class="delimiter">"</span><span class="content">1</span><span class="delimiter">"</span></span> <i class="conum" data-value="1"></i><b>(1)</b>
)
<span class="directive">public</span> <span class="type">class</span> <span class="class">MyLocaleProvider</span> <span class="directive">implements</span> LocaleProvider {
<span class="annotation">@Override</span>
<span class="directive">public</span> <span class="predefined-type">Locale</span> getLocale() {
<span class="keyword">return</span> ...
}
-}</code></pre>
-</div>
-</div>
-<div class="colist arabic">
-<table>
-<tr>
-<td><i class="conum" data-value="1"></i><b>1</b></td>
-<td>takes precedence over the default implementation.</td>
-</tr>
-</table>
-</div>
-<div class="paragraph">
-<p>It’s also quite common to want to decorate the existing implementation (ie have your own implementation delegate to the
-default); this is also possible and quite easy (if using <code>1.10.0</code> or later). The idea is to have the framework
-inject all implementations of the service, and then to delegate to the first one that isn’t "this" one:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="java"><span class="annotation">@DomainService</span>(nature=NatureOfService.DOMAIN)
+}</code></pre>
+ </div>
+ </div>
+ <div class="colist arabic">
+ <table>
+ <tbody>
+ <tr>
+ <td><i class="conum" data-value="1"></i><b>1</b></td>
+ <td>takes precedence over the default implementation.</td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ <div class="paragraph">
+ <p>It\u2019s also quite common to want to decorate the existing implementation (ie have your own implementation delegate to the default); this is also possible and quite easy (if using <code>1.10.0</code> or later). The idea is to have the framework inject all implementations of the service, and then to delegate to the first one that isn\u2019t "this" one:</p>
+ </div>
+ <div class="listingblock">
+ <div class="content">
+ <pre class="CodeRay highlight"><code data-lang="java"><span class="annotation">@DomainService</span>(nature=NatureOfService.DOMAIN)
<span class="annotation">@DomainServiceLayout</span>(
- menuOrder = <span class="string"><span class="delimiter">"</span><span class="content">1</span><span class="delimiter">"</span></span> <i class="conum" data-value="1"></i><b>(1)</b>
+ menuOrder = <span class="string"><span class="delimiter">"</span><span class="content">1</span><span class="delimiter">"</span></span> <i class="conum" data-value="1"></i><b>(1)</b>
)
<span class="directive">public</span> <span class="type">class</span> <span class="class">MyLocaleProvider</span> <span class="directive">implements</span> LocaleProvider {
<span class="annotation">@Override</span>
@@ -758,484 +657,390 @@ inject all implementations of the service, and then to delegate to the first one
}
<span class="annotation">@Inject</span>
<span class="predefined-type">List</span><LocaleProvider> localeProviders; <i class="conum" data-value="4"></i><b>(4)</b>
-}</code></pre>
-</div>
-</div>
-<div class="colist arabic">
-<table>
-<tr>
-<td><i class="conum" data-value="1"></i><b>1</b></td>
-<td>takes precedence over the default implementation when injected elsewhere.</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="2"></i><b>2</b></td>
-<td>this implementation merely delegates to the default implementation</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="3"></i><b>3</b></td>
-<td>find the first implementation that isn’t <em>this</em> implementation (else infinite loop!)</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="4"></i><b>4</b></td>
-<td>injects all implementations, including this implemenation</td>
-</tr>
-</table>
-</div>
-<div class="paragraph">
-<p>The above code could be improved by caching the delegateLocaleProvider once located (rather than searching each time).</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_rgsvc_intro_commands-and-events">2.5. Command and Events</h3>
-<div class="paragraph">
-<p>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.</p>
-</div>
-<div class="paragraph">
-<p>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.</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<a class="image" href="images/reference-services/commands-and-events.png"><img src="images/reference-services/commands-and-events.png" alt="commands and events" width="960px"></a>
-</div>
-</div>
-<div class="paragraph">
-<p>To explain:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>the (request-scoped) <a href="#_rgsvc_api_CommandContext"><code>CommandContext</code></a> captures the user’s intention to
-invoke an action or edit a property; this is held by the <code>Command</code> object.</p>
-</li>
-<li>
-<p>if a <a href="#_rgsvc_spi_CommandService"><code>CommandService</code></a> has been configured, then this will be used to
-create the <code>Command</code> object implementation, generally so that it can then also be persisted.<br></p>
-<div class="paragraph">
-<p>If the action or property is annotated to be invoked in the background (using
-<a href="rgant.html#_rgant-Action_command"><code>@Action#command…​()</code></a> or
-<a href="rgant.html#_rgant-Property_command"><code>@Property#command…​()</code></a>) then no further work is done. But,
-if the action/property is to be executed in the foreground, then the interaction continues.</p>
-</div>
-</li>
-<li>
-<p>the (request-scoped) <a href="#_rgsvc_api_InteractionContext"><code>InteractionContext</code></a> domain service acts as a
-factory for the <code>Interaction</code> object, which keeps track of the call-graph of executions (<code>Interaction.Execution</code>)
-of either action invocations or property edits. In the majority of cases there is likely to be just a single top-level
-node of this graph, but for applications that use the <a href="#_rgsvc_api_WrapperFactory"><code>WrapperFactory</code></a>
-extensively each successive call results in a new child execution.</p>
-</li>
-<li>
-<p>before and after each action invocation/property edit, a <a href="rgcms.html#_rgcms_classes_domainevent">domain event</a> is
-may be broadcast to all subscribers. Whether this occurs depends on whether the action/property has been annotated
-(using <a href="rgant.html#_rgant-Action_domainEvent"><code>@Action#domainEvent()</code></a> or
-<a href="rgant.html#_rgant-Property_domainEvent"><code>@Property#domainEvent()</code></a>).<br></p>
-<div class="paragraph">
-<p>(Note that susbcribers will also receive events for vetoing the action/property; this is not shown on the diagram).</p>
-</div>
-</li>
-<li>
-<p>As each execution progresses, and objects that are modified are "enlisted" into the (internal)
-<a href="rgfis.html#_rgfis_spi_ChangedObjectsServiceInternal"><code>ChangedObjectsServiceInternal</code></a> domain service. Metrics as
-to which objects are merely loaded into memory are also captured using the
-<a href="#_rgsvc_api_MetricsService"><code>MetricsService</code></a> (not shown on the diagram).</p>
-</li>
-<li>
-<p>At the end of each execution, details of that execution are published through the (internal)
-<a href="rgfis.html#_rgfis_spi_PublisherServiceInternal"><code>PublisherServiceInternal</code></a> domain service. This is only done for
-actions/properties annotated appropriate (with <a href="rgant.html#_rgant-Action_publishing"><code>@Action#publishing()</code></a> or
-<a href="rgant.html#_rgant-Property_publishing"><code>@Property#publishing()</code></a>). <br></p>
-<div class="paragraph">
-<p>The internal service delegates in turn to any registered
-<a href="#_rgsvc_spi_PublishingService"><code>PublishingService</code></a> (deprecated) and also to any
-registered <a href="#_rgsvc_spi_PublisherService"><code>PublisherService</code></a>s (there may be more than one).</p>
-</div>
-</li>
-<li>
-<p>At the end of each transaction, details of all changed objects are published, again through the (internal)
-<a href="rgfis.html#_rgfis_spi_PublisherServiceInternal"><code>PublisherServiceInternal</code></a> to any registered <code>PublishingService</code>
-or <code>PublisherService</code> implementations. Only domain objects specified to be published with
-<a href="rgant.html#_rgant-DomainObject_publishing"><code>@DomainObject#publishing()</code></a> are published.<br></p>
-<div class="admonitionblock note">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-note" title="Note"></i>
-</td>
-<td class="content">
-<div class="paragraph">
-<p>Note that it’s possible for there to be more than one transaction per top-level interaction, by virtue of the
-<a href="#_rgsvc_api_TransactionService"><code>TransactionService</code></a>.</p>
-</div>
-</td>
-</tr>
-</table>
-</div>
-</li>
-<li>
-<p>Also at the end of each transaction, details of all changed properties are passed to any registered
-<a href="#_rgsvc_spi_AuditerService"><code>AuditerService</code></a> or
-<a href="#_rgsvc_spi_AuditingService"><code>AuditingService</code></a> (the latter deprecated) by way of the (internal)
-<a href="rgfis.html#_rgfis_spi_AuditingServiceInternal"><code>AuditingServiceInternal</code></a> domain service.</p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>Implementations of <a href="#_rgsvc_spi_CommandService"><code>CommandService</code></a> can use the <code>Command#getMemento()</code>
-method to obtain a XML equivalent of that <code>Command</code>, reified using the <a href="rgcms.html#_rgcms_schema-cmd"><code>cmd.xsd</code></a>
-schema. This can be converted back into a <code>CommandDto</code> using the <code>CommandDtoUtils</code> utility class (part of the applib).</p>
-</div>
-<div class="paragraph">
-<p>Similarly, implementations of <a href="#_rgsvc_spi_PublisherService"><code>PublisherService</code></a> can use the
-<code>InteractionDtoUtils</code> utility class to obtain a <code>InteractionDto</code> 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.</p>
-</div>
-<div class="paragraph">
-<p>Likewise, the <code>PublishedObjects</code> class passed to the <code>PublisherService</code> at the end of the interaction provides the
-<code>PublishedObjects#getDto()</code> method which returns a <code>ChangesDto</code> instance. This can be converted into XML using the
-<code>ChangesDtoUtils</code> utility class.</p>
-</div>
-<div class="paragraph">
-<p>One final point: multiple <a href="#_rgsvc_spi_PublisherService"><code>PublisherService</code></a> implementations are supported
-because different implementations may have different responsibilities. For example, the (non-ASF)
-<a href="http://github.com/isisaddons/isis-module-publishmq">Isis addons' publishmq</a> 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
-<code>PublisherServiceLogging</code> implementation that logs this using SLF4J.</p>
-</div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_rgsvc_presentation-layer-spi">3. Presentation Layer SPI</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>Domain service SPIs for the presentation layer influence how the Apache Isis viewers behave.</p>
-</div>
-<div class="paragraph">
-<p>The table below summarizes the presentation layer SPIs defined by Apache Isis. It also lists their corresponding implementation, either a default implementation provided by Apache Isis itself, or provided by one of the in (non-ASF) <a href="http://www.isisaddons.org">Isis Addons</a> modules.</p>
-</div>
-<table class="tableblock frame-all grid-all spread">
-<caption class="title">Table 1. Presentation Layer SPI</caption>
-<colgroup>
-<col style="width: 25%;">
-<col style="width: 50%;">
-<col style="width: 12.5%;">
-<col style="width: 12.5%;">
-</colgroup>
-<thead>
-<tr>
-<th class="tableblock halign-left valign-top">SPI</th>
-<th class="tableblock halign-left valign-top">Description</th>
-<th class="tableblock halign-left valign-top">Implementation</th>
-<th class="tableblock halign-left valign-top">Notes</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgsvc_spi_ContentMappingService"><code>o.a.i.applb.</code><br>
-<code>services.conmap</code><br>
-<code>ContentMappingService</code></a></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>(Attempt to) map the returned data into the representation required by the client’s HTTP <code>Accept</code> header.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Replaces (and simplifies) the earlier <code>ContentMappingService</code> that defined an SPI using classes internal to the
-framework.<br>
-+
-No default implementation.</p></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgsvc_spi_EmailNotificationService"><code>o.a.i.applib.</code><br>
-<code>services.userreg</code><br>
-<code>EmailNotificationService</code></a></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Notify a user during <a href="#_rgsvc_spi_UserRegistrationService">self-registration</a> of users.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>EmailNotificationService-</code><br>
-<code>Default</code><br>
-<code>o.a.i.core</code><br>
-<code>isis-core-runtime</code></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">depends on:<br>
-a configured <code>EmailService</code></p></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgsvc_spi_ErrorReportingService"><code>o.a.i.applib.</code><br>
-<code>services.error</code><br>
-<code>ErrorReportingService</code></a></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Record details of an error occurring in the system (eg in an external incident recording system such as JIRA), and return a more friendly (jargon-free) message to display to the end user, with optional reference (eg <code>XXX-1234</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"></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgsvc_spi_ExceptionRecognizer"><code>o.a.i.applib.</code><br>
-<code>services.exceprecog</code><br>
-<code>ExceptionRecognizer2</code></a></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Convert certain exceptions (eg foreign or unique key violation in the database) into a format that can be rendered to the end-user.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>ExceptionRecognizer-</code><br>
-<code>CompositeFor-</code><br>
-<code>JdoObjectStore</code><br>
-<code>o.a.i.core</code><br>
-<code>isis-core-applib</code></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Extensible using composite pattern if required</p></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgsvc_spi_GridSystemService"><code>o.a.i.applib.</code><br>
-<code>services.grid</code><br>
-<code>GridSystemService</code></a></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Validates and normalizes the grid layout for a domain class (with respect to a particular grid
-system such as Bootstrap3), also providing a default grid (for those domain classes where there is no grid layout).</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>GridSystemServiceBS3</code><br>
-<code>o.a.i.core</code><br>
-<code>isis-core-metamodel</code></p></td>
-<td class="tableblock halign-left valign-top"></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgsvc_spi_GridLoaderService"><code>o.a.i.applib.</code><br>
-<code>services.grid</code><br>
-<code>GridLoaderService</code></a></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Responsible for loading a grid layout for a domain class, eg from a <code>layout.xml</code> file.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>GridLoaderServiceDefault</code><br>
-<code>o.a.i.core</code><br>
-<code>isis-core-metamodel</code></p></td>
-<td class="tableblock halign-left valign-top"></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgsvc_spi_GridService"><code>o.a.i.applib.</code><br>
-<code>services.grid</code><br>
-<code>GridService</code></a></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>A facade on top of both <a href="#_rgsvc_spi_GridLoaderService"><code>GridLoaderService</code></a> and
-<a href="#_rgsvc_spi_GridSystemService"><code>GridSystemService</code></a>, thus being able to return normalized
-grids for any domain class.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>GridServiceDefault</code><br>
-<code>o.a.i.core</code><br>
-<code>isis-core-metamodel</code></p></td>
-<td class="tableblock halign-left valign-top"></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgsvc_spi_HintStore"><code>o.a.i.applib.</code><br>
-<code>services.hint</code><br>
-<code>HintStore</code></a></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Stores UI hints on a per-object basis. For example, the viewer remembers which tabs are selected, and for collections which view is selected (eg table or hidden), which page of a table to render, or whether "show all" (rows) is toggled.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>HintStoreUsingWicketSession</code><br>
-<code>o.a.i.viewer</code><br>
-<code>isis-viewer-wicket-impl</code></p></td>
-<td class="tableblock halign-left valign-top"></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgsvc_spi_LocaleProvider"><code>o.a.i.applib.</code><br>
-<code>services.i18n</code><br>
-<code>LocaleProvider</code></a></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Request-scoped service to return the locale of the current user, in support of i18n (ie so that the app’s UI, messages and exceptions can be translated to the required locale by the <a href="#_rgsvc_spi_TranslationService"><code>TranslationService</code></a>.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>LocaleProviderWicket</code><br>
-<code>o.a.i.viewer</code><br>
-<code>isis-viewer-wicket-impl</code></p></td>
-<td class="tableblock halign-left valign-top"></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgsvc_spi_RoutingService"><code>o.a.i.applib.</code><br>
-<code>services.routing</code><br>
-<code>RoutingService</code></a></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Return an alternative object than that returned by an action.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>RoutingServiceDefault</code><br>
-<code>o.a.i.core</code><br>
-<code>isis-core-applib</code></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">The default implementation will return the home page (per <a href="#_rgsvc_api_HomePageProviderService"><code>HomePageProviderService</code></a>) if a void or null is returned.<br>
-Used by the <a href="ugvw.html">Wicket viewer</a> only.</p></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgsvc_spi_TableColumnOrderService"><code>o.a.i.applib.</code><br>
-<code>services.tablecol</code><br>
-<code>TableColumn-</code><br>
-<code>OrderService</code></a></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Allows the columns of a parented or standalone table to be reordered, based upon the parent object, collection id and type of object in the collection..</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>TableColumn-</code><br>
-<code>OrderService.Default</code><br>
-<code>o.a.i.core</code><br>
-<code>isis-core-applib</code></p></td>
-<td class="tableblock halign-left valign-top"></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgsvc_spi_TranslationService"><code>o.a.i.applib.</code><br>
-<code>services.i18n</code><br>
-<code>TranslationService</code></a></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Translate an app’s UI, messages and exceptions for the current user (as per the locale provided by <a href="#_rgsvc_spi_LocaleProvider"><code>LocalProvider</code></a>.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>TranslationServicePo</code><br>
-<code>o.a.i.core</code><br>
-<code>isis-core-runtime</code></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">related services: <code>TranslationServicePoMenu</code><br>
-depends on:<br>
-<code>TranslationsResolver</code>, <code>LocaleProvider</code></p></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgsvc_spi_TranslationsResolver"><code>o.a.i.applib.</code><br>
-<code>services.i18n</code><br>
-<code>TranslationsResolver</code></a></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Obtain translations for a particuar phrase and locale, in support of i18n (ie so that the app’s UI, messages and exceptions can be translated to the required locale by the <a href="#_rgsvc_spi_TranslationService"><code>TranslationService</code></a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>TranslationsResolverWicket</code><br>
-<code>o.a.i.viewer</code><br>
-<code>isis-viewer-wicket-impl</code></p></td>
-<td class="tableblock halign-left valign-top"></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgsvc_spi_UrlEncodingService"><code>o.a.i.applib.</code><br>
-<code>services.urlencoding</code><br>
-<code>UrlEncodingService</code></a></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Converts strings into a form safe for use within a URL. Used to convert view models mementos into usable URL form.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>UrlEncodingService</code><br>
-<code>UsingBaseEncoding</code><br>
-<code>o.a.i.applib</code><br>
-<code>isis-core-applib</code></p></td>
-<td class="tableblock halign-left valign-top"></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgsvc_spi_UserProfileService"><code>o.a.i.applib.</code><br>
-<code>services.userprof</code><br>
-<code>UserProfileService</code></a></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Obtain an alternative (usually enriched/customized) name for the current user, to render in the UI.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"></td>
-<td class="tableblock halign-left valign-top"></td>
-</tr>
-</tbody>
-</table>
-<div class="paragraph">
-<p>Key:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><code>o.a.i</code> is an abbreviation for <code>org.apache.isis</code></p>
-</li>
-<li>
-<p><code>o.ia.m</code> is an abbreviation for <code>org.isisaddons.module</code></p>
-</li>
-<li>
-<p><code>o.a.i.c.m.s</code> is an abbreviation for <code>org.apache.isis.core.metamodel.services</code></p>
-</li>
-<li>
-<p><code>o.a.i.c.r.s</code> is an abbreviation for <code>org.apache.isis.core.runtime.services</code></p>
-</li>
-</ul>
-</div>
-<div class="sect2">
-<h3 id="_rgsvc_spi_ContentMappingService">3.1. <code>ContentMappingService</code></h3>
-<div class="paragraph">
-<p>The <code>ContentMappingService</code> supports the (default implementation of the)
-<a href="rgfis.html#_rgfis_spi_ContentNegotiationService"><code>ContentNegotiationService</code></a> allowing the
-<a href="ugvro.html">RestfulObjects viewer</a> to allow domain objects to be transformed into some other format as specified
-by the HTTP <code>Accept</code> header.</p>
-</div>
-<div class="paragraph">
-<p>See <a href="rgfis.html#_rgfis_spi_ContentNegotiationService"><code>ContentNegotiationService</code></a> for further discussion.</p>
-</div>
-<div class="admonitionblock note">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-note" title="Note"></i>
-</td>
-<td class="content">
-<div class="paragraph">
-<p>Unlike most other domain services, the framework (that is, <code>ContentNegotiationService</code>) will check <em>all</em> available
-implementations of <code>ContentMappingService</code> to convert the domain object to the requested media type, rather than merely
-the first implementation found; in other words it uses the chain-of-responsibility pattern. Services are checked
-in the ordering defined by <a href="rgant.html#_rgant-DomainServiceLayout_menuOrder"><code>@DomainServiceLayout#menuOrder()</code></a>).
-The mapped object used will be the first non-<code>null</code> result returned by an implementation.</p>
-</div>
-</td>
-</tr>
-</table>
-</div>
-<div class="sect3">
-<h4 id="_spi">3.1.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">ContentMappingService</span> {
+}</code></pre>
+ </div>
+ </div>
+ <div class="colist arabic">
+ <table>
+ <tbody>
+ <tr>
+ <td><i class="conum" data-value="1"></i><b>1</b></td>
+ <td>takes precedence over the default implementation when injected elsewhere.</td>
+ </tr>
+ <tr>
+ <td><i class="conum" data-value="2"></i><b>2</b></td>
+ <td>this implementation merely delegates to the default implementation</td>
+ </tr>
+ <tr>
+ <td><i class="conum" data-value="3"></i><b>3</b></td>
+ <td>find the first implementation that isn\u2019t <em>this</em> implementation (else infinite loop!)</td>
+ </tr>
+ <tr>
+ <td><i class="conum" data-value="4"></i><b>4</b></td>
+ <td>injects all implementations, including this implemenation</td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ <div class="paragraph">
+ <p>The above code could be improved by caching the delegateLocaleProvider once located (rather than searching each time).</p>
+ </div>
+ </div>
+ <div class="sect2">
+ <h3 id="_rgsvc_intro_commands-and-events">2.5. Command and Events</h3>
+ <div class="paragraph">
+ <p>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.</p>
+ </div>
+ <div class="paragraph">
+ <p>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.</p>
+ </div>
+ <div class="imageblock">
+ <div class="content">
+ <a class="image" href="images/reference-services/commands-and-events.png"><img src="images/reference-services/commands-and-events.png" alt="commands and events" width="960px"></a>
+ </div>
+ </div>
+ <div class="paragraph">
+ <p>To explain:</p>
+ </div>
+ <div class="ulist">
+ <ul>
+ <li> <p>the (request-scoped) <a href="#_rgsvc_api_CommandContext"><code>CommandContext</code></a> captures the user\u2019s intention to invoke an action or edit a property; this is held by the <code>Command</code> object.</p> </li>
+ <li> <p>if a <a href="#_rgsvc_spi_CommandService"><code>CommandService</code></a> has been configured, then this will be used to create the <code>Command</code> object implementation, generally so that it can then also be persisted.<br></p>
+ <div class="paragraph">
+ <p>If the action or property is annotated to be invoked in the background (using <a href="rgant.html#_rgant-Action_command"><code>@Action#command\u2026\u200b()</code></a> or <a href="rgant.html#_rgant-Property_command"><code>@Property#command\u2026\u200b()</code></a>) then no further work is done. But, if the action/property is to be executed in the foreground, then the interaction continues.</p>
+ </div> </li>
+ <li> <p>the (request-scoped) <a href="#_rgsvc_api_InteractionContext"><code>InteractionContext</code></a> domain service acts as a factory for the <code>Interaction</code> object, which keeps track of the call-graph of executions (<code>Interaction.Execution</code>) of either action invocations or property edits. In the majority of cases there is likely to be just a single top-level node of this graph, but for applications that use the <a href="#_rgsvc_api_WrapperFactory"><code>WrapperFactory</code></a> extensively each successive call results in a new child execution.</p> </li>
+ <li> <p>before and after each action invocation/property edit, a <a href="rgcms.html#_rgcms_classes_domainevent">domain event</a> is may be broadcast to all subscribers. Whether this occurs depends on whether the action/property has been annotated (using <a href="rgant.html#_rgant-Action_domainEvent"><code>@Action#domainEvent()</code></a> or <a href="rgant.html#_rgant-Property_domainEvent"><code>@Property#domainEvent()</code></a>).<br></p>
+ <div class="paragraph">
+ <p>(Note that susbcribers will also receive events for vetoing the action/property; this is not shown on the diagram).</p>
+ </div> </li>
+ <li> <p>As each execution progresses, and objects that are modified are "enlisted" into the (internal) <a href="rgfis.html#_rgfis_spi_ChangedObjectsServiceInternal"><code>ChangedObjectsServiceInternal</code></a> domain service. Metrics as to which objects are merely loaded into memory are also captured using the <a href="#_rgsvc_api_MetricsService"><code>MetricsService</code></a> (not shown on the diagram).</p> </li>
+ <li> <p>At the end of each execution, details of that execution are published through the (internal) <a href="rgfis.html#_rgfis_spi_PublisherServiceInternal"><code>PublisherServiceInternal</code></a> domain service. This is only done for actions/properties annotated appropriate (with <a href="rgant.html#_rgant-Action_publishing"><code>@Action#publishing()</code></a> or <a href="rgant.html#_rgant-Property_publishing"><code>@Property#publishing()</code></a>). <br></p>
+ <div class="paragraph">
+ <p>The internal service delegates in turn to any registered <a href="#_rgsvc_spi_PublishingService"><code>PublishingService</code></a> (deprecated) and also to any registered <a href="#_rgsvc_spi_PublisherService"><code>PublisherService</code></a>s (there may be more than one).</p>
+ </div> </li>
+ <li> <p>At the end of each transaction, details of all changed objects are published, again through the (internal) <a href="rgfis.html#_rgfis_spi_PublisherServiceInternal"><code>PublisherServiceInternal</code></a> to any registered <code>PublishingService</code> or <code>PublisherService</code> implementations. Only domain objects specified to be published with <a href="rgant.html#_rgant-DomainObject_publishing"><code>@DomainObject#publishing()</code></a> are published.<br></p>
+ <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>Note that it\u2019s possible for there to be more than one transaction per top-level interaction, by virtue of the <a href="#_rgsvc_api_TransactionService"><code>TransactionService</code></a>.</p>
+ </div> </td>
+ </tr>
+ </tbody>
+ </table>
+ </div> </li>
+ <li> <p>Also at the end of each transaction, details of all changed properties are passed to any registered <a href="#_rgsvc_spi_AuditerService"><code>AuditerService</code></a> or <a href="#_rgsvc_spi_AuditingService"><code>AuditingService</code></a> (the latter deprecated) by way of the (internal) <a href="rgfis.html#_rgfis_spi_AuditingServiceInternal"><code>AuditingServiceInternal</code></a> domain service.</p> </li>
+ </ul>
+ </div>
+ <div class="paragraph">
+ <p>Implementations of <a href="#_rgsvc_spi_CommandService"><code>CommandService</code></a> can use the <code>Command#getMemento()</code> method to obtain a XML equivalent of that <code>Command</code>, reified using the <a href="rgcms.html#_rgcms_schema-cmd"><code>cmd.xsd</code></a> schema. This can be converted back into a <code>CommandDto</code> using the <code>CommandDtoUtils</code> utility class (part of the applib).</p>
+ </div>
+ <div class="paragraph">
+ <p>Similarly, implementations of <a href="#_rgsvc_spi_PublisherService"><code>PublisherService</code></a> can use the <code>InteractionDtoUtils</code> utility class to obtain a <code>InteractionDto</code> 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.</p>
+ </div>
+ <div class="paragraph">
+ <p>Likewise, the <code>PublishedObjects</code> class passed to the <code>PublisherService</code> at the end of the interaction provides the <code>PublishedObjects#getDto()</code> method which returns a <code>ChangesDto</code> instance. This can be converted into XML using the <code>ChangesDtoUtils</code> utility class.</p>
+ </div>
+ <div class="paragraph">
+ <p>One final point: multiple <a href="#_rgsvc_spi_PublisherService"><code>PublisherService</code></a> implementations are supported because different implementations may have different responsibilities. For example, the (non-ASF) <a href="http://github.com/isisaddons/isis-module-publishmq">Isis addons' publishmq</a> 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 <code>PublisherServiceLogging</code> implementation that logs this using SLF4J.</p>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="sect1">
+ <h2 id="_rgsvc_presentation-layer-spi">3. Presentation Layer SPI</h2>
+ <button type="button" class="button secondary" onclick="window.location.href="https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/_rgsvc_presentation-layer-spi.adoc"" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i> Edit</button>
+ <div class="sectionbody">
+ <div class="paragraph">
+ <p>Domain service SPIs for the presentation layer influence how the Apache Isis viewers behave.</p>
+ </div>
+ <div class="paragraph">
+ <p>The table below summarizes the presentation layer SPIs defined by Apache Isis. It also lists their corresponding implementation, either a default implementation provided by Apache Isis itself, or provided by one of the in (non-ASF) <a href="http://www.isisaddons.org">Isis Addons</a> modules.</p>
+ </div>
+ <table class="tableblock frame-all grid-all spread">
+ <caption class="title">
+ Table 1. Presentation Layer SPI
+ </caption>
+ <colgroup>
+ <col style="width: 25%;">
+ <col style="width: 50%;">
+ <col style="width: 12.5%;">
+ <col style="width: 12.5%;">
+ </colgroup>
+ <thead>
+ <tr>
+ <th class="tableblock halign-left valign-top">SPI</th>
+ <th class="tableblock halign-left valign-top">Description</th>
+ <th class="tableblock halign-left valign-top">Implementation</th>
+ <th class="tableblock halign-left valign-top">Notes</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgsvc_spi_ContentMappingService"><code>o.a.i.applb.</code><br> <code>services.conmap</code><br> <code>ContentMappingService</code></a></p></td>
+ <td class="tableblock halign-left valign-top">
+ <div>
+ <div class="paragraph">
+ <p>(Attempt to) map the returned data into the representation required by the client\u2019s HTTP <code>Accept</code> header.</p>
+ </div>
+ </div></td>
+ <td class="tableblock halign-left valign-top"></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock">Replaces (and simplifies) the earlier <code>ContentMappingService</code> that defined an SPI using classes internal to the framework.<br> + No default implementation.</p></td>
+ </tr>
+ <tr>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgsvc_spi_EmailNotificationService"><code>o.a.i.applib.</code><br> <code>services.userreg</code><br> <code>EmailNotificationService</code></a></p></td>
+ <td class="tableblock halign-left valign-top">
+ <div>
+ <div class="paragraph">
+ <p>Notify a user during <a href="#_rgsvc_spi_UserRegistrationService">self-registration</a> of users.</p>
+ </div>
+ </div></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><code>EmailNotificationService-</code><br> <code>Default</code><br> <code>o.a.i.core</code><br> <code>isis-core-runtime</code></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock">depends on:<br> a configured <code>EmailService</code></p></td>
+ </tr>
+ <tr>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgsvc_spi_ErrorReportingService"><code>o.a.i.applib.</code><br> <code>services.error</code><br> <code>ErrorReportingService</code></a></p></td>
+ <td class="tableblock halign-left valign-top">
+ <div>
+ <div class="paragraph">
+ <p>Record details of an error occurring in the system (eg in an external incident recording system such as JIRA), and return a more friendly (jargon-free) message to display to the end user, with optional reference (eg <code>XXX-1234</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"></td>
+ </tr>
+ <tr>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgsvc_spi_ExceptionRecognizer"><code>o.a.i.applib.</code><br> <code>services.exceprecog</code><br> <code>ExceptionRecognizer2</code></a></p></td>
+ <td class="tableblock halign-left valign-top">
+ <div>
+ <div class="paragraph">
+ <p>Convert certain exceptions (eg foreign or unique key violation in the database) into a format that can be rendered to the end-user.</p>
+ </div>
+ </div></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><code>ExceptionRecognizer-</code><br> <code>CompositeFor-</code><br> <code>JdoObjectStore</code><br> <code>o.a.i.core</code><br> <code>isis-core-applib</code></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock">Extensible using composite pattern if required</p></td>
+ </tr>
+ <tr>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgsvc_spi_GridSystemService"><code>o.a.i.applib.</code><br> <code>services.grid</code><br> <code>GridSystemService</code></a></p></td>
+ <td class="tableblock halign-left valign-top">
+ <div>
+ <div class="paragraph">
+ <p>Validates and normalizes the grid layout for a domain class (with respect to a particular grid system such as Bootstrap3), also providing a default grid (for those domain classes where there is no grid layout).</p>
+ </div>
+ </div></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><code>GridSystemServiceBS3</code><br> <code>o.a.i.core</code><br> <code>isis-core-metamodel</code></p></td>
+ <td class="tableblock halign-left valign-top"></td>
+ </tr>
+ <tr>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgsvc_spi_GridLoaderService"><code>o.a.i.applib.</code><br> <code>services.grid</code><br> <code>GridLoaderService</code></a></p></td>
+ <td class="tableblock halign-left valign-top">
+ <div>
+ <div class="paragraph">
+ <p>Responsible for loading a grid layout for a domain class, eg from a <code>layout.xml</code> file.</p>
+ </div>
+ </div></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><code>GridLoaderServiceDefault</code><br> <code>o.a.i.core</code><br> <code>isis-core-metamodel</code></p></td>
+ <td class="tableblock halign-left valign-top"></td>
+ </tr>
+ <tr>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgsvc_spi_GridService"><code>o.a.i.applib.</code><br> <code>services.grid</code><br> <code>GridService</code></a></p></td>
+ <td class="tableblock halign-left valign-top">
+ <div>
+ <div class="paragraph">
+ <p>A facade on top of both <a href="#_rgsvc_spi_GridLoaderService"><code>GridLoaderService</code></a> and <a href="#_rgsvc_spi_GridSystemService"><code>GridSystemService</code></a>, thus being able to return normalized grids for any domain class.</p>
+ </div>
+ </div></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><code>GridServiceDefault</code><br> <code>o.a.i.core</code><br> <code>isis-core-metamodel</code></p></td>
+ <td class="tableblock halign-left valign-top"></td>
+ </tr>
+ <tr>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgsvc_spi_HintStore"><code>o.a.i.applib.</code><br> <code>services.hint</code><br> <code>HintStore</code></a></p></td>
+ <td class="tableblock halign-left valign-top">
+ <div>
+ <div class="paragraph">
+ <p>Stores UI hints on a per-object basis. For example, the viewer remembers which tabs are selected, and for collections which view is selected (eg table or hidden), which page of a table to render, or whether "show all" (rows) is toggled.</p>
+ </div>
+ </div></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><code>HintStoreUsingWicketSession</code><br> <code>o.a.i.viewer</code><br> <code>isis-viewer-wicket-impl</code></p></td>
+ <td class="tableblock halign-left valign-top"></td>
+ </tr>
+ <tr>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgsvc_spi_LocaleProvider"><code>o.a.i.applib.</code><br> <code>services.i18n</code><br> <code>LocaleProvider</code></a></p></td>
+ <td class="tableblock halign-left valign-top">
+ <div>
+ <div class="paragraph">
+ <p>Request-scoped service to return the locale of the current user, in support of i18n (ie so that the app\u2019s UI, messages and exceptions can be translated to the required locale by the <a href="#_rgsvc_spi_TranslationService"><code>TranslationService</code></a>.</p>
+ </div>
+ </div></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><code>LocaleProviderWicket</code><br> <code>o.a.i.viewer</code><br> <code>isis-viewer-wicket-impl</code></p></td>
+ <td class="tableblock halign-left valign-top"></td>
+ </tr>
+ <tr>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgsvc_spi_RoutingService"><code>o.a.i.applib.</code><br> <code>services.routing</code><br> <code>RoutingService</code></a></p></td>
+ <td class="tableblock halign-left valign-top">
+ <div>
+ <div class="paragraph">
+ <p>Return an alternative object than that returned by an action.</p>
+ </div>
+ </div></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><code>RoutingServiceDefault</code><br> <code>o.a.i.core</code><br> <code>isis-core-applib</code></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock">The default implementation will return the home page (per <a href="#_rgsvc_api_HomePageProviderService"><code>HomePageProviderService</code></a>) if a void or null is returned.<br> Used by the <a href="ugvw.html">Wicket viewer</a> only.</p></td>
+ </tr>
+ <tr>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgsvc_spi_TableColumnOrderService"><code>o.a.i.applib.</code><br> <code>services.tablecol</code><br> <code>TableColumn-</code><br> <code>OrderService</code></a></p></td>
+ <td class="tableblock halign-left valign-top">
+ <div>
+ <div class="paragraph">
+ <p>Allows the columns of a parented or standalone table to be reordered, based upon the parent object, collection id and type of object in the collection..</p>
+ </div>
+ </div></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><code>TableColumn-</code><br> <code>OrderService.Default</code><br> <code>o.a.i.core</code><br> <code>isis-core-applib</code></p></td>
+ <td class="tableblock halign-left valign-top"></td>
+ </tr>
+ <tr>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgsvc_spi_TranslationService"><code>o.a.i.applib.</code><br> <code>services.i18n</code><br> <code>TranslationService</code></a></p></td>
+ <td class="tableblock halign-left valign-top">
+ <div>
+ <div class="paragraph">
+ <p>Translate an app\u2019s UI, messages and exceptions for the current user (as per the locale provided by <a href="#_rgsvc_spi_LocaleProvider"><code>LocalProvider</code></a>.</p>
+ </div>
+ </div></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><code>TranslationServicePo</code><br> <code>o.a.i.core</code><br> <code>isis-core-runtime</code></p></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock">related services: <code>TranslationServicePoMenu</code><br> depends on:<br> <code>TranslationsResolver</code>, <code>LocaleProvider</code></p></td>
+ </tr>
+ <tr>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgsvc_spi_TranslationsResolver"><code>o.a.i.applib.</code><br> <code>services.i18n</code><br> <code>TranslationsResolver</code></a></p></td>
+ <td class="tableblock halign-left valign-top">
+ <div>
+ <div class="paragraph">
+ <p>Obtain translations for a particuar phrase and locale, in support of i18n (ie so that the app\u2019s UI, messages and exceptions can be translated to the required locale by the <a href="#_rgsvc_spi_TranslationService"><code>TranslationService</code></a></p>
+ </div>
+ </div></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><code>TranslationsResolverWicket</code><br> <code>o.a.i.viewer</code><br> <code>isis-viewer-wicket-impl</code></p></td>
+ <td class="tableblock halign-left valign-top"></td>
+ </tr>
+ <tr>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgsvc_spi_UrlEncodingService"><code>o.a.i.applib.</code><br> <code>services.urlencoding</code><br> <code>UrlEncodingService</code></a></p></td>
+ <td class="tableblock halign-left valign-top">
+ <div>
+ <div class="paragraph">
+ <p>Converts strings into a form safe for use within a URL. Used to convert view models mementos into usable URL form.</p>
+ </div>
+ </div></td>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><code>UrlEncodingService</code><br> <code>UsingBaseEncoding</code><br> <code>o.a.i.applib</code><br> <code>isis-core-applib</code></p></td>
+ <td class="tableblock halign-left valign-top"></td>
+ </tr>
+ <tr>
+ <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgsvc_spi_UserProfileService"><code>o.a.i.applib.</code><br> <code>services.userprof</code><br> <code>UserProfileService</code></a></p></td>
+ <td class="tableblock halign-left valign-top">
+ <div>
+ <div class="paragraph">
+ <p>Obtain an alternative (usually enriched/customized) name for the current user, to render in the UI.</p>
+ </div>
+ </div></td>
+ <td class="tableblock halign-left valign-top"></td>
+ <td class="tableblock halign-left valign-top"></td>
+ </tr>
+ </tbody>
+ </table>
+ <div class="paragraph">
+ <p>Key:</p>
+ </div>
+ <div class="ulist">
+ <ul>
+ <li> <p><code>o.a.i</code> is an abbreviation for <code>org.apache.isis</code></p> </li>
+ <li> <p><code>o.ia.m</code> is an abbreviation for <code>org.isisaddons.module</code></p> </li>
+ <li> <p><code>o.a.i.c.m.s</code> is an abbreviation for <code>org.apache.isis.core.metamodel.services</code></p> </li>
+ <li> <p><code>o.a.i.c.r.s</code> is an abbreviation for <code>org.apache.isis.core.runtime.services</code></p> </li>
+ </ul>
+ </div>
+ <div class="sect2">
+ <h3 id="_rgsvc_spi_ContentMappingService">3.1. <code>ContentMappingService</code></h3>
+ <div class="paragraph">
+ <p>The <code>ContentMappingService</code> supports the (default implementation of the) <a href="rgfis.html#_rgfis_spi_ContentNegotiationService"><code>ContentNegotiationService</code></a> allowing the <a href="ugvro.html">RestfulObjects viewer</a> to allow domain objects to be transformed into some other format as specified by the HTTP <code>Accept</code> header.</p>
+ </div>
+ <div class="paragraph">
+ <p>See <a href="rgfis.html#_rgfis_spi_ContentNegotiationService"><code>ContentNegotiationService</code></a> for further discussion.</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>Unlike most other domain services, the framework (that is, <code>ContentNegotiationService</code>) will check <em>all</em> available implementations of <code>ContentMappingService</code> to convert the domain object to the requested media type, rather than merely the first implementation found; in other words it uses the chain-of-responsibility pattern. Services are checked in the ordering defined by <a href="rgant.html#_rgant-DomainServiceLayout_menuOrder"><code>@DomainServiceLayout#menuOrder()</code></a>). The mapped object used will be the first non-<code>null</code> result returned by an implementation.</p>
+ </div> </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ <div class="sect3">
+ <h4 id="_spi">3.1.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">ContentMappingService</span> {
<span class="predefined-type">Object</span> map(<span class="predefined-type">Object</span> object, <i class="conum" data-value="1"></i><b>(1)</b>
<span class="predefined-type">List</span><MediaType> acceptableMediaTypes); <i class="conum" data-value="2"></i><b>(2)</b>
-}</code></pre>
-</div>
-</div>
-<div class="colist arabic">
-<table>
-<tr>
-<td><i class="conum" data-value="1"></i><b>1</b></td>
-<td>typically the input is a domain object (whose structure might change over time), and the output is a DTO (whose structure is guaranteed to be preserved over time)</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="2"></i><b>2</b></td>
-<td>as per the caller’s HTTP <code>Accept</code> header</td>
-</tr>
-</table>
-</div>
-<div class="paragraph">
-<p>In versions prior to <code>v1.12.0</code>, this interface resided in a different package, internal to the
-<a href="#ugvro.adoc">Restful Objects</a> viewer, and defined a slightly different signature that used an internal enum:</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">ContentMappingService</span> {
+}</code></pre>
+ </div>
+ </div>
+ <div class="colist arabic">
+ <table>
+ <tbody>
+ <tr>
+ <td><i class="conum" data-value="1"></i><b>1</b></td>
+ <td>typically the input is a domain object (whose structure might change over time), and the output is a DTO (whose structure is guaranteed to be preserved over time)</td>
+ </tr>
+ <tr>
+ <td><i class="conum" data-value="2"></i><b>2</b></td>
+ <td>as per the caller\u2019s HTTP <code>Accept</code> header</td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ <div class="paragraph">
+ <p>In versions prior to <code>v1.12.0</code>, this interface resided in a different package, internal to the <a href="#ugvro.adoc">Restful Objects</a> viewer, and defined a slightly different signature that used an internal enum:</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">ContentMappingService</span> {
<span class="predefined-type">Object</span> map(<span class="predefined-type">Object</span> object,
<span class="predefined-type">List</span><MediaType> acceptableMediaTypes,
RepresentationType representationType); <i class="conum" data-value="1"></i><b>(1)</b>
-}</code></pre>
-</div>
-</div>
-<div class="colist arabic">
-<table>
-<tr>
-<td><i class="conum" data-value="1"></i><b>1</b></td>
-<td>enum representing the requested representation; only ever take a value of <code>DOMAIN_OBJECT</code> or <code>ACTION_RESULT</code>.</td>
-</tr>
-</table>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_implementations">3.1.2. Implementations</h4>
-<div class="paragraph">
-<p>No default implementations are provided by Apache Isis framework itself.</p>
-</div>
-<div class="paragraph">
-<p>However, the (non-ASF) <a href="http://github.com/isisaddons/isis-app-todoapp">Isis addons' todoapp</a> includes a sample implementation to convert its <code>ToDoItem</code> entity into a (JAXB annotated) <code>ToDoItemDto</code>. The source code is:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="java"><span class="annotation">@DomainService</span>(nature = NatureOfService.DOMAIN)
+}</code></pre>
+ </div>
+ </div>
+ <div class="colist arabic">
+ <table>
+ <tbody>
+ <tr>
+ <td><i class="conum" data-value="1"></i><b>1</b></td>
+ <td>enum representing the requested representation; only ever take a value of <code>DOMAIN_OBJECT</code> or <code>ACTION_RESULT</code>.</td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ </div>
+ <div class="sect3">
+ <h4 id="_implementations">3.1.2. Implementations</h4>
+ <div class="paragraph">
+ <p>No default implementations are provided by Apache Isis framework itself.</p>
+ </div>
+
<TRUNCATED>
[22/44] isis-site git commit: ISIS-1594: provide an 'edit' button
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/83a3755a/content/guides/ugbtb.pdf
----------------------------------------------------------------------
diff --git a/content/guides/ugbtb.pdf b/content/guides/ugbtb.pdf
index db04499..c542b87 100644
--- a/content/guides/ugbtb.pdf
+++ b/content/guides/ugbtb.pdf
@@ -4,16 +4,16 @@
<< /Title (Beyond the Basics)
/Creator (Asciidoctor PDF 1.5.0.alpha.11, based on Prawn 1.3.0)
/Producer (Asciidoctor PDF 1.5.0.alpha.11, based on Prawn 1.3.0)
-/CreationDate (D:20170214224358+00'00')
-/ModDate (D:20170214224358+00'00')
+/CreationDate (D:20170307234308+00'00')
+/ModDate (D:20170307234308+00'00')
>>
endobj
2 0 obj
<< /Type /Catalog
/Pages 3 0 R
/Names 16 0 R
-/Outlines 669 0 R
-/PageLabels 720 0 R
+/Outlines 668 0 R
+/PageLabels 719 0 R
/PageMode /UseOutlines
/OpenAction [7 0 R /FitH 842.89]
/ViewerPreferences << /DisplayDocTitle true
@@ -23,7 +23,7 @@ endobj
3 0 obj
<< /Type /Pages
/Count 86
-/Kids [7 0 R 10 0 R 12 0 R 14 0 R 39 0 R 48 0 R 52 0 R 67 0 R 83 0 R 89 0 R 100 0 R 111 0 R 117 0 R 124 0 R 127 0 R 133 0 R 137 0 R 139 0 R 141 0 R 147 0 R 151 0 R 157 0 R 163 0 R 169 0 R 173 0 R 175 0 R 186 0 R 197 0 R 204 0 R 216 0 R 219 0 R 227 0 R 240 0 R 246 0 R 254 0 R 257 0 R 264 0 R 267 0 R 271 0 R 273 0 R 275 0 R 280 0 R 284 0 R 293 0 R 300 0 R 304 0 R 315 0 R 324 0 R 335 0 R 337 0 R 350 0 R 360 0 R 363 0 R 371 0 R 373 0 R 375 0 R 386 0 R 390 0 R 404 0 R 414 0 R 420 0 R 423 0 R 429 0 R 437 0 R 449 0 R 456 0 R 461 0 R 464 0 R 471 0 R 478 0 R 484 0 R 494 0 R 502 0 R 509 0 R 521 0 R 528 0 R 534 0 R 537 0 R 543 0 R 547 0 R 551 0 R 553 0 R 556 0 R 560 0 R 562 0 R 566 0 R]
+/Kids [7 0 R 10 0 R 12 0 R 14 0 R 39 0 R 48 0 R 52 0 R 67 0 R 83 0 R 89 0 R 100 0 R 110 0 R 116 0 R 123 0 R 126 0 R 132 0 R 136 0 R 138 0 R 140 0 R 146 0 R 150 0 R 156 0 R 162 0 R 168 0 R 172 0 R 174 0 R 185 0 R 196 0 R 203 0 R 215 0 R 218 0 R 226 0 R 239 0 R 245 0 R 253 0 R 256 0 R 263 0 R 266 0 R 270 0 R 272 0 R 274 0 R 279 0 R 283 0 R 292 0 R 299 0 R 303 0 R 314 0 R 323 0 R 334 0 R 336 0 R 349 0 R 359 0 R 362 0 R 370 0 R 372 0 R 374 0 R 385 0 R 389 0 R 403 0 R 413 0 R 419 0 R 422 0 R 428 0 R 436 0 R 448 0 R 455 0 R 460 0 R 463 0 R 470 0 R 477 0 R 483 0 R 493 0 R 501 0 R 508 0 R 520 0 R 527 0 R 533 0 R 536 0 R 542 0 R 546 0 R 550 0 R 552 0 R 555 0 R 559 0 R 561 0 R 565 0 R]
>>
endobj
4 0 obj
@@ -78,13 +78,13 @@ endobj
endobj
8 0 obj
<< /Type /Font
-/BaseFont /AAAACY+NotoSerif
+/BaseFont /AAAACP+NotoSerif
/Subtype /TrueType
-/FontDescriptor 722 0 R
+/FontDescriptor 721 0 R
/FirstChar 32
/LastChar 255
-/Widths 724 0 R
-/ToUnicode 723 0 R
+/Widths 723 0 R
+/ToUnicode 722 0 R
>>
endobj
9 0 obj
@@ -1673,7 +1673,7 @@ endobj
/F4.0 43 0 R
>>
>>
-/Annots [568 0 R 569 0 R 570 0 R 571 0 R 572 0 R 573 0 R 574 0 R 575 0 R 576 0 R 577 0 R 578 0 R 579 0 R 580 0 R 581 0 R 582 0 R 583 0 R 584 0 R 585 0 R 586 0 R 587 0 R 588 0 R 589 0 R 590 0 R 591 0 R 592 0 R 593 0 R 594 0 R 595 0 R 596 0 R 597 0 R 598 0 R 599 0 R 600 0 R 601 0 R 602 0 R 603 0 R 604 0 R 605 0 R 606 0 R 607 0 R 608 0 R 609 0 R 610 0 R 611 0 R 612 0 R 613 0 R 614 0 R 615 0 R 616 0 R 617 0 R 618 0 R 619 0 R 620 0 R 621 0 R 622 0 R 623 0 R 624 0 R 625 0 R 626 0 R 627 0 R 628 0 R 629 0 R 630 0 R 631 0 R 632 0 R 633 0 R 634 0 R 635 0 R 636 0 R 637 0 R 638 0 R 639 0 R 640 0 R 641 0 R 642 0 R 643 0 R 644 0 R 645 0 R 646 0 R]
+/Annots [567 0 R 568 0 R 569 0 R 570 0 R 571 0 R 572 0 R 573 0 R 574 0 R 575 0 R 576 0 R 577 0 R 578 0 R 579 0 R 580 0 R 581 0 R 582 0 R 583 0 R 584 0 R 585 0 R 586 0 R 587 0 R 588 0 R 589 0 R 590 0 R 591 0 R 592 0 R 593 0 R 594 0 R 595 0 R 596 0 R 597 0 R 598 0 R 599 0 R 600 0 R 601 0 R 602 0 R 603 0 R 604 0 R 605 0 R 606 0 R 607 0 R 608 0 R 609 0 R 610 0 R 611 0 R 612 0 R 613 0 R 614 0 R 615 0 R 616 0 R 617 0 R 618 0 R 619 0 R 620 0 R 621 0 R 622 0 R 623 0 R 624 0 R 625 0 R 626 0 R 627 0 R 628 0 R 629 0 R 630 0 R 631 0 R 632 0 R 633 0 R 634 0 R 635 0 R 636 0 R 637 0 R 638 0 R 639 0 R 640 0 R 641 0 R 642 0 R 643 0 R 644 0 R 645 0 R]
>>
endobj
11 0 obj
@@ -2108,7 +2108,7 @@ endobj
/F4.0 43 0 R
>>
>>
-/Annots [647 0 R 648 0 R 649 0 R 650 0 R 651 0 R 652 0 R 653 0 R 654 0 R 655 0 R 656 0 R 657 0 R 658 0 R 659 0 R 660 0 R 661 0 R 662 0 R 663 0 R 664 0 R 665 0 R 666 0 R 667 0 R]
+/Annots [646 0 R 647 0 R 648 0 R 649 0 R 650 0 R 651 0 R 652 0 R 653 0 R 654 0 R 655 0 R 656 0 R 657 0 R 658 0 R 659 0 R 660 0 R 661 0 R 662 0 R 663 0 R 664 0 R 665 0 R 666 0 R]
>>
endobj
13 0 obj
@@ -2793,7 +2793,7 @@ endobj
/Font << /F2.0 18 0 R
/F1.0 8 0 R
>>
-/XObject << /Stamp1 668 0 R
+/XObject << /Stamp1 667 0 R
>>
>>
/Annots [19 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]
@@ -2808,18 +2808,18 @@ endobj
>>
endobj
17 0 obj
-<< /Kids [165 0 R 469 0 R 289 0 R 410 0 R 166 0 R 382 0 R 540 0 R 201 0 R 345 0 R 498 0 R]
+<< /Kids [164 0 R 468 0 R 288 0 R 409 0 R 165 0 R 381 0 R 539 0 R 200 0 R 344 0 R 497 0 R]
>>
endobj
18 0 obj
<< /Type /Font
-/BaseFont /AAAACZ+NotoSerif-Bold
+/BaseFont /AAAACQ+NotoSerif-Bold
/Subtype /TrueType
-/FontDescriptor 726 0 R
+/FontDescriptor 725 0 R
/FirstChar 32
/LastChar 255
-/Widths 728 0 R
-/ToUnicode 727 0 R
+/Widths 727 0 R
+/ToUnicode 726 0 R
>>
endobj
19 0 obj
@@ -3778,7 +3778,7 @@ endobj
/F4.0 43 0 R
/F5.1 45 0 R
>>
-/XObject << /Stamp1 668 0 R
+/XObject << /Stamp1 667 0 R
>>
>>
/Annots [46 0 R]
@@ -3789,13 +3789,13 @@ endobj
endobj
41 0 obj
<< /Type /Font
-/BaseFont /AAAADA+NotoSerif-Italic
+/BaseFont /AAAACR+NotoSerif-Italic
/Subtype /TrueType
-/FontDescriptor 730 0 R
+/FontDescriptor 729 0 R
/FirstChar 32
/LastChar 255
-/Widths 732 0 R
-/ToUnicode 731 0 R
+/Widths 731 0 R
+/ToUnicode 730 0 R
>>
endobj
42 0 obj
@@ -3803,13 +3803,13 @@ endobj
endobj
43 0 obj
<< /Type /Font
-/BaseFont /AAAADB+mplus1mn-regular
+/BaseFont /AAAACS+mplus1mn-regular
/Subtype /TrueType
-/FontDescriptor 734 0 R
+/FontDescriptor 733 0 R
/FirstChar 32
/LastChar 255
-/Widths 736 0 R
-/ToUnicode 735 0 R
+/Widths 735 0 R
+/ToUnicode 734 0 R
>>
endobj
44 0 obj
@@ -3817,13 +3817,13 @@ endobj
endobj
45 0 obj
<< /Type /Font
-/BaseFont /AAAADC+FontAwesome
+/BaseFont /AAAACT+FontAwesome
/Subtype /TrueType
-/FontDescriptor 738 0 R
+/FontDescriptor 737 0 R
/FirstChar 32
/LastChar 255
-/Widths 740 0 R
-/ToUnicode 739 0 R
+/Widths 739 0 R
+/ToUnicode 738 0 R
>>
endobj
46 0 obj
@@ -4277,7 +4277,7 @@ endobj
/F1.0 8 0 R
/F3.0 41 0 R
>>
-/XObject << /Stamp1 668 0 R
+/XObject << /Stamp1 667 0 R
>>
>>
>>
@@ -5222,7 +5222,7 @@ endobj
/F3.0 41 0 R
/F1.1 60 0 R
>>
-/XObject << /Stamp1 668 0 R
+/XObject << /Stamp1 667 0 R
>>
>>
/Annots [53 0 R 54 0 R 55 0 R 56 0 R 58 0 R 59 0 R 61 0 R 62 0 R 63 0 R 64 0 R 65 0 R]
@@ -5299,13 +5299,13 @@ endobj
endobj
60 0 obj
<< /Type /Font
-/BaseFont /AAAADD+NotoSerif
+/BaseFont /AAAACU+NotoSerif
/Subtype /TrueType
-/FontDescriptor 742 0 R
+/FontDescriptor 741 0 R
/FirstChar 32
/LastChar 255
-/Widths 744 0 R
-/ToUnicode 743 0 R
+/Widths 743 0 R
+/ToUnicode 742 0 R
>>
endobj
61 0 obj
@@ -6328,7 +6328,7 @@ endobj
/F2.0 18 0 R
/F5.1 45 0 R
>>
-/XObject << /Stamp1 668 0 R
+/XObject << /Stamp1 667 0 R
>>
>>
/Annots [68 0 R 69 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 81 0 R]
@@ -7624,7 +7624,7 @@ endobj
/F2.0 18 0 R
/F4.0 43 0 R
>>
-/XObject << /Stamp1 668 0 R
+/XObject << /Stamp1 667 0 R
>>
>>
/Annots [84 0 R 85 0 R 86 0 R 87 0 R]
@@ -8498,7 +8498,7 @@ endobj
/F1.0 8 0 R
/F4.0 43 0 R
>>
-/XObject << /Stamp1 668 0 R
+/XObject << /Stamp1 667 0 R
>>
>>
/Annots [90 0 R 92 0 R 93 0 R 94 0 R 95 0 R 96 0 R 97 0 R 98 0 R]
@@ -8593,7 +8593,7 @@ endobj
>>
endobj
99 0 obj
-<< /Length 43935
+<< /Length 47229
>>
stream
q
@@ -8627,13 +8627,13 @@ h
S
Q
/DeviceRGB cs
-0.000 0.533 0.000 scn
+0.000 0.400 0.600 scn
/DeviceRGB CS
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 SCN
BT
59.24 783.0649999999999 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<7061636b616765> Tj
ET
@@ -8650,101 +8650,13 @@ 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.800 1.000 scn
+0.000 0.800 1.000 SCN
BT
103.24000000000001 783.0649999999999 Td
/F4.0 11 Tf
-<746f646f617070> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-BT
-141.74 783.0649999999999 Td
-/F4.0 11 Tf
-<2e> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-147.24 783.0649999999999 Td
-/F4.0 11 Tf
-<617070> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-BT
-163.74 783.0649999999999 Td
-/F4.0 11 Tf
-<2e> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-169.24 783.0649999999999 Td
-/F4.0 11 Tf
-<766965776d6f64656c73> 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
-224.24 783.0649999999999 Td
-/F4.0 11 Tf
-<2e> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-229.74 783.0649999999999 Td
-/F4.0 11 Tf
-<746f646f6974656d> 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
-273.74 783.0649999999999 Td
-/F4.0 11 Tf
-<2e> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-279.24 783.0649999999999 Td
-/F4.0 11 Tf
-<7631> Tj
+<746f646f6170702e6170702e766965776d6f64656c732e746f646f6974656d2e7631> Tj
ET
0.000 0.000 0.000 SCN
@@ -8782,8 +8694,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
BT
59.24 768.3249999999999 Td
@@ -8848,13 +8760,35 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
BT
185.74 768.3249999999999 Td
/F4.0 11 Tf
-<22746f446f4974656d44746f22> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+191.24 768.3249999999999 Td
+/F4.0 11 Tf
+<746f446f4974656d44746f> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+251.74 768.3249999999999 Td
+/F4.0 11 Tf
+<22> Tj
ET
0.000 0.000 0.000 SCN
@@ -8892,8 +8826,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
BT
59.24 753.585 Td
@@ -9013,13 +8947,35 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
BT
125.24000000000001 724.105 Td
/F4.0 11 Tf
-<226d616a6f7256657273696f6e22> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+130.74 724.105 Td
+/F4.0 11 Tf
+<6d616a6f7256657273696f6e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+196.74 724.105 Td
+/F4.0 11 Tf
+<22> Tj
ET
0.000 0.000 0.000 SCN
@@ -9046,13 +9002,35 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
BT
213.24 724.105 Td
/F4.0 11 Tf
-<226d696e6f7256657273696f6e22> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+218.74 724.105 Td
+/F4.0 11 Tf
+<6d696e6f7256657273696f6e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+284.74 724.105 Td
+/F4.0 11 Tf
+<22> Tj
ET
0.000 0.000 0.000 SCN
@@ -9079,13 +9057,35 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
BT
125.24000000000001 709.365 Td
/F4.0 11 Tf
-<226465736372697074696f6e22> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+130.74 709.365 Td
+/F4.0 11 Tf
+<6465736372697074696f6e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+191.24 709.365 Td
+/F4.0 11 Tf
+<22> Tj
ET
0.000 0.000 0.000 SCN
@@ -9112,13 +9112,35 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
BT
207.74 709.365 Td
/F4.0 11 Tf
-<2263617465676f727922> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+213.24 709.365 Td
+/F4.0 11 Tf
+<63617465676f7279> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+257.24 709.365 Td
+/F4.0 11 Tf
+<22> Tj
ET
0.000 0.000 0.000 SCN
@@ -9151,7 +9173,29 @@ ET
BT
273.74 709.365 Td
/F4.0 11 Tf
-<2e2e2e> Tj
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+279.24 709.365 Td
+/F4.0 11 Tf
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+284.74 709.365 Td
+/F4.0 11 Tf
+<2e> Tj
ET
0.000 0.000 0.000 SCN
@@ -9167,13 +9211,35 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
BT
125.24000000000001 694.625 Td
/F4.0 11 Tf
-<22746f446f4974656d22> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+130.74 694.625 Td
+/F4.0 11 Tf
+<746f446f4974656d> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+174.74 694.625 Td
+/F4.0 11 Tf
+<22> Tj
ET
0.000 0.000 0.000 SCN
@@ -9200,13 +9266,35 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
BT
191.24 694.625 Td
/F4.0 11 Tf
-<2273696d696c61724974656d7322> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+196.74 694.625 Td
+/F4.0 11 Tf
+<73696d696c61724974656d73> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+262.74 694.625 Td
+/F4.0 11 Tf
+<22> Tj
ET
0.000 0.000 0.000 SCN
@@ -9244,8 +9332,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
BT
59.24 650.405 Td
@@ -9343,8 +9431,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
257.24 635.665 Td
@@ -9365,8 +9453,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
284.74 635.665 Td
@@ -9409,12 +9497,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
59.24 606.185 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<7075626c6963> Tj
ET
@@ -9431,12 +9519,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
BT
97.74000000000001 606.185 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<636c617373> Tj
ET
@@ -9453,12 +9541,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
BT
130.74 606.185 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<546f446f4974656d56315f31> Tj
ET
@@ -9475,12 +9563,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
202.24 606.185 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<696d706c656d656e7473> Tj
ET
@@ -9563,8 +9651,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
BT
81.24000000000001 591.4449999999999 Td
@@ -9629,12 +9717,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
207.74 591.4449999999999 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<74727565> Tj
ET
@@ -9706,13 +9794,35 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
BT
323.24 591.4449999999999 Td
/F4.0 11 Tf
-<223122> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+328.74 591.4449999999999 Td
+/F4.0 11 Tf
+<31> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+334.24 591.4449999999999 Td
+/F4.0 11 Tf
+<22> Tj
ET
0.000 0.000 0.000 SCN
@@ -9761,12 +9871,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
81.24000000000001 576.7049999999999 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<7075626c6963> Tj
ET
@@ -9783,12 +9893,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
119.74000000000001 576.7049999999999 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<66696e616c> Tj
ET
@@ -9805,8 +9915,8 @@ 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
152.74 576.7049999999999 Td
@@ -9844,7 +9954,18 @@ ET
BT
273.74 576.7049999999999 Td
/F4.0 11 Tf
-<2829> 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
+
+BT
+279.24 576.7049999999999 Td
+/F4.0 11 Tf
+<29> Tj
ET
0.000 0.000 0.000 SCN
@@ -9882,12 +10003,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
301.24 576.7049999999999 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<72657475726e> Tj
ET
@@ -9904,13 +10025,35 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
BT
339.74 576.7049999999999 Td
/F4.0 11 Tf
-<223122> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+345.24 576.7049999999999 Td
+/F4.0 11 Tf
+<31> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+350.74 576.7049999999999 Td
+/F4.0 11 Tf
+<22> Tj
ET
0.000 0.000 0.000 SCN
@@ -9959,8 +10102,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
BT
81.24000000000001 561.9649999999999 Td
@@ -10025,12 +10168,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
207.74 561.9649999999999 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<74727565> Tj
ET
@@ -10102,13 +10245,35 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
BT
323.24 561.9649999999999 Td
/F4.0 11 Tf
-<223122> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+328.74 561.9649999999999 Td
+/F4.0 11 Tf
+<31> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+334.24 561.9649999999999 Td
+/F4.0 11 Tf
+<22> Tj
ET
0.000 0.000 0.000 SCN
@@ -10157,12 +10322,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
81.24000000000001 547.2249999999999 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<7075626c6963> Tj
ET
@@ -10179,8 +10344,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
BT
119.74000000000001 547.2249999999999 Td
@@ -10218,7 +10383,18 @@ ET
BT
240.74 547.2249999999999 Td
/F4.0 11 Tf
-<2829> 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
+
+BT
+246.24 547.2249999999999 Td
+/F4.0 11 Tf
+<29> Tj
ET
0.000 0.000 0.000 SCN
@@ -10256,12 +10432,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
268.24 547.2249999999999 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<72657475726e> Tj
ET
@@ -10278,13 +10454,35 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
BT
306.74 547.2249999999999 Td
/F4.0 11 Tf
-<223122> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+312.24 547.2249999999999 Td
+/F4.0 11 Tf
+<31> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+317.74 547.2249999999999 Td
+/F4.0 11 Tf
+<22> Tj
ET
0.000 0.000 0.000 SCN
@@ -10333,8 +10531,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
BT
81.24000000000001 517.7449999999999 Td
@@ -10399,12 +10597,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
207.74 517.7449999999999 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<74727565> Tj
ET
@@ -10454,8 +10652,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
BT
81.24000000000001 503.00499999999994 Td
@@ -10476,8 +10674,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
BT
125.24000000000001 503.00499999999994 Td
@@ -10498,12 +10696,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
81.24000000000001 488.26499999999993 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<70726f746563746564> Tj
ET
@@ -10520,8 +10718,8 @@ 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
136.24 488.26499999999993 Td
@@ -10575,8 +10773,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
BT
81.24000000000001 473.5249999999999 Td
@@ -10641,12 +10839,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
207.74 473.5249999999999 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<74727565> Tj
ET
@@ -10674,8 +10872,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
BT
81.24000000000001 458.7849999999999 Td
@@ -10696,8 +10894,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
BT
125.24000000000001 458.7849999999999 Td
@@ -10718,12 +10916,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
81.24000000000001 444.0449999999999 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<70726f746563746564> Tj
ET
@@ -10740,8 +10938,8 @@ 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
136.24 444.0449999999999 Td
@@ -10801,7 +10999,29 @@ ET
BT
81.24000000000001 429.3049999999999 Td
/F4.0 11 Tf
-<2e2e2e> Tj
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+86.74000000000001 429.3049999999999 Td
+/F4.0 11 Tf
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+92.24000000000001 429.3049999999999 Td
+/F4.0 11 Tf
+<2e> Tj
ET
0.000 0.000 0.000 SCN
@@ -10817,8 +11037,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
BT
81.24000000000001 399.8249999999999 Td
@@ -10839,8 +11059,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
BT
125.24000000000001 399.8249999999999 Td
@@ -10883,12 +11103,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
81.24000000000001 385.08499999999987 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<70726f746563746564> Tj
ET
@@ -10960,8 +11180,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
BT
81.24000000000001 370.34499999999986 Td
@@ -11004,8 +11224,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
BT
81.24000000000001 355.60499999999985 Td
@@ -11070,13 +11290,35 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
BT
185.74 355.60499999999985 Td
/F4.0 11 Tf
-<22746f646f4974656d22> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+191.24 355.60499999999985 Td
+/F4.0 11 Tf
+<746f646f4974656d> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+235.24 355.60499999999985 Td
+/F4.0 11 Tf
+<22> Tj
ET
0.000 0.000 0.000 SCN
@@ -11103,8 +11345,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
BT
81.24000000000001 340.86499999999984 Td
@@ -11125,8 +11367,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
BT
125.24000000000001 340.86499999999984 Td
@@ -11147,12 +11389,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
81.24000000000001 326.12499999999983 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<70726f746563746564> Tj
ET
@@ -11169,8 +11411,8 @@ 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
136.24 326.12499999999983 Td
@@ -11290,8 +11532,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
334.24 326.12499999999983 Td
@@ -11307,7 +11549,29 @@ ET
BT
400.24 326.12499999999983 Td
/F4.0 11 Tf
-<28293b> 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
+
+BT
+405.74 326.12499999999983 Td
+/F4.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
+411.24 326.12499999999983 Td
+/F4.0 11 Tf
+<3b> Tj
ET
0.000 0.000 0.000 SCN
@@ -11687,40 +11951,28 @@ endobj
/MediaBox [0 0 595.28 841.89]
/Contents 99 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F6.0 101 0 R
-/F4.0 43 0 R
-/F4.1 102 0 R
+/Font << /F4.0 43 0 R
+/F4.1 101 0 R
/F1.0 8 0 R
>>
-/XObject << /Stamp1 668 0 R
+/XObject << /Stamp1 667 0 R
>>
>>
-/Annots [103 0 R 104 0 R 105 0 R 106 0 R 107 0 R 108 0 R 109 0 R]
+/Annots [102 0 R 103 0 R 104 0 R 105 0 R 106 0 R 107 0 R 108 0 R]
>>
endobj
101 0 obj
<< /Type /Font
-/BaseFont /AAAADE+mplus1mn-bold
+/BaseFont /AAAACV+mplus1mn-regular
/Subtype /TrueType
-/FontDescriptor 746 0 R
+/FontDescriptor 745 0 R
/FirstChar 32
/LastChar 255
-/Widths 748 0 R
-/ToUnicode 747 0 R
+/Widths 747 0 R
+/ToUnicode 746 0 R
>>
endobj
102 0 obj
-<< /Type /Font
-/BaseFont /AAAADF+mplus1mn-regular
-/Subtype /TrueType
-/FontDescriptor 750 0 R
-/FirstChar 32
-/LastChar 255
-/Widths 752 0 R
-/ToUnicode 751 0 R
->>
-endobj
-103 0 obj
<< /Border [0 0 0]
/Dest (_ugbtb_view-models_jaxb_versioning)
/Subtype /Link
@@ -11728,7 +11980,7 @@ endobj
/Type /Annot
>>
endobj
-104 0 obj
+103 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -11739,7 +11991,7 @@ endobj
/Type /Annot
>>
endobj
-105 0 obj
+104 0 obj
<< /Border [0 0 0]
/Dest (_ugbtb_view-models_jaxb_versioning)
/Subtype /Link
@@ -11747,7 +11999,7 @@ endobj
/Type /Annot
>>
endobj
-106 0 obj
+105 0 obj
<< /Border [0 0 0]
/Dest (_ugbtb_view-models_jaxb_versioning)
/Subtype /Link
@@ -11755,7 +12007,7 @@ endobj
/Type /Annot
>>
endobj
-107 0 obj
+106 0 obj
<< /Border [0 0 0]
/Dest (_ugbtb_view-models_jaxb_versioning)
/Subtype /Link
@@ -11763,7 +12015,7 @@ endobj
/Type /Annot
>>
endobj
-108 0 obj
+107 0 obj
<< /Border [0 0 0]
/Dest (_ugbtb_view-models_jaxb_referencing-domain-entities)
/Subtype /Link
@@ -11771,7 +12023,7 @@ endobj
/Type /Annot
>>
endobj
-109 0 obj
+108 0 obj
<< /Border [0 0 0]
/Dest (_ugbtb_view-models_jaxb_referencing-domain-entities)
/Subtype /Link
@@ -11779,8 +12031,8 @@ endobj
/Type /Annot
>>
endobj
-110 0 obj
-<< /Length 21058
+109 0 obj
+<< /Length 21116
>>
stream
q
@@ -12309,12 +12561,12 @@ f
h
S
Q
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
59.24 485.66500000000013 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<7061636b616765> Tj
ET
@@ -12331,13 +12583,13 @@ 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.800 1.000 scn
+0.000 0.800 1.000 SCN
BT
103.24000000000001 485.66500000000013 Td
/F4.0 11 Tf
-<746f646f617070> Tj
+<746f646f6170702e6170702e766965776d6f64656c732e746f646f6974656d2e7631> Tj
ET
0.000 0.000 0.000 SCN
@@ -12346,20 +12598,9 @@ ET
0.200 0.200 0.200 SCN
BT
-141.74 485.66500000000013 Td
-/F4.0 11 Tf
-<2e> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-147.24 485.66500000000013 Td
+290.24 485.66500000000013 Td
/F4.0 11 Tf
-<617070> Tj
+<3b> Tj
ET
0.000 0.000 0.000 SCN
@@ -12368,96 +12609,41 @@ ET
0.200 0.200 0.200 SCN
BT
-163.74 485.66500000000013 Td
+59.24 470.9250000000001 Td
/F4.0 11 Tf
<2e> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-169.24 485.66500000000013 Td
-/F4.0 11 Tf
-<766965776d6f64656c73> 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
-224.24 485.66500000000013 Td
+64.74000000000001 470.9250000000001 Td
/F4.0 11 Tf
<2e> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-229.74 485.66500000000013 Td
-/F4.0 11 Tf
-<746f646f6974656d> 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
-273.74 485.66500000000013 Td
+70.24000000000001 470.9250000000001 Td
/F4.0 11 Tf
<2e> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-279.24 485.66500000000013 Td
-/F4.0 11 Tf
-<7631> 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
-290.24 485.66500000000013 Td
-/F4.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 470.9250000000001 Td
-/F4.0 11 Tf
-<2e2e2e> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
-
-BT
59.24 456.1850000000001 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<7075626c6963> Tj
ET
@@ -12474,12 +12660,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
BT
97.74000000000001 456.1850000000001 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<636c617373> Tj
ET
@@ -12496,12 +12682,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
BT
130.74 456.1850000000001 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<546f446f4974656d56315f31> Tj
ET
@@ -12518,12 +12704,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
202.24 456.1850000000001 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<696d706c656d656e7473> Tj
ET
@@ -12590,7 +12776,29 @@ ET
BT
81.24000000000001 441.4450000000001 Td
/F4.0 11 Tf
-<2e2e2e> Tj
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+86.74000000000001 441.4450000000001 Td
+/F4.0 11 Tf
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+92.24000000000001 441.4450000000001 Td
+/F4.0 11 Tf
+<2e> Tj
ET
0.000 0.000 0.000 SCN
@@ -12606,8 +12814,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
BT
81.24000000000001 426.7050000000001 Td
@@ -12628,8 +12836,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
BT
125.24000000000001 426.7050000000001 Td
@@ -12650,12 +12858,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
81.24000000000001 411.96500000000015 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<70726f746563746564> Tj
ET
@@ -12787,8 +12995,8 @@ f
h
S
Q
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
BT
59.24 320.7050000000001 Td
@@ -12831,8 +13039,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
301.24 320.7050000000001 Td
@@ -12853,12 +13061,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
59.24 305.9650000000001 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<7075626c6963> Tj
ET
@@ -12875,12 +13083,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
BT
97.74000000000001 305.9650000000001 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<636c617373> Tj
ET
@@ -12897,12 +13105,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
BT
130.74 305.9650000000001 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<546f446f4974656d> Tj
ET
@@ -12925,7 +13133,29 @@ ET
BT
180.24 305.9650000000001 Td
/F4.0 11 Tf
-<2e2e2e> Tj
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+185.74 305.9650000000001 Td
+/F4.0 11 Tf
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+191.24 305.9650000000001 Td
+/F4.0 11 Tf
+<2e> Tj
ET
0.000 0.000 0.000 SCN
@@ -12969,7 +13199,29 @@ ET
BT
81.24000000000001 291.2250000000001 Td
/F4.0 11 Tf
-<2e2e2e> Tj
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+86.74000000000001 291.2250000000001 Td
+/F4.0 11 Tf
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+92.24000000000001 291.2250000000001 Td
+/F4.0 11 Tf
+<2e> Tj
ET
0.000 0.000 0.000 SCN
@@ -13106,27 +13358,26 @@ Q
endstream
endobj
-111 0 obj
+110 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 110 0 R
+/Contents 109 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/Font << /F2.0 18 0 R
/F1.0 8 0 R
/F4.0 43 0 R
-/F6.0 101 0 R
>>
-/XObject << /Stamp1 668 0 R
+/XObject << /Stamp1 667 0 R
>>
>>
-/Annots [113 0 R 114 0 R 115 0 R]
+/Annots [112 0 R 113 0 R 114 0 R]
>>
endobj
-112 0 obj
-[111 0 R /XYZ 0 841.89 null]
+111 0 obj
+[110 0 R /XYZ 0 841.89 null]
endobj
-113 0 obj
+112 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -13137,7 +13388,7 @@ endobj
/Type /Annot
>>
endobj
-114 0 obj
+113 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -13148,7 +13399,7 @@ endobj
/Type /Annot
>>
endobj
-115 0 obj
+114 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -13159,8 +13410,8 @@ endobj
/Type /Annot
>>
endobj
-116 0 obj
-<< /Length 19695
+115 0 obj
+<< /Length 19679
>>
stream
q
@@ -13194,13 +13445,13 @@ h
S
Q
/DeviceRGB cs
-0.000 0.533 0.000 scn
+0.000 0.400 0.600 scn
/DeviceRGB CS
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 SCN
BT
59.24 783.0649999999999 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<7061636b616765> Tj
ET
@@ -13217,13 +13468,13 @@ 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.800 1.000 scn
+0.000 0.800 1.000 SCN
BT
103.24000000000001 783.0649999999999 Td
/F4.0 11 Tf
-<746f646f617070> Tj
+<746f646f6170702e6170702e766965776d6f64656c732e746f646f6974656d2e7631> Tj
ET
0.000 0.000 0.000 SCN
@@ -13232,20 +13483,9 @@ ET
0.200 0.200 0.200 SCN
BT
-141.74 783.0649999999999 Td
-/F4.0 11 Tf
-<2e> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-147.24 783.0649999999999 Td
+290.24 783.0649999999999 Td
/F4.0 11 Tf
-<617070> Tj
+<3b> Tj
ET
0.000 0.000 0.000 SCN
@@ -13254,96 +13494,41 @@ ET
0.200 0.200 0.200 SCN
BT
-163.74 783.0649999999999 Td
+59.24 768.3249999999999 Td
/F4.0 11 Tf
<2e> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-169.24 783.0649999999999 Td
-/F4.0 11 Tf
-<766965776d6f64656c73> 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
-224.24 783.0649999999999 Td
+64.74000000000001 768.3249999999999 Td
/F4.0 11 Tf
<2e> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-229.74 783.0649999999999 Td
-/F4.0 11 Tf
-<746f646f6974656d> 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
-273.74 783.0649999999999 Td
+70.24000000000001 768.3249999999999 Td
/F4.0 11 Tf
<2e> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-279.24 783.0649999999999 Td
-/F4.0 11 Tf
-<7631> 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
-290.24 783.0649999999999 Td
-/F4.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 768.3249999999999 Td
-/F4.0 11 Tf
-<2e2e2e> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
-
-BT
59.24 753.585 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<7075626c6963> Tj
ET
@@ -13360,12 +13545,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
BT
97.74000000000001 753.585 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<636c617373> Tj
ET
@@ -13382,12 +13567,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
BT
130.74 753.585 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<546f446f4974656d56315f31> Tj
ET
@@ -13404,12 +13589,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
202.24 753.585 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<696d706c656d656e7473> Tj
ET
@@ -13476,7 +13661,29 @@ ET
BT
81.24000000000001 738.845 Td
/F4.0 11 Tf
-<2e2e2e> Tj
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+86.74000000000001 738.845 Td
+/F4.0 11 Tf
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+92.24000000000001 738.845 Td
+/F4.0 11 Tf
+<2e> Tj
ET
0.000 0.000 0.000 SCN
@@ -13492,8 +13699,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
BT
81.24000000000001 724.105 Td
@@ -13514,8 +13721,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
BT
81.24000000000001 709.365 Td
@@ -13580,13 +13787,35 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
BT
185.74 709.365 Td
/F4.0 11 Tf
-<22746f646f4974656d22> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+191.24 709.365 Td
+/F4.0 11 Tf
+<746f646f4974656d> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+235.24 709.365 Td
+/F4.0 11 Tf
+<22> Tj
ET
0.000 0.000 0.000 SCN
@@ -13613,8 +13842,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
BT
81.24000000000001 694.625 Td
@@ -13635,8 +13864,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
BT
125.24000000000001 694.625 Td
@@ -13657,12 +13886,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
81.24000000000001 679.885 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<70726f746563746564> Tj
ET
@@ -13679,8 +13908,8 @@ 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
136.24 679.885 Td
@@ -13800,8 +14029,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
334.24 679.885 Td
@@ -13817,7 +14046,29 @@ ET
BT
400.24 679.885 Td
/F4.0 11 Tf
-<28293b> 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
+
+BT
+405.74 679.885 Td
+/F4.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
+411.24 679.885 Td
+/F4.0 11 Tf
+<3b> Tj
ET
0.000 0.000 0.000 SCN
@@ -14370,25 +14621,24 @@ Q
endstream
endobj
-117 0 obj
+116 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 116 0 R
+/Contents 115 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F6.0 101 0 R
-/F4.0 43 0 R
+/Font << /F4.0 43 0 R
/F1.0 8 0 R
/F2.0 18 0 R
/F5.1 45 0 R
>>
-/XObject << /Stamp1 668 0 R
+/XObject << /Stamp1 667 0 R
>>
>>
-/Annots [118 0 R 119 0 R 121 0 R 122 0 R]
+/Annots [117 0 R 118 0 R 120 0 R 121 0 R]
>>
endobj
-118 0 obj
+117 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -14399,7 +14649,7 @@ endobj
/Type /Annot
>>
endobj
-119 0 obj
+118 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -14410,10 +14660,10 @@ endobj
/Type /Annot
>>
endobj
-120 0 obj
-[117 0 R /XYZ 0 504.77 null]
+119 0 obj
+[116 0 R /XYZ 0 504.77 null]
endobj
-121 0 obj
+120 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -14424,7 +14674,7 @@ endobj
/Type /Annot
>>
endobj
-122 0 obj
+121 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -14435,8 +14685,8 @@ endobj
/Type /Annot
>>
endobj
-123 0 obj
-<< /Length 37575
+122 0 obj
+<< /Length 38607
>>
stream
q
@@ -14470,9 +14720,9 @@ h
S
Q
/DeviceRGB cs
-0.333 0.333 0.333 scn
+0.600 0.600 1.000 scn
/DeviceRGB CS
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 SCN
BT
59.24 783.0649999999999 Td
@@ -14493,8 +14743,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
97.74000000000001 783.0649999999999 Td
@@ -14515,8 +14765,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
119.74000000000001 783.0649999999999 Td
@@ -14537,8 +14787,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
147.24 783.0649999999999 Td
@@ -14559,8 +14809,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
207.74 783.0649999999999 Td
@@ -14636,13 +14886,35 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
BT
169.24 768.3249999999999 Td
/F4.0 11 Tf
-<22687474703a2f2f766965776d6f64656c732e6170702e746f646f6170702f746f646f6974656d2f76312f44746f2e78736422> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+174.74 768.3249999999999 Td
+/F4.0 11 Tf
+<687474703a2f2f766965776d6f64656c732e6170702e746f646f6170702f746f646f6974656d2f76312f44746f2e787364> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+444.24 768.3249999999999 Td
+/F4.0 11 Tf
+<22> Tj
ET
0.000 0.000 0.000 SCN
@@ -14757,8 +15029,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
BT
147.24 738.845 Td
@@ -14779,8 +15051,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
185.74 738.845 Td
@@ -14801,8 +15073,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
207.74 738.845 Td
@@ -14823,8 +15095,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
235.24 738.845 Td
@@ -14845,8 +15117,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
295.74 738.845 Td
@@ -14922,13 +15194,35 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
BT
273.74 724.105 Td
/F4.0 11 Tf
-<22687474703a2f2f697369732e6170616368652e6f72672f736368656d612f636f6d6d6f6e22> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+279.24 724.105 Td
+/F4.0 11 Tf
+<687474703a2f2f697369732e6170616368652e6f72672f736368656d612f636f6d6d6f6e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+477.24 724.105 Td
+/F4.0 11 Tf
+<22> Tj
ET
0.000 0.000 0.000 SCN
@@ -14999,13 +15293,35 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
BT
240.74 709.365 Td
/F4.0 11 Tf
-<22636f6d22> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+246.24 709.365 Td
+/F4.0 11 Tf
+<636f6d> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+262.74 709.365 Td
+/F4.0 11 Tf
+<22> Tj
ET
0.000 0.000 0.000 SCN
@@ -15049,7 +15365,18 @@ ET
BT
103.24000000000001 679.885 Td
/F4.0 11 Tf
-<7d2c> Tj
+<7d> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+108.74000000000001 679.885 Td
+/F4.0 11 Tf
+<2c> Tj
ET
0.000 0.000 0.000 SCN
@@ -15131,8 +15458,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
251.74 665.145 Td
@@ -15153,8 +15480,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
273.74 665.145 Td
@@ -15175,8 +15502,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
301.24 665.145 Td
@@ -15197,8 +15524,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
361.74 665.145 Td
@@ -15219,8 +15546,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
416.74 665.145 Td
@@ -15241,12 +15568,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
59.24 635.665 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<7061636b616765> Tj
ET
@@ -15263,101 +15590,13 @@ 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.800 1.000 scn
+0.000 0.800 1.000 SCN
BT
103.24000000000001 635.665 Td
/F4.0 11 Tf
-<746f646f617070> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-BT
-141.74 635.665 Td
-/F4.0 11 Tf
-<2e> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-147.24 635.665 Td
-/F4.0 11 Tf
-<617070> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-BT
-163.74 635.665 Td
-/F4.0 11 Tf
-<2e> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-169.24 635.665 Td
-/F4.0 11 Tf
-<766965776d6f64656c73> 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
-224.24 635.665 Td
-/F4.0 11 Tf
-<2e> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-229.74 635.665 Td
-/F4.0 11 Tf
-<746f646f6974656d> 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
-273.74 635.665 Td
-/F4.0 11 Tf
-<2e> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-279.24 635.665 Td
-/F4.0 11 Tf
-<7631> Tj
+<746f646f6170702e6170702e766965776d6f64656c732e746f646f6974656d2e7631> Tj
ET
0.000 0.000 0.000 SCN
@@ -15559,12 +15798,12 @@ f
h
S
Q
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
59.239999999999995 424.6850000000001 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<7061636b616765> Tj
ET
@@ -15581,13 +15820,13 @@ 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.800 1.000 scn
+0.000 0.800 1.000 SCN
BT
103.24 424.6850000000001 Td
/F4.0 11 Tf
-<746f646f617070> Tj
+<746f646f6170702e6170702e766965776d6f64656c732e746f646f6974656d2e7631> Tj
ET
0.000 0.000 0.000 SCN
@@ -15596,20 +15835,9 @@ ET
0.200 0.200 0.200 SCN
BT
-141.74 424.6850000000001 Td
-/F4.0 11 Tf
-<2e> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-147.24 424.6850000000001 Td
+290.24 424.6850000000001 Td
/F4.0 11 Tf
-<617070> Tj
+<3b> Tj
ET
0.000 0.000 0.000 SCN
@@ -15618,20 +15846,20 @@ ET
0.200 0.200 0.200 SCN
BT
-163.74 424.6850000000001 Td
+295.74 424.6850000000001 Td
/F4.0 11 Tf
-<2e> Tj
+<2020202020> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
BT
-169.24 424.6850000000001 Td
-/F4.0 11 Tf
-<766965776d6f64656c73> Tj
+323.24 424.6850000000001 Td
+/F4.1 11 Tf
+<21> Tj
ET
0.000 0.000 0.000 SCN
@@ -15640,75 +15868,31 @@ ET
0.200 0.200 0.200 SCN
BT
-224.24 424.6850000000001 Td
+59.239999999999995 409.9450000000001 Td
/F4.0 11 Tf
<2e> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-229.74 424.6850000000001 Td
-/F4.0 11 Tf
-<746f646f6974656d> 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
-273.74 424.6850000000001 Td
+64.74 409.9450000000001 Td
/F4.0 11 Tf
<2e> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-279.24 424.6850000000001 Td
-/F4.0 11 Tf
-<7631> 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
-290.24 424.6850000000001 Td
-/F4.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
-295.74 424.6850000000001 Td
+70.24 409.9450000000001 Td
/F4.0 11 Tf
-<2020202020> 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
-323.24 424.6850000000001 Td
-/F4.1 11 Tf
-<21> Tj
+<2e> Tj
ET
0.000 0.000 0.000 SCN
@@ -15717,19 +15901,8 @@ ET
0.200 0.200 0.200 SCN
BT
-59.239999999999995 409.9450000000001 Td
-/F4.0 11 Tf
-<2e2e2e> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
-
-BT
59.239999999999995 395.2050000000001 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<7075626c6963> Tj
ET
@@ -15746,12 +15919,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
BT
97.74 395.2050000000001 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<636c617373> Tj
ET
@@ -15768,12 +15941,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
BT
130.74 395.2050000000001 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<546f446f4974656d56315f31> Tj
ET
@@ -15790,12 +15963,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
202.24 395.2050000000001 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<696d706c656d656e7473> Tj
ET
@@ -15884,7 +16057,29 @@ ET
BT
81.24 380.4650000000001 Td
/F4.0 11 Tf
-<2e2e2e> Tj
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+86.74 380.4650000000001 Td
+/F4.0 11 Tf
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+92.24 380.4650000000001 Td
+/F4.0 11 Tf
+<2e> Tj
ET
0.000 0.000 0.000 SCN
@@ -16038,12 +16233,12 @@ f
h
S
Q
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
59.239999999999995 170.5250000000001 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<7075626c6963> Tj
ET
@@ -16060,12 +16255,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
BT
97.74 170.5250000000001 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<636c617373> Tj
ET
@@ -16082,12 +16277,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
BT
130.74 170.5250000000001 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<546f446f4974656d56315f31> Tj
ET
@@ -16104,12 +16299,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
202.24 170.5250000000001 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<696d706c656d656e7473> Tj
ET
@@ -16170,8 +16365,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
BT
81.24 155.78500000000008 Td
@@ -16236,12 +16431,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
207.74 155.78500000000008 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<74727565> Tj
ET
@@ -16313,13 +16508,35 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
BT
323.24 155.78500000000008 Td
/F4.0 11 Tf
-<223122> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+328.74 155.78500000000008 Td
+/F4.0 11 Tf
+<31> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+334.24 155.78500000000008 Td
+/F4.0 11 Tf
+<22> Tj
ET
0.000 0.000 0.000 SCN
@@ -16346,12 +16563,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
81.24 141.0450000000001 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<7075626c6963> Tj
ET
@@ -16368,12 +16585,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
119.74 141.0450000000001 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<66696e616c> Tj
ET
@@ -16390,8 +16607,8 @@ 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
152.74 141.0450000000001 Td
@@ -16429,7 +16646,18 @@ ET
BT
273.74 141.0450000000001 Td
/F4.0 11 Tf
-<2829> 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
+
+BT
+279.24 141.0450000000001 Td
+/F4.0 11 Tf
+<29> Tj
ET
0.000 0.000 0.000 SCN
@@ -16467,12 +16695,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
301.24 141.0450000000001 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<72657475726e> Tj
ET
@@ -16489,13 +16717,35 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
BT
339.74 141.0450000000001 Td
/F4.0 11 Tf
-<223122> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+345.24 141.0450000000001 Td
+/F4.0 11 Tf
+<31> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+350.74 141.0450000000001 Td
+/F4.0 11 Tf
+<22> Tj
ET
0.000 0.000 0.000 SCN
@@ -16566,8 +16816,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
BT
81.24 126.30500000000009 Td
@@ -16632,12 +16882,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
207.74 126.30500000000009 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<74727565> Tj
ET
@@ -16709,13 +16959,35 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
BT
323.24 126.30500000000009 Td
/F4.0 11 Tf
-<223122> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+328.74 126.30500000000009 Td
+/F4.0 11 Tf
+<31> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+334.24 126.30500000000009 Td
+/F4.0 11 Tf
+<22> Tj
ET
0.000 0.000 0.000 SCN
@@ -16742,12 +17014,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
81.24 111.5650000000001 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<7075626c6963> Tj
ET
@@ -16764,8 +17036,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
BT
119.74 111.5650000000001 Td
@@ -16803,7 +17075,18 @@ ET
BT
240.74 111.5650000000001 Td
/F4.0 11 Tf
-<2829> 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
+
+BT
+246.24 111.5650000000001 Td
+/F4.0 11 Tf
+<29> Tj
ET
0.000 0.000 0.000 SCN
@@ -16841,12 +17124,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
268.24 111.5650000000001 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<72657475726e> Tj
ET
@@ -16863,13 +17146,35 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
BT
306.74 111.5650000000001 Td
/F4.0 11 Tf
-<223122> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+312.24 111.5650000000001 Td
+/F4.0 11 Tf
+<31> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+317.74 111.5650000000001 Td
+/F4.0 11 Tf
+<22> Tj
ET
0.000 0.000 0.000 SCN
@@ -16946,7 +17251,29 @@ ET
BT
81.24 96.8250000000001 Td
/F4.0 11 Tf
-<2e2e2e> Tj
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+86.74 96.8250000000001 Td
+/F4.0 11 Tf
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+92.24 96.8250000000001 Td
+/F4.0 11 Tf
+<2e> Tj
ET
0.000 0.000 0.000 SCN
@@ -16986,24 +17313,23 @@ Q
endstream
endobj
-124 0 obj
+123 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 123 0 R
+/Contents 122 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/Font << /F4.0 43 0 R
-/F4.1 102 0 R
-/F6.0 101 0 R
+/F4.1 101 0 R
/F1.0 8 0 R
>>
-/XObject << /Stamp1 668 0 R
+/XObject << /Stamp1 667 0 R
>>
>>
-/Annots [125 0 R]
+/Annots [124 0 R]
>>
endobj
-125 0 obj
+124 0 obj
<< /Border [0 0 0]
/Dest (_ugbtb_view-models_jaxb_using-packages-to-version)
/Subtype /Link
@@ -17011,8 +17337,8 @@ endobj
/Type /Annot
>>
endobj
-126 0 obj
-<< /Length 24484
+125 0 obj
+<< /Length 26106
>>
stream
q
@@ -17171,12 +17497,12 @@ f
h
S
Q
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
59.239999999999995 614.825 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<7075626c6963> Tj
ET
@@ -17193,12 +17519,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
BT
97.74 614.825 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<636c617373> Tj
ET
@@ -17215,12 +17541,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
BT
130.74 614.825 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<546f446f4974656d56315f32> Tj
ET
@@ -17237,12 +17563,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
202.24 614.825 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<696d706c656d656e7473> Tj
ET
@@ -17303,8 +17629,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
BT
81.24 600.085 Td
@@ -17369,12 +17695,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
207.74 600.085 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<74727565> Tj
ET
@@ -17446,13 +17772,35 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
BT
323.24 600.085 Td
/F4.0 11 Tf
-<223122> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+328.74 600.085 Td
+/F4.0 11 Tf
+<31> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+334.24 600.085 Td
+/F4.0 11 Tf
+<22> Tj
ET
0.000 0.000 0.000 SCN
@@ -17479,12 +17827,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
81.24 585.345 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<7075626c6963> Tj
ET
@@ -17501,12 +17849,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
119.74 585.345 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<66696e616c> Tj
ET
@@ -17523,8 +17871,8 @@ 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
152.74 585.345 Td
@@ -17562,7 +17910,18 @@ ET
BT
273.74 585.345 Td
/F4.0 11 Tf
-<2829> 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
+
+BT
+279.24 585.345 Td
+/F4.0 11 Tf
+<29> Tj
ET
0.000 0.000 0.000 SCN
@@ -17600,12 +17959,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
301.24 585.345 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<72657475726e> Tj
ET
@@ -17622,13 +17981,35 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
BT
339.74 585.345 Td
/F4.0 11 Tf
-<223122> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+345.24 585.345 Td
+/F4.0 11 Tf
+<31> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+350.74 585.345 Td
+/F4.0 11 Tf
+<22> Tj
ET
0.000 0.000 0.000 SCN
@@ -17677,8 +18058,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
BT
81.24 570.6050000000001 Td
@@ -17743,12 +18124,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
207.74 570.6050000000001 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<74727565> Tj
ET
@@ -17820,13 +18201,35 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
BT
323.24 570.6050000000001 Td
/F4.0 11 Tf
-<223222> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+328.74 570.6050000000001 Td
+/F4.0 11 Tf
+<32> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+334.24 570.6050000000001 Td
+/F4.0 11 Tf
+<22> Tj
ET
0.000 0.000 0.000 SCN
@@ -17853,12 +18256,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
81.24 555.865 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<7075626c6963> Tj
ET
@@ -17875,8 +18278,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
BT
119.74 555.865 Td
@@ -17914,7 +18317,18 @@ ET
BT
240.74 555.865 Td
/F4.0 11 Tf
-<2829> 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
+
+BT
+246.24 555.865 Td
+/F4.0 11 Tf
+<29> Tj
ET
0.000 0.000 0.000 SCN
@@ -17952,12 +18366,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
268.24 555.865 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<72657475726e> Tj
ET
@@ -17974,13 +18388,35 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
BT
306.74 555.865 Td
/F4.0 11 Tf
-<223222> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+312.24 555.865 Td
+/F4.0 11 Tf
+<32> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+317.74 555.865 Td
+/F4.0 11 Tf
+<22> Tj
ET
0.000 0.000 0.000 SCN
@@ -18035,7 +18471,29 @@ ET
BT
81.24 541.1250000000001 Td
/F4.0 11 Tf
-<2e2e2e> Tj
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+86.74 541.1250000000001 Td
+/F4.0 11 Tf
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+92.24 541.1250000000001 Td
+/F4.0 11 Tf
+<2e> Tj
ET
0.000 0.000 0.000 SCN
@@ -18559,29 +19017,28 @@ Q
endstream
endobj
-127 0 obj
+126 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 126 0 R
+/Contents 125 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F4.1 102 0 R
+/Font << /F4.1 101 0 R
/F1.0 8 0 R
-/F6.0 101 0 R
/F4.0 43 0 R
/F3.0 41 0 R
/F2.0 18 0 R
>>
-/XObject << /Stamp1 668 0 R
+/XObject << /Stamp1 667 0 R
>>
>>
-/Annots [129 0 R 130 0 R 131 0 R]
+/Annots [128 0 R 129 0 R 130 0 R]
>>
endobj
-128 0 obj
-[127 0 R /XYZ 0 369.7900000000001 null]
+127 0 obj
+[126 0 R /XYZ 0 369.7900000000001 null]
endobj
-129 0 obj
+128 0 obj
<< /Border [0 0 0]
/Dest (_ugbtb_view-models_jaxb_referencing-domain-entities)
/Subtype /Link
@@ -18589,7 +19046,7 @@ endobj
/Type /Annot
>>
endobj
-130 0 obj
+129 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -18600,7 +19057,7 @@ endobj
/Type /Annot
>>
endobj
-131 0 obj
+130 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -18611,8 +19068,8 @@ endobj
/Type /Annot
>>
endobj
-132 0 obj
-<< /Length 22358
+131 0 obj
+<< /Length 22668
>>
stream
q
@@ -18751,12 +19208,12 @@ f
h
S
Q
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
BT
59.24 740.255 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<3c70726f6a656374> Tj
ET
@@ -18773,8 +19230,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.651 0.090 0.090 scn
-0.651 0.090 0.090 SCN
+0.310 0.624 0.812 scn
+0.310 0.624 0.812 SCN
BT
108.74000000000001 740.255 Td
@@ -18795,12 +19252,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
BT
130.74 740.255 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<3e> Tj
ET
@@ -18817,12 +19274,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
BT
81.24000000000001 725.515 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<3c617274696661637449643e> Tj
ET
@@ -18839,12 +19296,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
BT
207.74 725.515 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<3c2f617274696661637449643e> Tj
ET
@@ -18861,12 +19318,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
BT
81.24000000000001 710.7750000000001 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<3c646570656e64656e636965733e> Tj
ET
@@ -18883,12 +19340,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
BT
103.24000000000001 696.0350000000001 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<3c646570656e64656e63793e> Tj
ET
@@ -18905,12 +19362,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
BT
125.24000000000001 681.2950000000001 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<3c67726f757049643e> Tj
ET
@@ -18927,12 +19384,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
BT
273.74 681.2950000000001 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<3c2f67726f757049643e> Tj
ET
@@ -18949,12 +19406,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
BT
125.24000000000001 666.5550000000001 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<3c617274696661637449643e> Tj
ET
@@ -18971,12 +19428,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
BT
251.74 666.5550000000001 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<3c2f617274696661637449643e> Tj
ET
@@ -18993,12 +19450,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
BT
103.24000000000001 651.815 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<3c2f646570656e64656e63793e> Tj
ET
@@ -19015,12 +19472,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
BT
81.24000000000001 637.075 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<3c2f646570656e64656e636965733e> Tj
ET
@@ -19037,12 +19494,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
BT
81.24000000000001 622.335 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<3c70726f66696c65733e> Tj
ET
@@ -19059,12 +19516,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
BT
103.24000000000001 607.595 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<3c70726f66696c653e> Tj
ET
@@ -19081,12 +19538,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
BT
125.24000000000001 592.855 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<3c69643e> Tj
ET
@@ -19103,12 +19560,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
BT
191.24 592.855 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<3c2f69643e> Tj
ET
@@ -19125,12 +19582,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
BT
125.24000000000001 578.115 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<3c61637469766174696f6e3e> Tj
ET
@@ -19147,12 +19604,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
BT
147.24 563.375 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<3c70726f70657274793e> Tj
ET
@@ -19169,12 +19626,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
BT
169.24 548.635 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<3c6e616d653e> Tj
ET
@@ -19191,12 +19648,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
BT
279.24 548.635 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<3c2f6e616d653e> Tj
ET
@@ -19213,12 +19670,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
BT
147.24 533.895 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<3c2f70726f70657274793e> Tj
ET
@@ -19235,12 +19692,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
BT
125.24000000000001 519.155 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<3c2f61637469766174696f6e3e> Tj
ET
@@ -19252,7 +19709,18 @@ ET
BT
59.24 504.41499999999996 Td
/F4.0 11 Tf
-<ca20202020202020202020202e2e2e> Tj
+<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
+
+BT
+125.24000000000001 504.41499999999996 Td
+/F4.0 11 Tf
+<2e2e2e> Tj
ET
0.000 0.000 0.000 SCN
@@ -19268,12 +19736,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
BT
103.24000000000001 489.675 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<3c2f70726f66696c653e> Tj
ET
@@ -19290,12 +19758,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
BT
103.24000000000001 474.935 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<3c70726f66696c653e> Tj
ET
@@ -19312,12 +19780,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
BT
125.24000000000001 460.195 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<3c69643e> Tj
ET
@@ -19334,12 +19802,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
BT
163.74 460.195 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<3c2f69643e> Tj
ET
@@ -19356,12 +19824,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
BT
125.24000000000001 445.455 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<3c61637469766174696f6e3e> Tj
ET
@@ -19378,12 +19846,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
BT
147.24 430.715 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<3c70726f70657274793e> Tj
ET
@@ -19400,12 +19868,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
BT
169.24 415.97499999999997 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<3c6e616d653e> Tj
ET
@@ -19422,12 +19890,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
BT
251.74 415.97499999999997 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<3c2f6e616d653e> Tj
ET
@@ -19444,12 +19912,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
BT
147.24 401.23499999999996 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<3c2f70726f70657274793e> Tj
ET
@@ -19466,12 +19934,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
BT
125.24000000000001 386.49499999999995 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<3c2f61637469766174696f6e3e> Tj
ET
@@ -19483,7 +19951,18 @@ ET
BT
59.24 371.75499999999994 Td
/F4.0 11 Tf
-<ca20202020202020202020202e2e2e> Tj
+<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
+
+BT
+125.24000000000001 371.75499999999994 Td
+/F4.0 11 Tf
+<2e2e2e> Tj
ET
0.000 0.000 0.000 SCN
@@ -19499,12 +19978,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
BT
103.24000000000001 357.01499999999993 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<3c2f70726f66696c653e> Tj
ET
@@ -19521,23 +20000,23 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
BT
81.24000000000001 342.2749999999999 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<3c2f70726f66696c65733e> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
BT
59.24 327.5349999999999 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<3c2f70726f6a6563743e> Tj
ET
@@ -19645,12 +20124,12 @@ q
S
[ ] 0 d
Q
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
BT
59.24 251.0149999999999 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<3c6275696c643e> Tj
ET
@@ -19667,12 +20146,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
BT
81.24000000000001 236.27499999999992 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<3c706c7567696e733e> Tj
ET
@@ -19689,12 +20168,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
BT
103.24000000000001 221.5349999999999 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<3c706c7567696e3e> Tj
ET
@@ -19711,12 +20190,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
BT
125.24000000000001 206.7949999999999 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<3c67726f757049643e> Tj
ET
@@ -19733,12 +20212,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
BT
284.74 206.7949999999999 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<3c2f67726f757049643e> Tj
ET
@@ -19755,12 +20234,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
BT
125.24000000000001 192.0549999999999 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<3c617274696661637449643e> Tj
ET
@@ -19777,12 +20256,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
BT
284.74 192.0549999999999 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<3c2f617274696661637449643e> Tj
ET
@@ -19799,12 +20278,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
BT
125.24000000000001 177.3149999999999 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<3c76657273696f6e3e> Tj
ET
@@ -19821,12 +20300,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
BT
257.24 177.3149999999999 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<3c2f76657273696f6e3e> Tj
ET
@@ -19843,12 +20322,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
BT
125.24000000000001 162.57499999999993 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<3c636f6e66696775726174696f6e3e> Tj
ET
@@ -19865,12 +20344,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
BT
147.24 147.83499999999992 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<3c6170704d616e69666573743e> Tj
ET
@@ -19887,12 +20366,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
BT
383.74 147.83499999999992 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<3c2f6170704d616e69666573743e> Tj
ET
@@ -19909,12 +20388,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
BT
147.24 133.0949999999999 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<3c6a617862436c61737365733e> Tj
ET
@@ -19931,12 +20410,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
BT
169.24 118.35499999999993 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<3c6a617862436c6173733e> Tj
ET
@@ -19953,12 +20432,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
BT
317.74 103.61499999999992 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<3c2f6a617862436c6173733e> Tj
ET
@@ -19975,12 +20454,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
BT
147.24 88.87499999999991 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<3c2f6a617862436c61737365733e> Tj
ET
@@ -19997,12 +20476,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
BT
147.24 74.1349999999999 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<3c73657061726174653e> Tj
ET
@@ -20019,12 +20498,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
BT
229.74 74.1349999999999 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<3c2f73657061726174653e> Tj
ET
@@ -20041,12 +20520,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
BT
147.24 59.3949999999999 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<3c636f6d6d6f6e536368656d61733e> Tj
ET
@@ -20063,12 +20542,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
BT
257.24 59.3949999999999 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<3c2f636f6d6d6f6e536368656d61733e> Tj
ET
@@ -20098,23 +20577,22 @@ Q
endstream
endobj
-133 0 obj
+132 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 132 0 R
+/Contents 131 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/Font << /F1.0 8 0 R
/F4.0 43 0 R
-/F6.0 101 0 R
>>
-/XObject << /Stamp1 668 0 R
+/XObject << /Stamp1 667 0 R
>>
>>
-/Annots [134 0 R 135 0 R]
+/Annots [133 0 R 134 0 R]
>>
endobj
-134 0 obj
+133 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -20125,7 +20603,7 @@ endobj
/Type /Annot
>>
endobj
-135 0 obj
+134 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -20136,7 +20614,7 @@ endobj
/Type /Annot
>>
endobj
-136 0 obj
+135 0 obj
<< /Length 23103
>>
stream
@@ -20193,12 +20671,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
BT
125.24000000000001 796.43 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<3c2f636f6e66696775726174696f6e3e> Tj
ET
@@ -20215,12 +20693,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
BT
125.24000000000001 781.6899999999999 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<3c646570656e64656e636965733e> Tj
ET
@@ -20237,12 +20715,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
BT
147.24 766.95 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<3c646570656e64656e63793e> Tj
ET
@@ -20259,12 +20737,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
BT
169.24 752.21 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<3c67726f757049643e> Tj
ET
@@ -20281,12 +20759,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
BT
317.74 752.21 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<3c2f67726f757049643e> Tj
ET
@@ -20303,12 +20781,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
BT
169.24 737.47 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<3c617274696661637449643e> Tj
ET
@@ -20325,12 +20803,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
BT
295.74 737.47 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<3c2f617274696661637449643e> Tj
ET
@@ -20347,12 +20825,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
BT
1
<TRUNCATED>
[04/44] isis-site git commit: ISIS-1594: provide an 'edit' button
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/83a3755a/content/release-notes.html
----------------------------------------------------------------------
diff --git a/content/release-notes.html b/content/release-notes.html
index eed9d54..e283e04 100644
--- a/content/release-notes.html
+++ b/content/release-notes.html
@@ -1,12 +1,10 @@
<!doctype html>
<html class="no-js" lang="en">
-<head>
- <meta charset="utf-8"/>
- <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-
- <title>Release Notes</title>
-
- <!--
+ <head>
+ <meta charset="utf-8">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+ <title>Release Notes</title>
+ <!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
@@ -23,31 +21,21 @@
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
- -->
-
- <!-- No caching headers -->
- <meta http-equiv="cache-control" content="no-cache" />
- <meta http-equiv="pragma" content="no-cache" />
- <meta http-equiv="expires" content="-1" />
-
-
- <!-- TODO: need to (re)instate CDN in the future (not using for now just so can develop off-line -->
- <link href="./css/foundation/5.5.1/foundation.css" rel="stylesheet" />
- <script src="./js/foundation/5.5.1/vendor/modernizr.js"></script>
- <link href="./css/asciidoctor/colony.css" rel="stylesheet">
- <link href="./css/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet">
-
-
-
-
- <link href="./css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.css" rel="stylesheet" />
- <!--[if lt IE 9]>
+ -->
+ <!-- No caching headers -->
+ <meta http-equiv="cache-control" content="no-cache">
+ <meta http-equiv="pragma" content="no-cache">
+ <meta http-equiv="expires" content="-1">
+ <!-- TODO: need to (re)instate CDN in the future (not using for now just so can develop off-line -->
+ <link href="./css/foundation/5.5.1/foundation.css" rel="stylesheet">
+ <script src="./js/foundation/5.5.1/vendor/modernizr.js"></script>
+ <link href="./css/asciidoctor/colony.css" rel="stylesheet">
+ <link href="./css/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet">
+ <link href="./css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.css" rel="stylesheet">
+ <!--[if lt IE 9]>
<link href="./css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.ie.css" rel="stylesheet" />
- <![endif]-->
-
-
-
- <style type="text/css">
+ <![endif]-->
+ <style type="text/css">
pre code {
background-color: inherit;
border-style: none;
@@ -192,9 +180,8 @@ table.CodeRay td.code>pre{padding:0}
color:#fff;
font-size: 1.1em;
}
- </style>
-
- <style>
+ </style>
+ <style>
@media only screen and (min-width: 40.063em) {
.top-bar {
.contain-to-grid .top-bar {
@@ -205,9 +192,8 @@ table.CodeRay td.code>pre{padding:0}
.row {
max-width: 80rem;
}
- </style>
-
- <style>
+ </style>
+ <style>
.extended-quote,
.extended-quote-first {
margin-left: 40px;
@@ -231,9 +217,8 @@ table.CodeRay td.code>pre{padding:0}
text-shadow: 0 1px 2px rgba(0, 0, 0, 0.1);
}
- </style>
-
- <style>
+ </style>
+ <style>
body {
position: relative;
}
@@ -255,6 +240,7 @@ table.CodeRay td.code>pre{padding:0}
div#doc-content {
margin-top: 30px;
+ padding-top: 30px;
}
div.documentation-page table.frame-all {
@@ -286,9 +272,8 @@ table.CodeRay td.code>pre{padding:0}
min-height: 2000px;
}
- </style>
-
- <style>
+ </style>
+ <style>
@media only screen and (min-width: 768px) {
#toc.toc2 ul ul { margin-left: -10px; }
@@ -316,15 +301,13 @@ table.CodeRay td.code>pre{padding:0}
body div#toc2 li.tocify-item.active a {
color: red;
}
- </style>
-
- <style>
+ </style>
+ <style>
footer {
margin-top: 1000px;
}
- </style>
-
- <style>
+ </style>
+ <style>
/* overriding colony.css stylesheet */
.literalblock pre, .literalblock pre[class], .listingblock pre, .listingblock pre[class] {
/*padding: 1.25em 1.5625em 1.125em 1.5625em;*/
@@ -372,9 +355,8 @@ table.CodeRay td.code>pre{padding:0}
.imageblock img {
margin-bottom: 10px;
}
- </style>
-
- <style>
+ </style>
+ <style>
/* from http://ben.balter.com/2014/03/13/pages-anchor-links/ */
.header-link {
position: absolute;
@@ -395,9 +377,8 @@ table.CodeRay td.code>pre{padding:0}
h6:hover .header-link {
opacity: 1;
}
- </style>
-
- <style>
+ </style>
+ <style>
.top-bar
{
-webkit-transition-duration: .5s;
@@ -425,5979 +406,3617 @@ table.CodeRay td.code>pre{padding:0}
-webkit-transition-property: -webkit-transform;
transition-property: transform;
}
- </style>
-
- <style>
+ </style>
+ <style>
#doc-content a.guide {
color: white;
}
- </style>
-
- <style>
+ </style>
+ <style>
.tocify {
margin-top: 80px;
}
- </style>
-
-
-</script>
-
-</head>
-<body>
-
-<<div class="github-fork-ribbon-wrapper right" style="position: fixed;">
- <div class="github-fork-ribbon">
- <a href="https://github.com/apache/isis#fork-destination-box">Fork me on GitHub</a>
- </div>
-</div>
-
-
-<div class="row">
-
- <div class="fixed contain-to-grid header">
- <nav class="top-bar" data-topbar role="navigation" style="max-width: 80rem">
- <ul class="title-area">
- <li class="name">
- <h1>
- <a href="/index.html">Apache Isis™</a>
- </h1>
- </li>
- <!-- Remove the class "menu-icon" to get rid of menu icon. Take out "Menu" to just have icon alone -->
- <li class="toggle-topbar menu-icon"><a href="#"><span>Menu</span></a></li>
- </ul>
-
- <section class="top-bar-section">
- <ul class="right">
-
- <li class="has-form">
- <FORM class="searchbox navbar-form navbar-right" id="searchbox_012614087480249044419:dn-q5gtwxya" action="http://www.google.com/cse">
- <div class="row collapse">
- <input type="hidden" name="cx" value="012614087480249044419:dn-q5gtwxya">
- <INPUT type="hidden" name="cof" value="FORID:0">
- <INPUT class="form-control" name="q" type="text" placeholder="Search">
- </div>
- </FORM>
- </li>
-
- </ul>
-
- <!-- Left Nav Section -->
- <ul class="left">
-
- <li><a href="/documentation.html">Documentation</a></li>
- <li><a href="/downloads.html">Downloads</a></li>
- <li><a href="/help.html">Help</a></li>
- <li><a href="/asf.html">@ASF</a></li>
-
- </ul>
-
- </section>
- </nav>
- </div>
-</div>
-
-<div class="row">
-
- <div id="doc-content-left" class="large-9 medium-9 columns">
-
-
- <div id="doc-content">
- <div class="sect1">
-<h2 id="_summary">Summary</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>This table summarises all releases of Apache Isis to date.</p>
-</div>
-<table class="tableblock frame-all grid-all spread">
-<colgroup>
-<col style="width: 7.6923%;">
-<col style="width: 15.3846%;">
-<col style="width: 30.7692%;">
-<col style="width: 7.6923%;">
-<col style="width: 7.6923%;">
-<col style="width: 7.6923%;">
-<col style="width: 23.077%;">
-</colgroup>
-<tbody>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Version</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Date</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Release notes</p>
-</div></div></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">Features</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">Improves</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">Bugs</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>JIRA relnotes</p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#r1.14.0">1.14.0</a></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">19-02-2017</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Actions with collection parameters, metamodel validations.</p>
-</div></div></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">3</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">11</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">11</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12338898">Release notes for v1.14.0</a></p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#r1.13.2.1">1.13.2.1</a></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">03-jan-2017</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Patch release for simpleapp archetype only (docker images, regular actions instead of mixins)</p>
-</div></div></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">0</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">2</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">0</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12338937">Release notes for v1.13.2.1</a></p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#r1.13.2.1">1.13.2</a></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">14-dec-2016</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Patch release, modular simpleapp archetype</p>
-</div></div></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">2</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">9</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">5</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12338744">Release notes for v1.13.2</a></p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#r1.13.1">1.13.1</a></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">30-oct-2016</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Patch release, better support for docker</p>
-</div></div></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">1</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">13</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">21</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12337967">Release notes for v1.13.1</a></p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#r1.13.0">1.13.0</a></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">11-jul-2016</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Commands, interactions and internal refactorings</p>
-</div></div></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">27</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">50</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">23</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12335362">Release notes for v1.13.0</a></p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#r1.12.2">1.12.2</a></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">06-jun-2016</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Bug-fix release</p>
-</div></div></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">0</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">0</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">2</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12335949">Release notes for v1.12.2</a></p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#r1.12.1">1.12.1</a></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">12-apr-2016</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Bug-fix release</p>
-</div></div></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">0</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">0</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">4</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12335484">Release notes for v1.12.1</a></p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#r1.12.0">1.12.0</a></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">29-mar-2016</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Dynamic XML layouts</p>
-</div></div></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">7</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">21</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">21</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12327483">Release notes for v1.12.0</a></p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#r1.11.1">1.11.1</a></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">17-jan-2016</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Re-release under Java 1.7 (using toolchains plugin).</p>
-</div></div></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">0</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">0</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">1</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12334640">Release notes for v1.11.1</a></p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#r1.11.0">1.11.0</a></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">02-jan-2016</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>More flexible REST API, view models using JAXB.</p>
-</div></div></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">9</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">19</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">12</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12333974">Release notes for v1.11.0</a></p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#r1.10.0">1.10.0</a></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">10-nov-2015</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>New domain services, multi-tenancy support and mixins.</p>
-</div></div></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">7</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">18</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">12</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12333354">Release notes for 1.10.0</a></p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#r1.9.0">1.9.0</a></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">1-sep-2015</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>AppManifest, Restful Objects representations and other "under-the-cover" improvements.</p>
-</div></div></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">18</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">50</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">25</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12332806">Release notes for 1.9.0</a></p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#r1.8.0">1.8.0</a></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">24-feb-2015</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Wicket viewer moved into core; todoapp archetype moved to <a href="http://www.isisaddons.org">Isis Addons</a> (non-ASF).</p>
-</div></div></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">27</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">41</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">20</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="ulist">
-<ul>
-<li>
-<p><a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12328845">core-1.8.0</a></p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12328847">archetype-1.8.0</a></p>
-</li>
-</ul>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#r1.7.0">1.7.0</a></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">18-oct-2014</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Module functionality previously in 1.6.0 now retired; use <a href="http://isisaddons.org">Isis Addons</a> (non-ASF) instead.</p>
-</div></div></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">4</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">9</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">20</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="ulist">
-<ul>
-<li>
-<p><a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12326453">core-1.7.0</a></p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12326460">viewer-wicket-1.7.0</a></p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12327441">archetype-simpleapp-1.7.0</a></p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12327440">archetype-todoapp-1.7.0</a></p>
-</li>
-</ul>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#r1.6.0">1.6.0</a></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">28-jul-2014</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Restful Objects viewer, JDO/Datanucleus Objectstore and Shiro Security all moved into core. Quickstart-wrj archetype renamed to todoapp; simple-wrj archetype renamed to simpleapp. Some functionality copied/refactored as <a href="http://www.isisaddons.org">Isis Addons</a> (non-ASF).</p>
-</div></div></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">6</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">12</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">15</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="ulist">
-<ul>
-<li>
-<p><a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12325314">core-1.6.0</a></p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12325318">viewer-wicket-1.6.0</a></p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12326462">archetype-simpleapp-1.6.0</a></p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12326461">archetype-todoapp-1.6.0</a></p>
-</li>
-</ul>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#r1.5.0">1.5.0</a></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">08-jun-2014</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>No longer releasing security-file</p>
-</div></div></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">3</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">19</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">13</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="ulist">
-<ul>
-<li>
-<p><a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12326524">core-1.5.0</a></p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12326525">objectstore-jdo-1.5.0</a></p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12326529">security-shiro-1.5.0</a></p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12326947">viewer-restfulobjects-2.3.0</a></p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12326526">viewer-wicket-1.5.0</a></p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12326528">archetype-simple-wrj-1.5.0</a></p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12326527">archetype-quickstart-wrj-1.5.0</a></p>
-</li>
-</ul>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#r1.4.1">1.4.1</a></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">14-mar-2014</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Patch release</p>
-</div></div></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">0</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">2</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">2</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="ulist">
-<ul>
-<li>
-<p>objectstore-jdo-1.4.1</p>
-</li>
-<li>
-<p>viewer-wicket-1.4.1</p>
-</li>
-<li>
-<p>archetype-simple-wrj-1.4.1</p>
-</li>
-<li>
-<p>archetype-quickstart-wrj-1.4.1</p>
-</li>
-</ul>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#r1.4.0">1.4.0</a></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">11-mar-2014</p></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">56</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">62</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">26</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="ulist">
-<ul>
-<li>
-<p>core-1.4.0</p>
-</li>
-<li>
-<p>objectstore-jdo-1.4.0</p>
-</li>
-<li>
-<p>security-file-1.4.0</p>
-</li>
-<li>
-<p>security-shiro-1.4.0</p>
-</li>
-<li>
-<p>viewer-restfulobjects-2.2.0</p>
-</li>
-<li>
-<p>viewer-wicket-1.4.0</p>
-</li>
-<li>
-<p>archetype-simple-wrj-1.4.0</p>
-</li>
-<li>
-<p>archetype-quickstart-wrj-1.4.0</p>
-</li>
-</ul>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#r1.3.1">1.3.1</a></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">7-nov-2013</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Patch release</p>
-</div></div></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">1</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">0</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">3</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="ulist">
-<ul>
-<li>
-<p>viewer-wicket-1.3.1</p>
-</li>
-<li>
-<p>archetype-simple-wrj-1.3.1</p>
-</li>
-<li>
-<p>archetype-quickstart-wrj-1.3.1</p>
-</li>
-</ul>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#r1.8.0">1.3.0</a></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">25-oct-2013</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>WRJ archetype renamed to Quickstart WRJ. Simple WRJ archetype added.</p>
-</div></div></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">52</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">61</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">30</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="ulist">
-<ul>
-<li>
-<p>core-1.3.0</p>
-</li>
-<li>
-<p>objectstore-jdo-1.3.0</p>
-</li>
-<li>
-<p>security-file-1.0.2</p>
-</li>
-<li>
-<p>security-shiro-1.3.0</p>
-</li>
-<li>
-<p>viewer-restfulobjects-2.1.0</p>
-</li>
-<li>
-<p>viewer-wicket-1.3.0</p>
-</li>
-<li>
-<p>archetype-simple-wrj-1.3.0</p>
-</li>
-<li>
-<p>archetype-quickstart-wrj-1.3.0</p>
-</li>
-</ul>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#r1.2.0">1.2.0</a></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">30-may-2013</p></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">22</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">41</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">15</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="ulist">
-<ul>
-<li>
-<p>core-1.2.0</p>
-</li>
-<li>
-<p>objectstore-jdo-1.2.0</p>
-</li>
-<li>
-<p>security-file-1.0.1</p>
-</li>
-<li>
-<p>security-shiro-1.1.1</p>
-</li>
-<li>
-<p>viewer-restfulobjects-2.0.0</p>
-</li>
-<li>
-<p>viewer-wicket-1.2.0</p>
-</li>
-<li>
-<p>archetype-wrj-1.0.3</p>
-</li>
-</ul>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#r1.1.0">1.1.0</a></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">31-jan-2013</p></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">9</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">18</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">8</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="ulist">
-<ul>
-<li>
-<p>core-1.1.0</p>
-</li>
-<li>
-<p>security-shiro-1.1.0</p>
-</li>
-<li>
-<p>viewer-wicket-1.1.0</p>
-</li>
-<li>
-<p>archetype-wrj-1.0.2</p>
-</li>
-</ul>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#r1.0.1">1.0.1</a></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">10-jan-2013</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Combining RestfulObjects and Wicket viewers into a single webapp, along with Shiro security</p>
-</div></div></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">1</p></td>
-<td class="tableblock halign-right valign-top"></td>
-<td class="tableblock halign-right valign-top"></td>
-<td class="tableblock halign-left valign-top"><div><div class="ulist">
-<ul>
-<li>
-<p>security-shiro-1.0.0</p>
-</li>
-<li>
-<p>archetype-wrj-1.0.1</p>
-</li>
-</ul>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#r1.0.0">1.0.0</a></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">24-dec-2012</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>First release having graduated</p>
-</div></div></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">8</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">33</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">6</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="ulist">
-<ul>
-<li>
-<p>core-1.0.0</p>
-</li>
-<li>
-<p>security-file-1.0.0</p>
-</li>
-<li>
-<p>viewer-wicket-1.0.0</p>
-</li>
-<li>
-<p>viewer-restfulobjects-1.0.0</p>
-</li>
-<li>
-<p>archetype-wrj-1.0.0</p>
-</li>
-</ul>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock">0.2.0-incubating</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">20-feb-2012</p></td>
-<td class="tableblock halign-left valign-top"><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-left valign-top"><div><div class="ulist">
-<ul>
-<li>
-<p>0.2.0-incubating</p>
-</li>
-</ul>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock">0.1.2-incubating</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">13-jul-2011</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>First release in the ASF incubator</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-left valign-top"><div><div class="ulist">
-<ul>
-<li>
-<p>0.1.2-incubating</p>
-</li>
-</ul>
-</div></div></td>
-</tr>
-</tbody>
-</table>
-</div>
-</div>
-<div class="sect1">
-<h2 id="r1.14.0">1.14.0</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>Apache Isis 1.14.0 introduces one significant new feature, namely the ability to invoke actions with collection parameters.
-This is rendered by the Wicket viewer as a multi-select drop-down.
-It is also captured in the DTO/XML for both commands and published interaction events.
-Note though that Restful Objects viewer currently does not provide any support.</p>
-</div>
-<div class="paragraph">
-<p>Also included in the release are a number of minor improvements.
-In particular, there are now a number of metamodel validations intended to make it apps already in production easier to refactor.
-These include a new <code>objectType</code> attribute for <code>@DomainService</code>, analogous to the same attribute on <code>@DomainObject</code>.
-The <code>EmailService</code> has been improved so it is easier to use in system test (non-prod) environments.
-Finally, a new <code>TableColumnOrderService</code> to allow column order to be fine-tuned.</p>
-</div>
-<div class="paragraph">
-<p>The release also has a number of bug fixes.</p>
-</div>
-<div class="paragraph">
-<p>Most applications written against v1.13.x should run against v1.14.0 with few if any changes.
-That said, do recommend that you read and keep in mind the <a href="migration-notes.html#_migration-notes_1.13.0-to-1.14.0.adoc">migration notes</a> when you upgrade your app.</p>
-</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-1529">ISIS-1529</a> - TableColumnOrderService, to allow column order to be fine-tuned (or columns suppressed)</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-709">ISIS-709</a> - Support multi-select for the drop-down box</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-785">ISIS-785</a> - Invoke action parameter with a collection of entities.</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-1587">ISIS-1587</a> - Extend "explicitObjectType" checking to also take in view models.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1586">ISIS-1586</a> - Rationalize the way that service instances are referenced by RO vs rest of the framework</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1584">ISIS-1584</a> - Metamodel validation to flag for any contributed services (rather than mixins)</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1582">ISIS-1582</a> - Extend 'explicitObjectType' checking to domain services</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1581">ISIS-1581</a> - MetaModel validator should (if configured) check that an object type has been explicitly specified.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1580">ISIS-1580</a> - Should throw a metamodel validation exception if JDOQL FROM clause or VARIABLES clause invalid.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1567">ISIS-1567</a> - Replace jetty-uber with jetty-servlet and jetty-webapp</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1557">ISIS-1557</a> - Enhance EmailServiceDefault, to optionally throw exception if fail, and optionally allow overrides</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1555">ISIS-1555</a> - DomainChangeJdoAbstract (super of command, audit etc) shouldn’t throw exception if target class is unknown.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1512">ISIS-1512</a> - MetaModelValidator should detect domain services that have collections, and fail-fast.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1501">ISIS-1501</a> - MetaModel validator for mixin that doesn’t have a public constructor with a single parameter</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-1578">ISIS-1578</a> - Should throw a metamodel validation exception if a disable or hide method has any params.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1577">ISIS-1577</a> - The transactionId within a command XML does not correspond with the transactionId of the command’s metadata.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1574">ISIS-1574</a> - Throws exception if layout.xml references unknown property.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1573">ISIS-1573</a> - ISIS_OPTS incorrectly ignores values that have an '=' sign in them.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1571">ISIS-1571</a> - Should throw metamodel validation error if omit choices or autoComplete for parameter collection type.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1570">ISIS-1570</a> - CSS spacing incorrect for action buttons placed below when there are also action placed to right</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1566">ISIS-1566</a> - Allow datanucleus.ConnectionPasswordDecrypter to be used to decrypt password.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1565">ISIS-1565</a> - Fixes @MemberOrder so that the 4 default mixin actions are automatically associated with the 3 default mixin properties</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1564">ISIS-1564</a> - Attempt to invoke no-arg bookmarked action, throws stacktraceexception.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1526">ISIS-1526</a> - WebServer --port option not working</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1478">ISIS-1478</a> - Setting Editing.ENABLED does not seem to override configuration property set to disabled.</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-1532">ISIS-1532</a> - Move DN OS cfg props to DN OS guide</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-1561">ISIS-1561</a> - Release 1.14.0</p>
-</li>
-</ul>
-</div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="r1.13.2.1">1.13.2.1</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<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>
-<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>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1558">ISIS-1558</a> - Extend simpleapp archetype to also build docker images</p>
-</li>
-</ul>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_task_2">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>
-</ul>
-</div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="r1.13.2">1.13.2</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>This is a maintenance release with a number of minor improvements and bug fixes.
-If these the main improvement is that the simpleapp archetype has been substantially reworked to be more modular.</p>
-</div>
-<div class="paragraph">
-<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>
-<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>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1471">ISIS-1471</a> - Integrate Flyway or Liquibase or something similar (see (non-ASF) <a href="http://github.com/isisaddons/isis-module-flywaydb">Isis addons' flywaydb</a> module.</p>
-</li>
-</ul>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_improvement_3">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>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1553">ISIS-1553</a> - If in prototyping mode, shouldn’t have to keep logging in when restart (rememberMe should activate)</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1552">ISIS-1552</a> - Use 'readonly' rather than 'disabled' tag, in compliance with w3c spec (Firefox and Chrome 54+)</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1550">ISIS-1550</a> - Remove metamodel validation that insists on at least one @PersistenceCapable class.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1548">ISIS-1548</a> - Allow @Mixin annotation to specify the method name to use (instead of '$$') meaning to infer the mixin name from the mixin type. Also, allow '$' to be used as separator of the mixin type.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1546">ISIS-1546</a> - Reduce logging (don’t show stack traces) for invalid user/pass attempts</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1543">ISIS-1543</a> - IsisConfigurationBuilder should obfuscate password when logged.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1538">ISIS-1538</a> - Rework simpleapp archetype so that is more modular.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1503">ISIS-1503</a> - Allow security checking be disabled when running via SudoService.</p>
-</li>
-</ul>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_bug_2">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>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1541">ISIS-1541</a> - When no explicit layout xml is available the order of the members is set to incorrect, ignoring other facets</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1533">ISIS-1533</a> - Fix edit icon offset for boolean, referencem blob, clob and multilinestring panels</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1524">ISIS-1524</a> - Dates not showing in view model</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1496">ISIS-1496</a> - A domainobject annotated with @DomainObject(auditing = Auditing.DISABLED) is audited nonetheless</p>
-</li>
-</ul>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_task_3">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>
-</ul>
-</div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="r1.13.2">1.13.2</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>This is a maintenance release with a number of minor improvements and bug fixes.
-If these the main improvement is that the simpleapp archetype has been substantially reworked to be more modular.</p>
-</div>
-<div class="paragraph">
-<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>
-<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>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1471">ISIS-1471</a> - Integrate Flyway or Liquibase or something similar (see (non-ASF) <a href="http://github.com/isisaddons/isis-module-flywaydb">Isis addons' flywaydb</a> module.</p>
-</li>
-</ul>
-</div>
-</div>
-<div class="sect2">
-<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>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1553">ISIS-1553</a> - If in prototyping mode, shouldn’t have to keep logging in when restart (rememberMe should activate)</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1552">ISIS-1552</a> - Use 'readonly' rather than 'disabled' tag, in compliance with w3c spec (Firefox and Chrome 54+)</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1550">ISIS-1550</a> - Remove metamodel validation that insists on at least one @PersistenceCapable class.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1548">ISIS-1548</a> - Allow @Mixin annotation to specify the method name to use (instead of '$$') meaning to infer the mixin name from the mixin type. Also, allow '$' to be used as separator of the mixin type.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1546">ISIS-1546</a> - Reduce logging (don’t show stack traces) for invalid user/pass attempts</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1543">ISIS-1543</a> - IsisConfigurationBuilder should obfuscate password when logged.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1538">ISIS-1538</a> - Rework simpleapp archetype so that is more modular.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1503">ISIS-1503</a> - Allow security checking be disabled when running via SudoService.</p>
-</li>
-</ul>
-</div>
-</div>
-<div class="sect2">
-<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>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1541">ISIS-1541</a> - When no explicit layout xml is available the order of the members is set to incorrect, ignoring other facets</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1533">ISIS-1533</a> - Fix edit icon offset for boolean, referencem blob, clob and multilinestring panels</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1524">ISIS-1524</a> - Dates not showing in view model</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1496">ISIS-1496</a> - A domainobject annotated with @DomainObject(auditing = Auditing.DISABLED) is audited nonetheless</p>
-</li>
-</ul>
-</div>
-</div>
-<div class="sect2">
-<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>
-</ul>
-</div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="r1.13.1">1.13.1</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<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>
-<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>
-</ul>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_improvement_5">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>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1522">ISIS-1522</a> - Remove unused field declarations</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1519">ISIS-1519</a> - Deprecate JdoColumnLength in applib, instead define types</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1518">ISIS-1518</a> - Hide and replace certain UI fragments</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1514">ISIS-1514</a> - Hide the calendar hint on the date time (users tend to click on it)</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1508">ISIS-1508</a> - The integration test framework should be more resilient to badly behaved tests that leave the transaction incomplete</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1507">ISIS-1507</a> - QueryResultsCache should be disabled while fixture scripts are running.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1505">ISIS-1505</a> - MetaModelService should return an unknown enum rather than throw exception, eg if passed an java.lang.Object.class.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1499">ISIS-1499</a> - Improve BookmarkService to be able to "lookup" domain services, so that can schedule background commands against a service.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1495">ISIS-1495</a> - Extend SessionLoggingService.CausedBy enum, so can mark as complete any log entries that are still shown as ongoing when app (re)starts</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1492">ISIS-1492</a> - Adding css-class to object forms</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1491">ISIS-1491</a> - Changed all occurrences of allowNulls and allowsNulls in the docs to</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1476">ISIS-1476</a> - Transaction interface: Expose "clearAbortCause" for don’t pick up handled persistence Exceptions</p>
-</li>
-</ul>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_bug_4">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>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1524">ISIS-1524</a> - Dates not showing in view model</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1520">ISIS-1520</a> - Amelia template is broken</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1517">ISIS-1517</a> - Typo on home page</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1516">ISIS-1516</a> - Typo on home page</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1515">ISIS-1515</a> - BackgroundCommandExecution can NPE if it attempts to invoke an action on an object that no longer exists.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1502">ISIS-1502</a> - Error handling of invalid domain object not strong enough, causing infinite loop in endTransaction.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1498">ISIS-1498</a> - BackgroundCommandExecution does not handle exceptions correctly.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1497">ISIS-1497</a> - AbstractIsisSessionTemplate does not lookup adapter for OidDtos correctly.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1494">ISIS-1494</a> - EmailNotificationServiceDefault does not use overriding implementations of EmailService</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1493">ISIS-1493</a> - Sorting of records with null values is not working correctly</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1490">ISIS-1490</a> - Fix 'svg' suffix in ImageResourceCacheClassPath</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1483">ISIS-1483</a> - Tiny bug in the SimpleObjectTest unit test as generated by the simpleapp.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1482">ISIS-1482</a> - Occasional(?) exception in i18n PoWriter, looks like a concurrent access problem</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1481">ISIS-1481</a> - Duplicate PK exception for SessoinLogEntry (isisaddons implementation of SessionLoggingService) due to race condition.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1480">ISIS-1480</a> - LocalDateTime property on different tabs, encoding exception</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1477">ISIS-1477</a> - Background command execution of commands with 0 parameters causes an NPE</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1475">ISIS-1475</a> - Application name not set</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1474">ISIS-1474</a> - Cannot use custom implementation of authenticationmanager (ShiroWithOAuth2AuthenticationManagerInstaller)</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1472">ISIS-1472</a> - Any attempts to schedule a background job via the RO viewer fail, due to incomplete state. (In fact: actions with commands cannot be invoked via RO viewer).</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1470">ISIS-1470</a> - Maintenance 1.13.1 umbrella ticket</p>
-</li>
-</ul>
-</div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="r1.13.0">1.13.0</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>Apache Isis 1.13.0 improves and formalizes the support for commands and auditing, and introduces the new concept of an
-interaction. A command now represents the <em>intention</em> to interact with the application, either to invoke an action or
-to edit a property. This is captured as a JAXB DTO. An interaction on the other hand captures the fact that a
-command has been performed. Interactions are also captured as DTOs. Interactions can include sub-interactions,
-representing the fact that an action can invoke another action by way of the
-<a href="guides/rgsvc.html#_rgsvc_api_WrapperFactory"><code>WrapperFactory</code></a>.</p>
-</div>
-<div class="paragraph">
-<p>The existing <a href="guides/rgsvc.html#_rgsvc_spi_AuditingService"><code>AuditingService</code></a> and
-<a href="guides/rgsvc.html#_rgsvc_spi_PublishingService"><code>PublishingService</code></a> SPI services have both been deprecated, instead
-replaced by <a href="guides/rgsvc.html#_rgsvc_spi_AuditerService"><code>AuditerService</code></a> and
-<a href="guides/rgsvc.html#_rgsvc_spi_PublisherService"><code>PublisherService</code></a>. It is now possible to have multiple implementations
-of each.</p>
-</div>
-<div class="paragraph">
-<p>The (non-ASF) <a href="http://github.com/isisaddons/isis-module-auditing">Isis addons' auditing</a> module has been reworked to
-implement <a href="guides/rgsvc.html#_rgsvc_spi_AuditService"><code>AuditService</code></a>, while the new (non-ASF)
-<a href="http://github.com/isisaddons/isis-module-publishmq">Isis addons' publishmq</a> module implements
-<a href="guides/rgsvc.html#_rgsvc_spi_PublisherService"><code>PublisherService</code></a> to publish interaction events to an ActiveMQ bus (and
-to allow such events to be replayed if necessary).</p>
-</div>
-<div class="paragraph">
-<p>The release also includes a great deal of internal refactorings and simplifications.</p>
-</div>
-<div class="paragraph">
-<p>Most applications written against v1.12.x should run against v1.13.0 with few if any changes. That said, this release
-has removed a small number of features that were dependent on internal APIs, and some configuration properties are
-now removed/unsupported. We therefore do recommend that you read and keep in mind the <a href="migration-notes.html#_migration-notes_1.12.0-to-1.13.0.adoc">migration notes</a> when you upgrade your app.</p>
-</div>
-<div class="sect2">
-<h3 id="_new_feature_5">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>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1433">ISIS-1433</a> - New configuration option to allow a minimum/maximum date to be specified for date pickers.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1421">ISIS-1421</a> - Possible object deadlock when under load.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1420">ISIS-1420</a> - To support dockerization, have any overrides.properties file take precedence over any other config properties</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1418">ISIS-1418</a> - Support @Nullable for parameters and properties</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1413">ISIS-1413</a> - Gradle script (and docs) in simpleapp archetype to auto-enhance and for dynamic layouts, also liveReload</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1399">ISIS-1399</a> - MetricsService to capture within InteractionContext, for profiling.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1390">ISIS-1390</a> - Provide a default CommandService, to return CommandDefault.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1389">ISIS-1389</a> - New InteractionContext service and Interaction to handle the execution of commands.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1385">ISIS-1385</a> - Improve DomainChangeJdoAbstract (superclass of commands, audits etc) so cannot "open" target object if a domain service.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1384">ISIS-1384</a> - Extend MetaModelService to indicate what "sort of" object a given domain type represents.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1381">ISIS-1381</a> - Extend ActionInvocationMementoDto (XSD) to apply to bulk actions (a list of targets and perhaps list of mixins).</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1380">ISIS-1380</a> - ActionInvocationMementoDTO to capture stacktrace, if any, when an action is invoked.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1379">ISIS-1379</a> - ActionInvocationMementoDto (XSD) should hold subactions.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1378">ISIS-1378</a> - ActionInvocationMementoDTO (XSD) returned object also indicates its type (same as parameters)</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1377">ISIS-1377</a> - ActionInvocationMementoDto (XSD) with majorVersion and minorVersion, so that each instance identifies the "logical" version of the schema with which it is compatible.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1376">ISIS-1376</a> - ActionInvocationMementoDto (XSD) to capture end time of each action invocation.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1375">ISIS-1375</a> - extend BackgroundCommandService to be able to invoke mixed-in actions.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1374">ISIS-1374</a> - extend BackgroundCommandService to be able to invoke mixed-in actions.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1373">ISIS-1373</a> - Have isis-core-applib depend upon isis-core-schema</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1372">ISIS-1372</a> - Change BackgroundCommandService to work with new Command DTO</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1370">ISIS-1370</a> - New PublisherService to simplify and replace PublishingService.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1368">ISIS-1368</a> - The (new) PublisherService API should provide the ability to republish (action) commands.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1291">ISIS-1291</a> - Define new DTO (XSD) as the memento for Command#setMemento</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-855">ISIS-855</a> - Allow contributed actions to be renamed in the contributee</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-542">ISIS-542</a> - Restrict which entities a service action is contributed to (as either a contributed action or contributed assocation).</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-292">ISIS-292</a> - Remove Authenticator#isValid method; should not be defined as part of API.</p>
-</li>
-</ul>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_improvement_6">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>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1462">ISIS-1462</a> - A new user has some trouble navigating to a single item in a collection using wicket ui</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1460">ISIS-1460</a> - Position edit link on top of string field.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1459">ISIS-1459</a> - Add AppManifest.Util class to set up common configuration properties for running in-memory</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1457">ISIS-1457</a> - PoWriter shouldn’t log on shutdown if there are metamodel validation exceptions</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1455">ISIS-1455</a> - Improve metamodel invalid exception handling</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1449">ISIS-1449</a> - Rename 'isis.viewer.wicket.suppressRememberMe' to 'isis.viewer.wicket.rememberMe.suppress'</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1448">ISIS-1448</a> - Reinstate component factory for collections, so that they can be easily substituted.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1447">ISIS-1447</a> - Avoid possible race-condition resulting in 500 errors under the Restful Objects viewer</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1445">ISIS-1445</a> - Tab names (in XML layouts) should be translated via TranslationService</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1443">ISIS-1443</a> - Refactor specloader so that specs for domain services are marked as a service from the get-go</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1442">ISIS-1442</a> - Mark some applib classes as @Value in order to reduce size of the metamodel (don’t mixin to these).</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1441">ISIS-1441</a> - Remove subclass of AuthenticationManagerStandard in isis-core-runtime.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1438">ISIS-1438</a> - Set up JAXBContext for ChangesDtoUtils and the others in a background thread.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1437">ISIS-1437</a> - Configure slow-running Wicket bootstrapping in separate background threads.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1430">ISIS-1430</a> - Deprecate AuditingService3 and replace with AuditerService, with transactions identified by …​</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1429">ISIS-1429</a> - Remove unused code.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1428">ISIS-1428</a> - Remove unnecessary 'synchronized' modifiers</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1427">ISIS-1427</a> - Simplify bootstrapping code</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1426">ISIS-1426</a> - Remove unused log4j appender classes</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1425">ISIS-1425</a> - Fix support for publishing of wrapper calling programmatically instantiated mixin.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1419">ISIS-1419</a> - Simplify session management handling (IllegalStateException when integ tests complete).</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1417">ISIS-1417</a> - For faster start-ups, allow any deprecated facets to simply be ignored.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1416">ISIS-1416</a> - To reduce application bootstrap times, allow set…​() and inject…​() style of dependency injection to be diabled.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1415">ISIS-1415</a> - Reduce app startup times by lazily initializing the ApplicationFeatureRepository,</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1411">ISIS-1411</a> - Refactoring - simplify PersistenceSession.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1410">ISIS-1410</a> - Minor performance improvements/refactorings (no functional change)</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1409">ISIS-1409</a> - Simplify RuntimeContext (internal bootstrapping)</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1408">ISIS-1408</a> - Simplify InstallerLookup and IsisComponentProvider (internal bootstrapping)</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1407">ISIS-1407</a> - Refactor SpecificationLoader into an internal domain service.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1406">ISIS-1406</a> - Refactor IsisConfigurationDefault and the metamodel.ConfigurationService into an internal domain service</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1404">ISIS-1404</a> - Refactor AuthenticationSessionProvider as an internal domain service.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1398">ISIS-1398</a> - Refactor PropertySetterFacet to follow the pattern for ActionInvocationFacet.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1397">ISIS-1397</a> - Generalize ActionInvocationMemento to also capture property modifications. Rename to MemberInteractionMemento.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1392">ISIS-1392</a> - Extend RepositoryService with persistAndFlush(…​) and removeAndFlush(…​) methods</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1387">ISIS-1387</a> - Ensure that generated bs3 layout XML files include a suitable namespace prefix.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1386">ISIS-1386</a> - Ensure that generated aim, cmd or common memento XML include a suitable namespace prefix.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1371">ISIS-1371</a> - ActionInvocationMementoDto (XSD) to capture the mixed-in object (if any).</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1369">ISIS-1369</a> - Add missing tests for AppFeature</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1367">ISIS-1367</a> - Extend MetaModelService to expose the nature of a domain service. Have DomainObjectContainer#isViewModel(…​) delegate to it.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1366">ISIS-1366</a> - Add svg image suffix support (PR #38)</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1365">ISIS-1365</a> - DomainObjectContainerDefault should delegate to RepositoryService (and others) where possible.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1364">ISIS-1364</a> - Improve Asciidoc and Javadoc for migrating from DomainObjectContainer#persist() to RepositoryService#persist()</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1359">ISIS-1359</a> - Action annotated as autoCompleteAction cannot be annotated with @Programmatic. This should be possible.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1356">ISIS-1356</a> - Install a BulkFacet even if @Action( invokeOn=OBJECTS_ONLY)</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1352">ISIS-1352</a> - collapse IsisSystemFactoryThatUsesInstallers up to IsisSystemFactory</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1344">ISIS-1344</a> - Remove the *Transaction facets</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1343">ISIS-1343</a> - Properly handle domain events from mixins, exposing the underlying "mixedIn" domain object.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1338">ISIS-1338</a> - Extend ResourceServlet and simpleapp archetype for SVG image type.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1256">ISIS-1256</a> - Shiro has a vulnerabilty for default rememberMe cookie. We should work around this somehow</p>
-</li>
-</ul>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_bug_5">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>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1458">ISIS-1458</a> - Possible incomplete auditing for "non-trivial" updates</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1454">ISIS-1454</a> - Hints for drop-downs in Wicket viewer not honoured.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1453">ISIS-1453</a> - SessionManagementService#nextSession broken</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1452">ISIS-1452</a> - Throwing an exception (for -SNAPSHOT) does not abort the transaction.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1444">ISIS-1444</a> - Mark applib FixtureScript.Execution methods as @Programmatic to avoid being added to the metamodel</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1436">ISIS-1436</a> - When executing a bulk action on a paginated collection items, chosen items can be ignored unintentionally</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1435">ISIS-1435</a> - Infitinite recursion in updating() callback if it modifies the object</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1434">ISIS-1434</a> - Cookie not cleared after logout, Shiro session remains active</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1432">ISIS-1432</a> - When there is no default for a date parameter, the system is defaulting to the current date, whereas it should be null.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1423">ISIS-1423</a> - TranslationServicePo does not guard against null keys.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1422">ISIS-1422</a> - Autocomplete publishes events to the event bus.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1414">ISIS-1414</a> - nextTransaction can cause null pointers with the new MetricsService.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1412">ISIS-1412</a> - Actions annotated with SemanticsOf.IDEMPOTENT_ARE_YOU_SURE throw a NullPointerException when invoked through the REST API</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1405">ISIS-1405</a> - Refactor DeploymentCategoryProvider into an internal domain service.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1402">ISIS-1402</a> - Remove the Debuggable interface.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1401">ISIS-1401</a> - NPE when wrapping call to FixtureScripts#runFixtureScript for a newly instantiated FixtureScript</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1400">ISIS-1400</a> - bulk-only actions are shown on object forms</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1393">ISIS-1393</a> - Maven swagger goal failed: No Session opened for this thread</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1383">ISIS-1383</a> - Missing component factory class names in Wicket HTML</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1382">ISIS-1382</a> - Cancel buttons disappeared on modal dialogs</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1358">ISIS-1358</a> - Simpleapp created from archetype and packaged to war fails when deploying to Tomcat</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1336">ISIS-1336</a> - config param typo…​ titleEvent should be titleUiEvent.</p>
-</li>
-</ul>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_task_5">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>
-</ul>
-</div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="r1.12.2">1.12.2</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<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>
-<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>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1132">ISIS-1132</a> - possible timezone issues when refresh page in Wicket viewer.</p>
-</li>
-</ul>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_task_6">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>
-</ul>
-</div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="r1.12.1">1.12.1</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<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>
-<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>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1357">ISIS-1357</a> - Update dependency from guava-19.0.20150826 to guava-19.0</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1361">ISIS-1361</a> - View model that changes two domain objects only has one of them updated.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1363">ISIS-1363</a> - ConfigurationServiceMenu is defined under the prototyping menu, but is not restricted to prototyping. Suggest place under the tertiary menu instead.</p>
-</li>
-</ul>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_task_7">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>
-</ul>
-</div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="r1.12.0">1.12.0</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>The main feature in 1.12.0 is much enhanced support for custom layouts, using an optional separate XML layout file <code>Xxx.layout.xml</code> (where <code>Xxx</code> is the class of the object being rendered). This is similar in concept to the earlier support we have had for custom layouts through a <code>.layout.json</code> file, but introduces the ability to position object members anywhere using bootstrap columns and rows. It also brings in
-support for tabgroups, and allows object members to be included in the page more than once (eg a table view and also a (non-ASF) <a href="http://github.com/isisaddons/isis-wicket-fullcalendar2">calendar</a> view).</p>
-</div>
-<div class="paragraph">
-<p>As a result of this change, the support for editing objects has been modified; rather than an 'edit' button which toggles the entire
-page into edit mode, instead each property is edited individually. The current implementation of this is using a prompt dialog (very
-similar to the action prompt dialogs; in a future release we hope to support "in-place" edits instead.</p>
-</div>
-<div class="paragraph">
-<p>Another notable change in this release include various new domain services. Some of these are in support of the dynamic layouts
-functionality, others including new access into Apache Isis' metamodel. (Some of these new services were originally part of the (non-ASF)
-<a href="http://isisaddons.org">Isis Addons</a>). In addition, the <a href="guides/rgsvc.html#_rgsvc_api_DomainObjectContainer"><code>DomainObjectContainer</code></a>
-service has been deprecated, replaced by a number of fine-grained services
-(such as <a href="guides/rgsvc.html#_rgsvc_api_RepositoryService"><code>RepositoryService</code></a> and <a href="guides/rgsvc.html#_rgsvc_api_MessageService"><code>MessageService</code></a>).</p>
-</div>
-<div class="paragraph">
-<p>The release also includes a number of new mixins, to automatically surface in the UI an entity’s id, version (if any), and to download the
-layout XML and rebuild the metamodel for a given domain entity. There is also a mixin to clear any UI hints (part of the dynamic layouts
-functionality). In all cases these mixins can be hidden using either security or by writing a <a href="guides/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>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1351">ISIS-1351</a> - Extend <a href="guides/rgsvc.html#_rgsvc_api_ConfigurationService"><code>ConfigurationService</code></a> to list all configuration properties in the UI</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1325">ISIS-1325</a> - New <a href="guides/rgsvc.html#_rgsvc_api_SessionManagementService"><code>SessionManagementService</code></a></p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1317">ISIS-1317</a> - Allow single domain object class to be invalidated through a mixin.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1313">ISIS-1313</a> - Enhancement to <a href="guides/rgmvn.html#_rgmvn_xsd">xsd</a> goal of the isis-maven-plugin to ignore/include the Isis common schemas.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1292">ISIS-1292</a> - Extend <a href="guides/rgsvc.html#_rgsvc_api_MetaModelService"><code>MetaModelService</code></a> to surface packages, classes etc (as used by the security module).</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-993">ISIS-993</a> - Show different object members on multiple tabs (<a href="guides/ugfun.html#_ugfun_object-layout_dynamic_xml">dynamic XML layouts</a>)</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-784">ISIS-784</a> - Change Wicket viewer to get rid of edit mode, instead allow individual fields to be edited by clicking on them (similar to the way that JIRA works).</p>
-</li>
-</ul>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_improvement_7">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>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1332">ISIS-1332</a> - Factor out a <a href="guides/rgsvc.html#_rgsvc_spi_HintStore"><code>HintStore</code></a> service, so that this is pluggable.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1330">ISIS-1330</a> - Add CSS classes for table cells and for collections to make it easier to fine tune pages using CSS.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1329">ISIS-1329</a> - Extend hint support for "show all"</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1327">ISIS-1327</a> - Change the view mode of the select2 (value drop down) to be a simple text field.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1324">ISIS-1324</a> - Allow multiple different views of same collection in a layout (<a href="guides/ugfun.html#_ugfun_object-layout_dynamic_xml">dynamic XML layouts</a>)</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1323">ISIS-1323</a> - Deprecate @CollectionLayout#renderType, since is duplicated by <a href="guides/rgant.html#_rgant-CollectionLayout_defaultView"><code>@CollectionLayout#defaultView()</code></a></p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1322">ISIS-1322</a> - Mixins not exposing the mixedin object in events (for subscribers to veto).</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1321">ISIS-1321</a> - Extend <a href="guides/rgsvc.html#_rgsvc_api_MetaModelService"><code>MetaModelService</code></a> to allow CSV of metamodel to be downloaded.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1320">ISIS-1320</a> - Move <a href="guides/rgsvc.html#_rgsvc_spi_ContentMappingService"><code>ContentMappingService</code></a> to applib (and simplify)</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1312">ISIS-1312</a> - Improve <a href="guides/rgsvc.html#_rgsvc_api_JaxbService"><code>JaxbServiceDefault#xsd(…​)</code></a> to correctly reference the Isis common schema imports.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1300">ISIS-1300</a> - Allow the enablement of the WicketSource plugin to be configurable, and disabled by default</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1299">ISIS-1299</a> - <a href="guides/rgant.html#_rgant-ViewModel"><code>@ViewModel</code></a> and <a href="guides/rgant.html#_rgant-XmlRootElement"><code>@XmlRootElement</code></a> view models should automatically support isCloneable.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1298">ISIS-1298</a> - Fix deprecated annotation use for ViewModel.Cloneable#clone</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1295">ISIS-1295</a> - Run integration tests using thread-local, to allow "complete" tests that also exercise, eg Quartz jobs.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1240">ISIS-1240</a> - Derive icon from service when not provided</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1239">ISIS-1239</a> - For wicket ui, use a cookie or similar to remember the hint from last time (<a href="guides/ugfun.html#_ugfun_object-layout_dynamic_xml">dynamic XML layouts</a>)</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1228">ISIS-1228</a> - Reorganizing/splitting out <a href="guides/rgant.html#_rgant-DomainObjectContainer"><code>@DomainObjectContainer</code></a> service.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1048">ISIS-1048</a> - Make view model URLs more secure, eg through a private key (<a href="guides/rgsvc.html#_rgsvc_spi_UrlEncodingService"><code>UrlEncodingService</code></a>).</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1037">ISIS-1037</a> - Support layout.xml as well as layout.json (<a href="guides/ugfun.html#_ugfun_object-layout_dynamic_xml">dynamic XML layouts</a>)</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-806">ISIS-806</a> - In Wicket viewer, shouldn’t be possible to invoke an action if editing a form.</p>
-</li>
-</ul>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_bug_8">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.html#_ugtst_unit-test-support_soap-fake-server-junit-rule">SoapEndpointPublishingRule</a> when multiple endpoints.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1347">ISIS-1347</a> - Missing annotation in SimpleObject</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1346">ISIS-1346</a> - ActionInvocationContext isn’t populated properly</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1342">ISIS-1342</a> - The metamodel validation error page doesn’t reliably render itself if there are errors.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1341">ISIS-1341</a> - Restful Objects viewer should perform a flush transaction before generating representations.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1340">ISIS-1340</a> - Rebuild metamodel mixin action isn’t working reliably</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1328">ISIS-1328</a> - Bookmark hints are not being honoured</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1319">ISIS-1319</a> - Input dialog for action label for mandatory parameter not shown when the parameter is an view model</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1318">ISIS-1318</a> - contributed actions/mixins breaks publishing; also flush any pending actions to be published as the result of doing a wrapped action via the <a href="guides/rgsvc.html#_rgsvc_api_WrapperFactory"><code>WrapperFactory</code></a></p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1315">ISIS-1315</a> - Can’t generate <a href="guides/rgmvn.html#_rgmvn_swagger">swagger</a> specs, where actions are contributed.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1314">ISIS-1314</a> - Filename parameter label missing for DTO mixins</p>
-</li>
-<li>
-<p>
<TRUNCATED>
[32/44] isis-site git commit: ISIS-1594: provide an 'edit' button
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/83a3755a/content/guides/rgcms.pdf
----------------------------------------------------------------------
diff --git a/content/guides/rgcms.pdf b/content/guides/rgcms.pdf
index d794cb1..1ea445e 100644
--- a/content/guides/rgcms.pdf
+++ b/content/guides/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:20170219155004+00'00')
-/ModDate (D:20170219155004+00'00')
+/CreationDate (D:20170307234001+00'00')
+/ModDate (D:20170307234001+00'00')
>>
endobj
2 0 obj
<< /Type /Catalog
/Pages 3 0 R
/Names 14 0 R
-/Outlines 1027 0 R
-/PageLabels 1056 0 R
+/Outlines 1026 0 R
+/PageLabels 1055 0 R
/PageMode /UseOutlines
/OpenAction [7 0 R /FitH 842.89]
/ViewerPreferences << /DisplayDocTitle true
@@ -23,7 +23,7 @@ endobj
3 0 obj
<< /Type /Pages
/Count 93
-/Kids [7 0 R 10 0 R 12 0 R 39 0 R 62 0 R 127 0 R 151 0 R 156 0 R 164 0 R 169 0 R 173 0 R 178 0 R 188 0 R 192 0 R 195 0 R 205 0 R 210 0 R 217 0 R 227 0 R 241 0 R 244 0 R 248 0 R 261 0 R 292 0 R 300 0 R 309 0 R 312 0 R 328 0 R 338 0 R 348 0 R 357 0 R 375 0 R 404 0 R 422 0 R 425 0 R 436 0 R 443 0 R 451 0 R 456 0 R 459 0 R 465 0 R 493 0 R 507 0 R 531 0 R 549 0 R 561 0 R 567 0 R 573 0 R 580 0 R 586 0 R 595 0 R 602 0 R 612 0 R 622 0 R 638 0 R 655 0 R 669 0 R 685 0 R 702 0 R 711 0 R 714 0 R 718 0 R 726 0 R 730 0 R 737 0 R 740 0 R 748 0 R 755 0 R 765 0 R 779 0 R 792 0 R 804 0 R 823 0 R 832 0 R 845 0 R 864 0 R 868 0 R 881 0 R 886 0 R 891 0 R 899 0 R 905 0 R 914 0 R 919 0 R 925 0 R 929 0 R 936 0 R 941 0 R 944 0 R 951 0 R 957 0 R 963 0 R 966 0 R]
+/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 226 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 403 0 R 421 0 R 424 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 530 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 791 0 R 803 0 R 822 0 R 831 0 R 844 0 R 863 0 R 867 0 R 880 0 R 885 0 R 890 0 R 898 0 R 904 0 R 913 0 R 918 0 R 924 0 R 928 0 R 935 0 R 940 0 R 943 0 R 950 0 R 956 0 R 962 0 R 965 0 R]
>>
endobj
4 0 obj
@@ -78,13 +78,13 @@ endobj
endobj
8 0 obj
<< /Type /Font
-/BaseFont /AAAABI+NotoSerif
+/BaseFont /AAAABE+NotoSerif
/Subtype /TrueType
-/FontDescriptor 1058 0 R
+/FontDescriptor 1057 0 R
/FirstChar 32
/LastChar 255
-/Widths 1060 0 R
-/ToUnicode 1059 0 R
+/Widths 1059 0 R
+/ToUnicode 1058 0 R
>>
endobj
9 0 obj
@@ -1182,7 +1182,7 @@ endobj
/F3.0 18 0 R
>>
>>
-/Annots [972 0 R 973 0 R 974 0 R 975 0 R 976 0 R 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]
+/Annots [971 0 R 972 0 R 973 0 R 974 0 R 975 0 R 976 0 R 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]
>>
endobj
11 0 obj
@@ -1989,7 +1989,7 @@ endobj
/F3.0 18 0 R
/F4.0 19 0 R
>>
-/XObject << /Stamp1 1026 0 R
+/XObject << /Stamp1 1025 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 [221 0 R 695 0 R 787 0 R 526 0 R 721 0 R 222 0 R 396 0 R 897 0 R 288 0 R 808 0 R 449 0 R 816 0 R]
+<< /Kids [220 0 R 694 0 R 786 0 R 525 0 R 720 0 R 221 0 R 395 0 R 896 0 R 287 0 R 807 0 R 448 0 R 815 0 R]
>>
endobj
16 0 obj
<< /Type /Font
-/BaseFont /AAAABJ+NotoSerif-Bold
+/BaseFont /AAAABF+NotoSerif-Bold
/Subtype /TrueType
-/FontDescriptor 1062 0 R
+/FontDescriptor 1061 0 R
/FirstChar 32
/LastChar 255
-/Widths 1064 0 R
-/ToUnicode 1063 0 R
+/Widths 1063 0 R
+/ToUnicode 1062 0 R
>>
endobj
17 0 obj
@@ -2028,24 +2028,24 @@ endobj
endobj
18 0 obj
<< /Type /Font
-/BaseFont /AAAABK+mplus1mn-regular
+/BaseFont /AAAABG+mplus1mn-regular
/Subtype /TrueType
-/FontDescriptor 1066 0 R
+/FontDescriptor 1065 0 R
/FirstChar 32
/LastChar 255
-/Widths 1068 0 R
-/ToUnicode 1067 0 R
+/Widths 1067 0 R
+/ToUnicode 1066 0 R
>>
endobj
19 0 obj
<< /Type /Font
-/BaseFont /AAAABL+mplus-1p-regular
+/BaseFont /AAAABH+mplus-1p-regular
/Subtype /TrueType
-/FontDescriptor 1070 0 R
+/FontDescriptor 1069 0 R
/FirstChar 32
/LastChar 255
-/Widths 1072 0 R
-/ToUnicode 1071 0 R
+/Widths 1071 0 R
+/ToUnicode 1070 0 R
>>
endobj
20 0 obj
@@ -3778,7 +3778,7 @@ endobj
/F6.0 44 0 R
/F4.0 19 0 R
>>
-/XObject << /Stamp1 1026 0 R
+/XObject << /Stamp1 1025 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]
@@ -3803,24 +3803,24 @@ endobj
endobj
43 0 obj
<< /Type /Font
-/BaseFont /AAAABM+FontAwesome
+/BaseFont /AAAABI+FontAwesome
/Subtype /TrueType
-/FontDescriptor 1074 0 R
+/FontDescriptor 1073 0 R
/FirstChar 32
/LastChar 255
-/Widths 1076 0 R
-/ToUnicode 1075 0 R
+/Widths 1075 0 R
+/ToUnicode 1074 0 R
>>
endobj
44 0 obj
<< /Type /Font
-/BaseFont /AAAABN+NotoSerif-Italic
+/BaseFont /AAAABJ+NotoSerif-Italic
/Subtype /TrueType
-/FontDescriptor 1078 0 R
+/FontDescriptor 1077 0 R
/FirstChar 32
/LastChar 255
-/Widths 1080 0 R
-/ToUnicode 1079 0 R
+/Widths 1079 0 R
+/ToUnicode 1078 0 R
>>
endobj
45 0 obj
@@ -7967,7 +7967,7 @@ endobj
/F4.0 19 0 R
/F1.0 8 0 R
>>
-/XObject << /Stamp1 1026 0 R
+/XObject << /Stamp1 1025 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]
@@ -8484,7 +8484,7 @@ endobj
>>
endobj
126 0 obj
-<< /Length 36448
+<< /Length 38745
>>
stream
q
@@ -9459,12 +9459,12 @@ f
h
S
Q
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
59.24000000000001 454.0850000000002 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<7075626c6963> Tj
ET
@@ -9481,12 +9481,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
BT
97.74000000000001 454.0850000000002 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<636c617373> Tj
ET
@@ -9503,12 +9503,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
BT
130.74 454.0850000000002 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<4c6962726172794d656d626572> Tj
ET
@@ -9547,12 +9547,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
81.24000000000001 439.3450000000002 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<7075626c6963> Tj
ET
@@ -9569,8 +9569,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
BT
119.74000000000001 439.3450000000002 Td
@@ -9591,8 +9591,8 @@ 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
174.74 439.3450000000002 Td
@@ -9641,7 +9641,18 @@ ET
BT
268.24 439.3450000000002 Td
/F3.0 11 Tf
-<2829> 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
+
+BT
+273.74 439.3450000000002 Td
+/F3.0 11 Tf
+<29> Tj
ET
0.000 0.000 0.000 SCN
@@ -9685,7 +9696,29 @@ ET
BT
295.74 439.3450000000002 Td
/F3.0 11 Tf
-<2e2e2e> Tj
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+301.24 439.3450000000002 Td
+/F3.0 11 Tf
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+306.74 439.3450000000002 Td
+/F3.0 11 Tf
+<2e> Tj
ET
0.000 0.000 0.000 SCN
@@ -9723,12 +9756,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
81.24000000000001 424.6050000000002 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<7075626c6963> Tj
ET
@@ -9745,12 +9778,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
BT
119.74000000000001 424.6050000000002 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<766f6964> Tj
ET
@@ -9789,8 +9822,8 @@ 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
213.24 424.6050000000002 Td
@@ -9811,8 +9844,8 @@ 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
268.24 424.6050000000002 Td
@@ -9905,7 +9938,29 @@ ET
BT
367.24 424.6050000000002 Td
/F3.0 11 Tf
-<2e2e2e> Tj
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+372.74 424.6050000000002 Td
+/F3.0 11 Tf
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+378.24 424.6050000000002 Td
+/F3.0 11 Tf
+<2e> Tj
ET
0.000 0.000 0.000 SCN
@@ -9943,12 +9998,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
81.24000000000001 409.8650000000002 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<7075626c6963> Tj
ET
@@ -9965,12 +10020,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
BT
119.74000000000001 409.8650000000002 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<766f6964> Tj
ET
@@ -10009,8 +10064,8 @@ 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 409.8650000000002 Td
@@ -10103,13 +10158,35 @@ ET
BT
163.74 395.12500000000017 Td
/F3.0 11 Tf
-<28292e> 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
+
+BT
+169.24 395.12500000000017 Td
+/F3.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
+174.74 395.12500000000017 Td
+/F3.0 11 Tf
+<2e> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
180.24 395.12500000000017 Td
@@ -10147,7 +10224,18 @@ ET
BT
224.24 395.12500000000017 Td
/F3.0 11 Tf
-<293b> Tj
+<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
+229.74 395.12500000000017 Td
+/F3.0 11 Tf
+<3b> Tj
ET
0.000 0.000 0.000 SCN
@@ -10207,8 +10295,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
191.24 380.3850000000002 Td
@@ -10229,12 +10317,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
257.24 380.3850000000002 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<74686973> Tj
ET
@@ -10317,8 +10405,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
356.24 380.3850000000002 Td
@@ -10334,13 +10422,35 @@ ET
BT
383.74 380.3850000000002 Td
/F3.0 11 Tf
-<28292e> 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
+
+BT
+389.24 380.3850000000002 Td
+/F3.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
+394.74 380.3850000000002 Td
+/F3.0 11 Tf
+<2e> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
400.24 380.3850000000002 Td
@@ -10361,12 +10471,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.000 0.867 scn
-0.000 0.000 0.867 SCN
+1.000 0.400 0.000 scn
+1.000 0.400 0.000 SCN
BT
449.74 380.3850000000002 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<3231> Tj
ET
@@ -10378,7 +10488,29 @@ ET
BT
460.74 380.3850000000002 Td
/F3.0 11 Tf
-<29293b> Tj
+<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
+466.24 380.3850000000002 Td
+/F3.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
+471.74 380.3850000000002 Td
+/F3.0 11 Tf
+<3b> Tj
ET
0.000 0.000 0.000 SCN
@@ -10438,12 +10570,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
81.24000000000001 350.9050000000002 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<7075626c6963> Tj
ET
@@ -10460,12 +10592,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
BT
119.74000000000001 350.9050000000002 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<766f6964> Tj
ET
@@ -10504,8 +10636,8 @@ 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
251.74 350.9050000000002 Td
@@ -10587,7 +10719,29 @@ ET
BT
323.24 350.9050000000002 Td
/F3.0 11 Tf
-<2e2e2e> Tj
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+328.74 350.9050000000002 Td
+/F3.0 11 Tf
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+334.24 350.9050000000002 Td
+/F3.0 11 Tf
+<2e> Tj
ET
0.000 0.000 0.000 SCN
@@ -10631,7 +10785,29 @@ ET
BT
81.24000000000001 336.1650000000002 Td
/F3.0 11 Tf
-<2e2e2e> Tj
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+86.74000000000001 336.1650000000002 Td
+/F3.0 11 Tf
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+92.24000000000001 336.1650000000002 Td
+/F3.0 11 Tf
+<2e> Tj
ET
0.000 0.000 0.000 SCN
@@ -11043,13 +11219,12 @@ endobj
/F4.0 19 0 R
/F1.0 8 0 R
/F5.1 43 0 R
-/F7.0 141 0 R
-/F3.1 142 0 R
+/F3.1 141 0 R
>>
-/XObject << /Stamp1 1026 0 R
+/XObject << /Stamp1 1025 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 143 0 R 144 0 R 145 0 R 147 0 R 148 0 R 149 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]
>>
endobj
128 0 obj
@@ -11159,27 +11334,16 @@ endobj
endobj
141 0 obj
<< /Type /Font
-/BaseFont /AAAABO+mplus1mn-bold
+/BaseFont /AAAABK+mplus1mn-regular
/Subtype /TrueType
-/FontDescriptor 1082 0 R
+/FontDescriptor 1081 0 R
/FirstChar 32
/LastChar 255
-/Widths 1084 0 R
-/ToUnicode 1083 0 R
+/Widths 1083 0 R
+/ToUnicode 1082 0 R
>>
endobj
142 0 obj
-<< /Type /Font
-/BaseFont /AAAABP+mplus1mn-regular
-/Subtype /TrueType
-/FontDescriptor 1086 0 R
-/FirstChar 32
-/LastChar 255
-/Widths 1088 0 R
-/ToUnicode 1087 0 R
->>
-endobj
-143 0 obj
<< /Border [0 0 0]
/Dest (_rgcms_methods_prefixes_removeFrom)
/Subtype /Link
@@ -11187,7 +11351,7 @@ endobj
/Type /Annot
>>
endobj
-144 0 obj
+143 0 obj
<< /Border [0 0 0]
/Dest (_rgcms_methods_prefixes_removeFrom)
/Subtype /Link
@@ -11195,7 +11359,7 @@ endobj
/Type /Annot
>>
endobj
-145 0 obj
+144 0 obj
<< /Border [0 0 0]
/Dest (_rgcms_methods_prefixes_removeFrom)
/Subtype /Link
@@ -11203,10 +11367,10 @@ endobj
/Type /Annot
>>
endobj
-146 0 obj
+145 0 obj
[127 0 R /XYZ 0 224.17000000000027 null]
endobj
-147 0 obj
+146 0 obj
<< /Border [0 0 0]
/Dest (_rgcms_methods_prefixes_choices)
/Subtype /Link
@@ -11214,7 +11378,7 @@ endobj
/Type /Annot
>>
endobj
-148 0 obj
+147 0 obj
<< /Border [0 0 0]
/Dest (_rgcms_methods_prefixes_choices)
/Subtype /Link
@@ -11222,7 +11386,7 @@ endobj
/Type /Annot
>>
endobj
-149 0 obj
+148 0 obj
<< /Border [0 0 0]
/Dest (_rgcms_methods_prefixes_choices)
/Subtype /Link
@@ -11230,8 +11394,8 @@ endobj
/Type /Annot
>>
endobj
-150 0 obj
-<< /Length 39260
+149 0 obj
+<< /Length 42393
>>
stream
q
@@ -11330,12 +11494,12 @@ f
h
S
Q
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
59.24 730.205 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<7075626c6963> Tj
ET
@@ -11352,8 +11516,8 @@ 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
97.74000000000001 730.205 Td
@@ -11429,8 +11593,8 @@ 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
235.24 730.205 Td
@@ -11512,7 +11676,29 @@ ET
BT
328.74 730.205 Td
/F3.0 11 Tf
-<2e2e2e> Tj
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+334.24 730.205 Td
+/F3.0 11 Tf
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+339.74 730.205 Td
+/F3.0 11 Tf
+<2e> Tj
ET
0.000 0.000 0.000 SCN
@@ -11654,12 +11840,12 @@ f
h
S
Q
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
59.24 625.9050000000001 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<7075626c6963> Tj
ET
@@ -11676,12 +11862,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
BT
97.74000000000001 625.9050000000001 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<636c617373> Tj
ET
@@ -11698,12 +11884,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
BT
130.74 625.9050000000001 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<53686f7070696e67436172744974656d> Tj
ET
@@ -11742,8 +11928,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
BT
81.24000000000001 611.1650000000001 Td
@@ -11808,8 +11994,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
224.24 611.1650000000001 Td
@@ -11841,12 +12027,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
81.24000000000001 596.4250000000002 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<7075626c6963> Tj
ET
@@ -11902,7 +12088,18 @@ ET
BT
218.74 596.4250000000002 Td
/F3.0 11 Tf
-<2829> 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
+
+BT
+224.24 596.4250000000002 Td
+/F3.0 11 Tf
+<29> Tj
ET
0.000 0.000 0.000 SCN
@@ -11946,7 +12143,29 @@ ET
BT
246.24 596.4250000000002 Td
/F3.0 11 Tf
-<2e2e2e> Tj
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+251.74 596.4250000000002 Td
+/F3.0 11 Tf
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+257.24 596.4250000000002 Td
+/F3.0 11 Tf
+<2e> Tj
ET
0.000 0.000 0.000 SCN
@@ -11984,12 +12203,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
81.24000000000001 581.6850000000002 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<7075626c6963> Tj
ET
@@ -12006,12 +12225,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
BT
119.74000000000001 581.6850000000002 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<766f6964> Tj
ET
@@ -12133,7 +12352,29 @@ ET
BT
312.24 581.6850000000002 Td
/F3.0 11 Tf
-<2e2e2e> Tj
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+317.74 581.6850000000002 Td
+/F3.0 11 Tf
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+323.24 581.6850000000002 Td
+/F3.0 11 Tf
+<2e> Tj
ET
0.000 0.000 0.000 SCN
@@ -12171,8 +12412,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
BT
81.24000000000001 552.2050000000002 Td
@@ -12237,8 +12478,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
224.24 552.2050000000002 Td
@@ -12270,12 +12511,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
81.24000000000001 537.4650000000001 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<7075626c6963> Tj
ET
@@ -12292,12 +12533,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
BT
119.74000000000001 537.4650000000001 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<696e74> Tj
ET
@@ -12331,7 +12572,18 @@ ET
BT
202.24 537.4650000000001 Td
/F3.0 11 Tf
-<2829> 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
+
+BT
+207.74 537.4650000000001 Td
+/F3.0 11 Tf
+<29> Tj
ET
0.000 0.000 0.000 SCN
@@ -12375,7 +12627,29 @@ ET
BT
229.74 537.4650000000001 Td
/F3.0 11 Tf
-<2e2e2e> Tj
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+235.24 537.4650000000001 Td
+/F3.0 11 Tf
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+240.74 537.4650000000001 Td
+/F3.0 11 Tf
+<2e> Tj
ET
0.000 0.000 0.000 SCN
@@ -12413,12 +12687,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
81.24000000000001 522.7250000000001 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<7075626c6963> Tj
ET
@@ -12435,12 +12709,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
BT
119.74000000000001 522.7250000000001 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<766f6964> Tj
ET
@@ -12479,12 +12753,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
BT
213.24 522.7250000000001 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<696e74> Tj
ET
@@ -12562,7 +12836,29 @@ ET
BT
301.24 522.7250000000001 Td
/F3.0 11 Tf
-<2e2e2e> Tj
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+306.74 522.7250000000001 Td
+/F3.0 11 Tf
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+312.24 522.7250000000001 Td
+/F3.0 11 Tf
+<2e> Tj
ET
0.000 0.000 0.000 SCN
@@ -12600,8 +12896,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
BT
81.24000000000001 493.2450000000001 Td
@@ -12666,8 +12962,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
246.24 493.2450000000001 Td
@@ -12699,12 +12995,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
81.24000000000001 478.5050000000001 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<7075626c6963> Tj
ET
@@ -12831,8 +13127,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
BT
103.24000000000001 449.0250000000001 Td
@@ -12875,13 +13171,35 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
BT
229.74 449.0250000000001 Td
/F3.0 11 Tf
-<225175616e7469747922> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+235.24 449.0250000000001 Td
+/F3.0 11 Tf
+<5175616e74697479> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+279.24 449.0250000000001 Td
+/F3.0 11 Tf
+<22> Tj
ET
0.000 0.000 0.000 SCN
@@ -12908,12 +13226,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
103.24000000000001 434.2850000000001 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<66696e616c> Tj
ET
@@ -12930,12 +13248,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
BT
136.24 434.2850000000001 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<696e74> Tj
ET
@@ -13046,7 +13364,18 @@ ET
BT
202.24 419.5450000000001 Td
/F3.0 11 Tf
-<293b> Tj
+<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
+207.74 419.5450000000001 Td
+/F3.0 11 Tf
+<3b> Tj
ET
0.000 0.000 0.000 SCN
@@ -13101,7 +13430,18 @@ ET
BT
213.24 404.80500000000006 Td
/F3.0 11 Tf
-<293b> Tj
+<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
+218.74 404.80500000000006 Td
+/F3.0 11 Tf
+<3b> Tj
ET
0.000 0.000 0.000 SCN
@@ -13139,12 +13479,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
81.24000000000001 375.3250000000001 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<7075626c6963> Tj
ET
@@ -13161,8 +13501,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
BT
119.74000000000001 375.3250000000001 Td
@@ -13271,8 +13611,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
BT
103.24000000000001 360.5850000000001 Td
@@ -13293,12 +13633,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.000 0.867 scn
-0.000 0.000 0.867 SCN
+1.000 0.400 0.000 scn
+1.000 0.400 0.000 SCN
BT
163.74 360.5850000000001 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<33> Tj
ET
@@ -13326,8 +13666,8 @@ 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
180.24 360.5850000000001 Td
@@ -13442,7 +13782,29 @@ ET
BT
103.24000000000001 331.1050000000001 Td
/F3.0 11 Tf
-<2e2e2e> Tj
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+108.74000000000001 331.1050000000001 Td
+/F3.0 11 Tf
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+114.24000000000001 331.1050000000001 Td
+/F3.0 11 Tf
+<2e> Tj
ET
0.000 0.000 0.000 SCN
@@ -13486,7 +13848,29 @@ ET
BT
81.24000000000001 301.62500000000006 Td
/F3.0 11 Tf
-<2e2e2e> Tj
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+86.74000000000001 301.62500000000006 Td
+/F3.0 11 Tf
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+92.24000000000001 301.62500000000006 Td
+/F3.0 11 Tf
+<2e> Tj
ET
0.000 0.000 0.000 SCN
@@ -13673,12 +14057,12 @@ f
h
S
Q
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
59.239999999999995 121.145 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<7075626c6963> Tj
ET
@@ -13695,8 +14079,8 @@ 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
97.74 121.145 Td
@@ -13772,8 +14156,8 @@ 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
229.74 121.145 Td
@@ -13855,7 +14239,29 @@ ET
BT
323.24 121.145 Td
/F3.0 11 Tf
-<2e2e2e> Tj
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+328.74 121.145 Td
+/F3.0 11 Tf
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+334.24 121.145 Td
+/F3.0 11 Tf
+<2e> Tj
ET
0.000 0.000 0.000 SCN
@@ -13994,29 +14400,28 @@ Q
endstream
endobj
-151 0 obj
+150 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 150 0 R
+/Contents 149 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/Font << /F2.0 16 0 R
/F1.0 8 0 R
/F6.0 44 0 R
/F3.0 18 0 R
-/F7.0 141 0 R
-/F3.1 142 0 R
+/F3.1 141 0 R
>>
-/XObject << /Stamp1 1026 0 R
+/XObject << /Stamp1 1025 0 R
>>
>>
-/Annots [153 0 R]
+/Annots [152 0 R]
>>
endobj
-152 0 obj
-[151 0 R /XYZ 0 841.89 null]
+151 0 obj
+[150 0 R /XYZ 0 841.89 null]
endobj
-153 0 obj
+152 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -14027,11 +14432,11 @@ endobj
/Type /Annot
>>
endobj
-154 0 obj
-[151 0 R /XYZ 0 201.63000000000002 null]
+153 0 obj
+[150 0 R /XYZ 0 201.63000000000002 null]
endobj
-155 0 obj
-<< /Length 20134
+154 0 obj
+<< /Length 21824
>>
stream
q
@@ -14065,13 +14470,13 @@ h
S
Q
/DeviceRGB cs
-0.000 0.533 0.000 scn
+0.000 0.400 0.600 scn
/DeviceRGB CS
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 SCN
BT
59.24 783.0649999999999 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<7075626c6963> Tj
ET
@@ -14088,12 +14493,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
BT
97.74000000000001 783.0649999999999 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<636c617373> Tj
ET
@@ -14110,12 +14515,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
BT
130.74 783.0649999999999 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<53686f7070696e67436172744974656d> Tj
ET
@@ -14154,12 +14559,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
81.24000000000001 768.3249999999999 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<7075626c6963> Tj
ET
@@ -14215,7 +14620,18 @@ ET
BT
218.74 768.3249999999999 Td
/F3.0 11 Tf
-<2829> 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
+
+BT
+224.24 768.3249999999999 Td
+/F3.0 11 Tf
+<29> Tj
ET
0.000 0.000 0.000 SCN
@@ -14259,7 +14675,29 @@ ET
BT
246.24 768.3249999999999 Td
/F3.0 11 Tf
-<2e2e2e> Tj
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+251.74 768.3249999999999 Td
+/F3.0 11 Tf
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+257.24 768.3249999999999 Td
+/F3.0 11 Tf
+<2e> Tj
ET
0.000 0.000 0.000 SCN
@@ -14297,12 +14735,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
81.24000000000001 753.585 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<7075626c6963> Tj
ET
@@ -14319,12 +14757,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
BT
119.74000000000001 753.585 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<766f6964> Tj
ET
@@ -14446,7 +14884,29 @@ ET
BT
312.24 753.585 Td
/F3.0 11 Tf
-<2e2e2e> Tj
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+317.74 753.585 Td
+/F3.0 11 Tf
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+323.24 753.585 Td
+/F3.0 11 Tf
+<2e> Tj
ET
0.000 0.000 0.000 SCN
@@ -14484,12 +14944,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
81.24000000000001 724.105 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<7075626c6963> Tj
ET
@@ -14506,8 +14966,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
BT
119.74000000000001 724.105 Td
@@ -14594,8 +15054,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
BT
103.24000000000001 709.365 Td
@@ -14616,12 +15076,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.000 0.867 scn
-0.000 0.000 0.867 SCN
+1.000 0.400 0.000 scn
+1.000 0.400 0.000 SCN
BT
163.74 709.365 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<33> Tj
ET
@@ -14649,8 +15109,8 @@ 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
180.24 709.365 Td
@@ -14765,7 +15225,29 @@ ET
BT
103.24000000000001 679.885 Td
/F3.0 11 Tf
-<2e2e2e> Tj
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+108.74000000000001 679.885 Td
+/F3.0 11 Tf
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+114.24000000000001 679.885 Td
+/F3.0 11 Tf
+<2e> Tj
ET
0.000 0.000 0.000 SCN
@@ -14809,7 +15291,29 @@ ET
BT
81.24000000000001 650.405 Td
/F3.0 11 Tf
-<2e2e2e> Tj
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+86.74000000000001 650.405 Td
+/F3.0 11 Tf
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+92.24000000000001 650.405 Td
+/F3.0 11 Tf
+<2e> Tj
ET
0.000 0.000 0.000 SCN
@@ -15231,12 +15735,12 @@ f
h
S
Q
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
59.239999999999995 339.7450000000002 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<7075626c6963> Tj
ET
@@ -15253,8 +15757,8 @@ 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
97.74 339.7450000000002 Td
@@ -15325,7 +15829,18 @@ ET
BT
235.24 339.7450000000002 Td
/F3.0 11 Tf
-<2829> 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
+
+BT
+240.74 339.7450000000002 Td
+/F3.0 11 Tf
+<29> Tj
ET
0.000 0.000 0.000 SCN
@@ -15369,7 +15884,29 @@ ET
BT
262.74 339.7450000000002 Td
/F3.0 11 Tf
-<2e2e2e> Tj
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+268.24 339.7450000000002 Td
+/F3.0 11 Tf
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+273.74 339.7450000000002 Td
+/F3.0 11 Tf
+<2e> Tj
ET
0.000 0.000 0.000 SCN
@@ -15431,27 +15968,26 @@ Q
endstream
endobj
-156 0 obj
+155 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 155 0 R
+/Contents 154 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F7.0 141 0 R
-/F3.0 18 0 R
-/F3.1 142 0 R
+/Font << /F3.0 18 0 R
+/F3.1 141 0 R
/F1.0 8 0 R
/F2.0 16 0 R
/F4.0 19 0 R
/F6.0 44 0 R
>>
-/XObject << /Stamp1 1026 0 R
+/XObject << /Stamp1 1025 0 R
>>
>>
-/Annots [157 0 R 159 0 R 160 0 R 161 0 R]
+/Annots [156 0 R 158 0 R 159 0 R 160 0 R]
>>
endobj
-157 0 obj
+156 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -15462,10 +15998,10 @@ endobj
/Type /Annot
>>
endobj
-158 0 obj
-[156 0 R /XYZ 0 572.19 null]
+157 0 obj
+[155 0 R /XYZ 0 572.19 null]
endobj
-159 0 obj
+158 0 obj
<< /Border [0 0 0]
/Dest (_rgcms_methods_prefixes_autoComplete)
/Subtype /Link
@@ -15473,7 +16009,7 @@ endobj
/Type /Annot
>>
endobj
-160 0 obj
+159 0 obj
<< /Border [0 0 0]
/Dest (_rgcms_methods_prefixes_autoComplete)
/Subtype /Link
@@ -15481,7 +16017,7 @@ endobj
/Type /Annot
>>
endobj
-161 0 obj
+160 0 obj
<< /Border [0 0 0]
/Dest (_rgcms_methods_prefixes_autoComplete)
/Subtype /Link
@@ -15489,11 +16025,11 @@ endobj
/Type /Annot
>>
endobj
-162 0 obj
-[156 0 R /XYZ 0 420.2300000000002 null]
+161 0 obj
+[155 0 R /XYZ 0 420.2300000000002 null]
endobj
-163 0 obj
-<< /Length 28115
+162 0 obj
+<< /Length 30575
>>
stream
q
@@ -15527,13 +16063,13 @@ h
S
Q
/DeviceRGB cs
-0.000 0.533 0.000 scn
+0.000 0.400 0.600 scn
/DeviceRGB CS
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 SCN
BT
59.24 783.0649999999999 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<7075626c6963> Tj
ET
@@ -15550,12 +16086,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
BT
97.74000000000001 783.0649999999999 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<636c617373> Tj
ET
@@ -15572,12 +16108,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
BT
130.74 783.0649999999999 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<53686f7070696e67436172744974656d> Tj
ET
@@ -15616,8 +16152,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
BT
81.24000000000001 768.3249999999999 Td
@@ -15682,8 +16218,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
224.24 768.3249999999999 Td
@@ -15715,12 +16251,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
81.24000000000001 753.585 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<7075626c6963> Tj
ET
@@ -15776,7 +16312,18 @@ ET
BT
218.74 753.585 Td
/F3.0 11 Tf
-<2829> 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
+
+BT
+224.24 753.585 Td
+/F3.0 11 Tf
+<29> Tj
ET
0.000 0.000 0.000 SCN
@@ -15820,7 +16367,29 @@ ET
BT
246.24 753.585 Td
/F3.0 11 Tf
-<2e2e2e> Tj
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+251.74 753.585 Td
+/F3.0 11 Tf
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+257.24 753.585 Td
+/F3.0 11 Tf
+<2e> Tj
ET
0.000 0.000 0.000 SCN
@@ -15858,12 +16427,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
81.24000000000001 738.845 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<7075626c6963> Tj
ET
@@ -15880,12 +16449,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
BT
119.74000000000001 738.845 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<766f6964> Tj
ET
@@ -16007,7 +16576,29 @@ ET
BT
312.24 738.845 Td
/F3.0 11 Tf
-<2e2e2e> Tj
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+317.74 738.845 Td
+/F3.0 11 Tf
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+323.24 738.845 Td
+/F3.0 11 Tf
+<2e> Tj
ET
0.000 0.000 0.000 SCN
@@ -16045,8 +16636,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
BT
81.24000000000001 709.365 Td
@@ -16111,8 +16702,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
224.24 709.365 Td
@@ -16144,12 +16735,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
81.24000000000001 694.625 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<7075626c6963> Tj
ET
@@ -16166,12 +16757,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
BT
119.74000000000001 694.625 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<696e74> Tj
ET
@@ -16205,7 +16796,18 @@ ET
BT
202.24 694.625 Td
/F3.0 11 Tf
-<2829> 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
+
+BT
+207.74 694.625 Td
+/F3.0 11 Tf
+<29> Tj
ET
0.000 0.000 0.000 SCN
@@ -16249,7 +16851,29 @@ ET
BT
229.74 694.625 Td
/F3.0 11 Tf
-<2e2e2e> Tj
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+235.24 694.625 Td
+/F3.0 11 Tf
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+240.74 694.625 Td
+/F3.0 11 Tf
+<2e> Tj
ET
0.000 0.000 0.000 SCN
@@ -16287,12 +16911,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
81.24000000000001 679.885 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<7075626c6963> Tj
ET
@@ -16309,12 +16933,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
BT
119.74000000000001 679.885 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<766f6964> Tj
ET
@@ -16353,12 +16977,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
BT
213.24 679.885 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<696e74> Tj
ET
@@ -16436,7 +17060,29 @@ ET
BT
301.24 679.885 Td
/F3.0 11 Tf
-<2e2e2e> Tj
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+306.74 679.885 Td
+/F3.0 11 Tf
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+312.24 679.885 Td
+/F3.0 11 Tf
+<2e> Tj
ET
0.000 0.000 0.000 SCN
@@ -16474,8 +17120,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
BT
81.24000000000001 650.405 Td
@@ -16540,8 +17186,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
246.24 650.405 Td
@@ -16573,12 +17219,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
81.24000000000001 635.665 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<7075626c6963> Tj
ET
@@ -16705,8 +17351,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
BT
103.24000000000001 606.185 Td
@@ -16749,13 +17395,35 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
BT
229.74 606.185 Td
/F3.0 11 Tf
-<225175616e7469747922> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+235.24 606.185 Td
+/F3.0 11 Tf
+<5175616e74697479> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+279.24 606.185 Td
+/F3.0 11 Tf
+<22> Tj
ET
0.000 0.000 0.000 SCN
@@ -16782,12 +17450,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
103.24000000000001 591.4449999999999 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<66696e616c> Tj
ET
@@ -16804,8 +17472,8 @@ 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
136.24 591.4449999999999 Td
@@ -16920,7 +17588,18 @@ ET
BT
202.24 576.7049999999999 Td
/F3.0 11 Tf
-<293b> Tj
+<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
+207.74 576.7049999999999 Td
+/F3.0 11 Tf
+<3b> Tj
ET
0.000 0.000 0.000 SCN
@@ -16975,7 +17654,18 @@ ET
BT
213.24 561.9649999999999 Td
/F3.0 11 Tf
-<293b> Tj
+<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
+218.74 561.9649999999999 Td
+/F3.0 11 Tf
+<3b> Tj
ET
0.000 0.000 0.000 SCN
@@ -17013,12 +17703,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
81.24000000000001 532.4849999999999 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<7075626c6963> Tj
ET
@@ -17035,8 +17725,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
BT
119.74000000000001 532.4849999999999 Td
@@ -17057,8 +17747,8 @@ 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
180.24 532.4849999999999 Td
@@ -17107,7 +17797,18 @@ ET
BT
345.24 532.4849999999999 Td
/F3.0 11 Tf
-<2829> 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
+
+BT
+350.74 532.4849999999999 Td
+/F3.0 11 Tf
+<29> Tj
ET
0.000 0.000 0.000 SCN
@@ -17145,12 +17846,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
103.24000000000001 517.7449999999999 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<72657475726e> Tj
ET
@@ -17167,8 +17868,8 @@ 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
141.74 517.7449999999999 Td
@@ -17189,8 +17890,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
180.24 517.7449999999999 Td
@@ -17211,12 +17912,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.000 0.867 scn
-0.000 0.000 0.867 SCN
+1.000 0.400 0.000 scn
+1.000 0.400 0.000 SCN
BT
218.74 517.7449999999999 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<31> Tj
ET
@@ -17233,12 +17934,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.000 0.867 scn
-0.000 0.000 0.867 SCN
+1.000 0.400 0.000 scn
+1.000 0.400 0.000 SCN
BT
229.74 517.7449999999999 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<32> Tj
ET
@@ -17255,12 +17956,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.000 0.867 scn
-0.000 0.000 0.867 SCN
+1.000 0.400 0.000 scn
+1.000 0.400 0.000 SCN
BT
240.74 517.7449999999999 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<33> Tj
ET
@@ -17277,12 +17978,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.000 0.867 scn
-0.000 0.000 0.867 SCN
+1.000 0.400 0.000 scn
+1.000 0.400 0.000 SCN
BT
251.74 517.7449999999999 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<35> Tj
ET
@@ -17299,12 +18000,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.000 0.867 scn
-0.000 0.000 0.867 SCN
+1.000 0.400 0.000 scn
+1.000 0.400 0.000 SCN
BT
262.74 517.7449999999999 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<3130> Tj
ET
@@ -17321,12 +18022,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.000 0.867 scn
-0.000 0.000 0.867 SCN
+1.000 0.400 0.000 scn
+1.000 0.400 0.000 SCN
BT
279.24 517.7449999999999 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<3235> Tj
ET
@@ -17343,12 +18044,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.000 0.867 scn
-0.000 0.000 0.867 SCN
+1.000 0.400 0.000 scn
+1.000 0.400 0.000 SCN
BT
295.74 517.7449999999999 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<3530> Tj
ET
@@ -17365,12 +18066,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.000 0.867 scn
-0.000 0.000 0.867 SCN
+1.000 0.400 0.000 scn
+1.000 0.400 0.000 SCN
BT
312.24 517.7449999999999 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<313030> Tj
ET
@@ -17382,7 +18083,18 @@ ET
BT
328.74 517.7449999999999 Td
/F3.0 11 Tf
-<293b> Tj
+<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
+334.24 517.7449999999999 Td
+/F3.0 11 Tf
+<3b> Tj
ET
0.000 0.000 0.000 SCN
@@ -17426,7 +18138,29 @@ ET
BT
81.24000000000001 488.26499999999993 Td
/F3.0 11 Tf
-<2e2e2e> Tj
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+86.74000000000001 488.26499999999993 Td
+/F3.0 11 Tf
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+92.24000000000001 488.26499999999993 Td
+/F3.0 11 Tf
+<2e> Tj
ET
0.000 0.000 0.000 SCN
@@ -17559,27 +18293,26 @@ Q
endstream
endobj
-164 0 obj
+163 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 163 0 R
+/Contents 162 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F7.0 141 0 R
-/F3.0 18 0 R
+/Font << /F3.0 18 0 R
/F2.0 16 0 R
/F1.0 8 0 R
>>
-/XObject << /Stamp1 1026 0 R
+/XObject << /Stamp1 1025 0 R
>>
>>
-/Annots [166 0 R]
+/Annots [165 0 R]
>>
endobj
-165 0 obj
-[164 0 R /XYZ 0 447.6099999999999 null]
+164 0 obj
+[163 0 R /XYZ 0 447.6099999999999 null]
endobj
-166 0 obj
+165 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -17590,7 +18323,7 @@ endobj
/Type /Annot
>>
endobj
-167 0 obj
+166 0 obj
<< /Type /XObject
/Subtype /Image
/Height 803
@@ -17823,8 +18556,8 @@ U
\ufffd\ufffd\ufffd \ufffd\ufffd\ufffdm\ufffd\ufffd\ufffd?""""\ufffd\ufffd]\ufffd@DDDDDD\u052dt """""bI""""""\ufffd\ufffdt """""bI""""""\ufffd\ufffdt """""bI""""""\ufffd\ufffdt """""bI""""""\ufffd\ufffdt """""bI""""""\ufffd\ufffdt """""bI""""""\ufffd\ufffdt """""bI""""""\ufffd\ufffdt """""bI""""""\ufffd\ufffdr\ufffd \ufffd'\ufffd?\ufffd?|
endstream
endobj
-168 0 obj
-<< /Length 25706
+167 0 obj
+<< /Length 27012
>>
stream
q
@@ -17895,8 +18628,8 @@ f
h
S
Q
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
BT
59.24 408.66812447786134 Td
@@ -17983,8 +18716,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
279.24 408.66812447786134 Td
@@ -18005,12 +18738,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
59.24 393.92812447786133 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<7075626c6963> Tj
ET
@@ -18027,12 +18760,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
BT
97.74000000000001 393.92812447786133 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<636c617373> Tj
ET
@@ -18049,12 +18782,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
BT
130.74 393.92812447786133 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<55706461746543617465676f7279436f6e747269627574696f6e73> Tj
ET
@@ -18077,7 +18810,29 @@ ET
BT
284.74 393.92812447786133 Td
/F3.0 11 Tf
-<2e2e2e> Tj
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+290.24 393.92812447786133 Td
+/F3.0 11 Tf
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+295.74 393.92812447786133 Td
+/F3.0 11 Tf
+<2e> Tj
ET
0.000 0.000 0.000 SCN
@@ -18115,8 +18870,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
BT
81.24000000000001 379.1881244778613 Td
@@ -18192,13 +18947,35 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
BT
202.24 364.4481244778613 Td
/F3.0 11 Tf
-<225570646174652063617465676f727920616e642073756263617465676f727922> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+207.74 364.4481244778613 Td
+/F3.0 11 Tf
+<5570646174652063617465676f727920616e642073756263617465676f7279> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+378.24 364.4481244778613 Td
+/F3.0 11 Tf
+<22> Tj
ET
0.000 0.000 0.000 SCN
@@ -18236,8 +19013,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
BT
81.24000000000001 334.96812447786135 Td
@@ -18324,8 +19101,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
257.24 334.96812447786135 Td
@@ -18357,12 +19134,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
81.24000000000001 320.22812447786134 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<7075626c6963> Tj
ET
@@ -18434,12 +19211,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
125.24000000000001 305.48812447786133 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<66696e616c> Tj
ET
@@ -18533,12 +19310,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
125.24000000000001 290.7481244778613 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<66696e616c> Tj
ET
@@ -18610,8 +19387,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
BT
125.24000000000001 276.0081244778613 Td
@@ -18698,8 +19475,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
328.74 276.0081244778613 Td
@@ -18731,12 +19508,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
125.24000000000001 261.2681244778613 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<66696e616c> Tj
ET
@@ -18852,8 +19629,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
130.74 246.52812447786133 Td
@@ -18891,7 +19668,18 @@ ET
BT
240.74 246.52812447786133 Td
/F3.0 11 Tf
-<293b> Tj
+<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
+246.24 246.52812447786133 Td
+/F3.0 11 Tf
+<3b> Tj
ET
0.000 0.000 0.000 SCN
@@ -18929,8 +19717,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
130.74 231.78812447786132 Td
@@ -18968,7 +19756,18 @@ ET
BT
273.74 231.78812447786132 Td
/F3.0 11 Tf
-<293b> Tj
+<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
+279.24 231.78812447786132 Td
+/F3.0 11 Tf
+<3b> Tj
ET
0.000 0.000 0.000 SCN
@@ -18984,12 +19783,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
103.24000000000001 217.0481244778613 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<72657475726e> Tj
ET
@@ -19061,12 +19860,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
81.24000000000001 187.5681244778613 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<7075626c6963> Tj
ET
@@ -19083,8 +19882,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
BT
119.74000000000001 187.5681244778613 Td
@@ -19193,12 +19992,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
125.24000000000001 172.82812447786128 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<66696e616c> Tj
ET
@@ -19292,12 +20091,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
125.24000000000001 158.0881244778613 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<66696e616c> Tj
ET
@@ -19413,12 +20212,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
103.24000000000001 143.3481244778613 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<72657475726e> Tj
ET
@@ -19457,8 +20256,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
207.74 143.3481244778613 Td
@@ -19496,7 +20295,18 @@ ET
BT
295.74 143.3481244778613 Td
/F3.0 11 Tf
-<293b> Tj
+<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
+301.24 143.3481244778613 Td
+/F3.0 11 Tf
+<3b> Tj
ET
0.000 0.000 0.000 SCN
@@ -19540,7 +20350,29 @@ ET
BT
81.24000000000001 113.86812447786127 Td
/F3.0 11 Tf
-<2e2e2e> Tj
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+86.74000000000001 113.86812447786127 Td
+/F3.0 11 Tf
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+92.24000000000001 113.86812447786127 Td
+/F3.0 11 Tf
+<2e> Tj
ET
0.000 0.000 0.000 SCN
@@ -19624,25 +20456,24 @@ Q
endstream
endobj
-169 0 obj
+168 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 168 0 R
+/Contents 167 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/XObject << /I1 167 0 R
-/Stamp1 1026 0 R
+/XObject << /I1 166 0 R
+/Stamp1 1025 0 R
>>
/Font << /F1.0 8 0 R
/F3.0 18 0 R
-/F7.0 141 0 R
-/F3.1 142 0 R
+/F3.1 141 0 R
>>
>>
-/Annots [170 0 R 171 0 R]
+/Annots [169 0 R 170 0 R]
>>
endobj
-170 0 obj
+169 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -19653,7 +20484,7 @@ endobj
/Type /Annot
>>
endobj
-171 0 obj
+170 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -19664,8 +20495,8 @@ endobj
/Type /Annot
>>
endobj
-172 0 obj
-<< /Length 32776
+171 0 obj
+<< /Length 35617
>>
stream
q
@@ -19834,12 +20665,12 @@ f
h
S
Q
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
59.239999999999995 668.1650000000001 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<7075626c6963> Tj
ET
@@ -19856,12 +20687,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
BT
97.74 668.1650000000001 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<636c617373> Tj
ET
@@ -19878,12 +20709,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
BT
130.74 668.1650000000001 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<53686f7070696e67436172744974656d> Tj
ET
@@ -19928,7 +20759,29 @@ ET
BT
81.24 653.4250000000001 Td
/F3.0 11 Tf
-<2e2e2e> Tj
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+86.74 653.4250000000001 Td
+/F3.0 11 Tf
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+92.24 653.4250000000001 Td
+/F3.0 11 Tf
+<2e> Tj
ET
0.000 0.000 0.000 SCN
@@ -19944,8 +20797,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
BT
81.24 638.6850000000002 Td
@@ -20010,8 +20863,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
246.24 638.6850000000002 Td
@@ -20043,12 +20896,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
81.24 623.9450000000002 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<7075626c6963> Tj
ET
@@ -20175,8 +21028,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
BT
103.24 594.4650000000001 Td
@@ -20219,13 +21072,35 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
BT
229.74 594.4650000000001 Td
/F3.0 11 Tf
-<225175616e7469747922> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+235.24 594.4650000000001 Td
+/F3.0 11 Tf
+<5175616e74697479> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+279.24 594.4650000000001 Td
+/F3.0 11 Tf
+<22> Tj
ET
0.000 0.000 0.000 SCN
@@ -20252,12 +21127,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
103.24 579.7250000000001 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<66696e616c> Tj
ET
@@ -20274,8 +21149,8 @@ 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
136.24 579.7250000000001 Td
@@ -20390,7 +21265,18 @@ ET
BT
202.24 564.9850000000001 Td
/F3.0 11 Tf
-<293b> Tj
+<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
+207.74 564.9850000000001 Td
+/F3.0 11 Tf
+<3b> Tj
ET
0.000 0.000 0.000 SCN
@@ -20445,7 +21331,18 @@ ET
BT
213.24 550.2450000000001 Td
/F3.0 11 Tf
-<293b> Tj
+<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
+218.74 550.2450000000001 Td
+/F3.0 11 Tf
+<3b> Tj
ET
0.000 0.000 0.000 SCN
@@ -20483,12 +21380,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
81.24 520.7650000000001 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<7075626c6963> Tj
ET
@@ -20505,8 +21402,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
BT
119.74 520.7650000000001 Td
@@ -20527,8 +21424,8 @@ 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
180.24 520.7650000000001 Td
@@ -20659,12 +21556,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
103.24 506.0250000000001 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<72657475726e> Tj
ET
@@ -20703,8 +21600,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
224.24 506.0250000000001 Td
@@ -20742,7 +21639,18 @@ ET
BT
367.24 506.0250000000001 Td
/F3.0 11 Tf
-<293b> Tj
+<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
+372.74 506.0250000000001 Td
+/F3.0 11 Tf
+<3b> Tj
ET
0.000 0.000 0.000 SCN
@@ -20808,7 +21716,29 @@ ET
BT
81.24 476.5450000000001 Td
/F3.0 11 Tf
-<2e2e2e> Tj
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+86.74 476.5450000000001 Td
+/F3.0 11 Tf
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+92.24 476.5450000000001 Td
+/F3.0 11 Tf
+<2e> Tj
ET
0.000 0.000 0.000 SCN
@@ -20947,12 +21877,12 @@ f
h
S
Q
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
59.239999999999995 317.8450000000001 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<7075626c6963> Tj
ET
@@ -20969,8 +21899,8 @@ 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
97.74 317.8450000000001 Td
@@ -21041,7 +21971,18 @@ ET
BT
229.74 317.8450000000001 Td
/F3.0 11 Tf
-<2829> 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
+
+BT
+235.24 317.8450000000001 Td
+/F3.0 11 Tf
+<29> Tj
ET
0.000 0.000 0.000 SCN
@@ -21085,7 +22026,29 @@ ET
BT
257.24 317.8450000000001 Td
/F3.0 11 Tf
-<2e2e2e> Tj
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+262.74 317.8450000000001 Td
+/F3.0 11 Tf
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+268.24 317.8450000000001 Td
+/F3.0 11 Tf
+<2e> Tj
ET
0.000 0.000 0.000 SCN
@@ -21150,12 +22113,12 @@ f
h
S
Q
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
59.239999999999995 241.32500000000007 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<7075626c6963> Tj
ET
@@ -21172,12 +22135,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
BT
97.74 241.32500000000007 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<636c617373> Tj
ET
@@ -21194,12 +22157,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
BT
130.74 241.32500000000007 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<53686f7070696e67436172744974656d> Tj
ET
@@ -21238,12 +22201,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
81.24 226.5850000000001 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<7075626c6963> Tj
ET
@@ -21299,7 +22262,18 @@ ET
BT
218.74 226.5850000000001 Td
/F3.0 11 Tf
-<2829> 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
+
+BT
+224.24 226.5850000000001 Td
+/F3.0 11 Tf
+<29> Tj
ET
0.000 0.000 0.000 SCN
@@ -21343,7 +22317,29 @@ ET
BT
246.24 226.5850000000001 Td
/F3.0 11 Tf
-<2e2e2e> Tj
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+251.74 226.5850000000001 Td
+/F3.0 11 Tf
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+257.24 226.5850000000001 Td
+/F3.0 11 Tf
+<2e> Tj
ET
0.000 0.000 0.000 SCN
@@ -21381,12 +22377,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
81.24 211.84500000000008 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<7075626c6963> Tj
ET
@@ -21403,12 +22399,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
BT
119.74 211.84500000000008 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<766f6964> Tj
ET
@@ -21530,7 +22526,29 @@ ET
BT
312.24 211.84500000000008 Td
/F3.0 11 Tf
-<2e2e2e> Tj
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+317.74 211.84500000000008 Td
+/F3.0 11 Tf
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+323.24 211.84500000000008 Td
+/F3.0 11 Tf
+<2e> Tj
ET
0.000 0.000 0.000 SCN
@@ -21568,12 +22586,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
81.24 182.36500000000007 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<7075626c6963> Tj
ET
@@ -21590,8 +22608,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
BT
119.74 182.36500000000007 Td
@@ -21662,7 +22680,18 @@ ET
BT
306.74 182.36500000000007 Td
/F3.0 11 Tf
-<2829> 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
+
+BT
+312.24 182.36500000000007 Td
+/F3.0 11 Tf
+<29> Tj
ET
0.000 0.000 0.000 SCN
@@ -21706,7 +22735,29 @@ ET
BT
103.24 167.62500000000009 Td
/F3.0 11 Tf
-<2e2e2e> Tj
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+108.74 167.62500000000009 Td
+/F3.0 11 Tf
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+114.24 167.62500000000009 Td
+/F3.0 11 Tf
+<2e> Tj
ET
0.000 0.000 0.000 SCN
@@ -21925,44 +22976,43 @@ Q
endstream
endobj
-173 0 obj
+172 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 172 0 R
+/Contents 171 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F3.1 142 0 R
+/Font << /F3.1 141 0 R
/F1.0 8 0 R
/F3.0 18 0 R
-/F7.0 141 0 R
/F2.0 16 0 R
/F4.0 19 0 R
-/F1.1 176 0 R
+/F1.1 175 0 R
>>
-/XObject << /Stamp1 1026 0 R
+/XObject << /Stamp1 1025 0 R
>>
>>
>>
endobj
+173 0 obj
+[172 0 R /XYZ 0 398.3300000000001 null]
+endobj
174 0 obj
-[173 0 R /XYZ 0 398.3300000000001 null]
+[172 0 R /XYZ 0 126.97000000000008 null]
endobj
175 0 obj
-[173 0 R /XYZ 0 126.97000000000008 null]
-endobj
-176 0 obj
<< /Type /Font
-/BaseFont /AAAABQ+NotoSerif
+/BaseFont /AAAABL+NotoSerif
/Subtype /TrueType
-/FontDescriptor 1090 0 R
+/FontDescriptor 1085 0 R
/FirstChar 32
/LastChar 255
-/Widths 1092 0 R
-/ToUnicode 1091 0 R
+/Widths 1087 0 R
+/ToUnicode 1086 0 R
>>
endobj
-177 0 obj
-<< /Length 26069
+176 0 obj
+<< /Length 28113
>>
stream
q
@@ -22006,12 +23056,12 @@ f
h
S
Q
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
59.24 756.035 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<7075626c6963> Tj
ET
@@ -22028,12 +23078,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
BT
97.74000000000001 756.035 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<636c617373> Tj
ET
@@ -22050,12 +23100,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
BT
130.74 756.035 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<4c6962726172794d656d626572> Tj
ET
@@ -22094,12 +23144,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
81.24000000000001 741.295 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<7075626c6963> Tj
ET
@@ -22155,7 +23205,18 @@ ET
BT
240.74 741.295 Td
/F3.0 11 Tf
-<2829> 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
+
+BT
+246.24 741.295 Td
+/F3.0 11 Tf
+<29> Tj
ET
0.000 0.000 0.000 SCN
@@ -22199,7 +23260,29 @@ ET
BT
268.24 741.295 Td
/F3.0 11 Tf
-<2e2e2e> Tj
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+273.74 741.295 Td
+/F3.0 11 Tf
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+279.24 741.295 Td
+/F3.0 11 Tf
+<2e> Tj
ET
0.000 0.000 0.000 SCN
@@ -22237,12 +23320,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
81.24000000000001 726.5550000000001 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<7075626c6963> Tj
ET
@@ -22259,12 +23342,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
BT
119.74000000000001 726.5550000000001 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<766f6964> Tj
ET
@@ -22386,7 +23469,29 @@ ET
BT
323.24 726.5550000000001 Td
/F3.0 11 Tf
-<2e2e2e> Tj
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+328.74 726.5550000000001 Td
+/F3.0 11 Tf
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+334.24 726.5550000000001 Td
+/F3.0 11 Tf
+<2e> Tj
ET
0.000 0.000 0.000 SCN
@@ -22424,12 +23529,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
81.24000000000001 711.815 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<7075626c6963> Tj
ET
@@ -22446,12 +23551,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
BT
119.74000000000001 711.815 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<766f6964> Tj
ET
@@ -22573,7 +23678,29 @@ ET
BT
339.74 711.815 Td
/F3.0 11 Tf
-<2e2e2e> Tj
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+345.24 711.815 Td
+/F3.0 11 Tf
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+350.74 711.815 Td
+/F3.0 11 Tf
+<2e> Tj
ET
0.000 0.000 0.000 SCN
@@ -22611,12 +23738,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
81.24000000000001 697.075 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<7075626c6963> Tj
ET
@@ -22633,12 +23760,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
BT
119.74000000000001 697.075 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<766f6964> Tj
ET
@@ -22672,7 +23799,18 @@ ET
BT
246.24 697.075 Td
/F3.0 11 Tf
-<2829> 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
+
+BT
+251.74 697.075 Td
+/F3.0 11 Tf
+<29> Tj
ET
0.000 0.000 0.000 SCN
@@ -22710,12 +23848,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
103.24000000000001 682.335 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<6966> Tj
ET
@@ -22749,7 +23887,18 @@ ET
BT
163.74 682.335 Td
/F3.0 11 Tf
-<2829> 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
+
+BT
+169.24 682.335 Td
+/F3.0 11 Tf
+<29> Tj
ET
0.000 0.000 0.000 SCN
@@ -22787,12 +23936,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
196.74 682.335 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<6e756c6c> Tj
ET
@@ -22842,12 +23991,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
240.74 682.335 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<72657475726e> Tj
ET
@@ -22919,12 +24068,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
196.74 667.595 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<6e756c6c> Tj
ET
@@ -22936,7 +24085,18 @@ ET
BT
218.74 667.595 Td
/F3.0 11 Tf
-<293b> Tj
+<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
+224.24 667.595 Td
+/F3.0 11 Tf
+<3b> Tj
ET
0.000 0.000 0.000 SCN
@@ -22996,8 +24156,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
224.24 652.855 Td
@@ -23035,7 +24195,18 @@ ET
BT
306.74 652.855 Td
/F3.0 11 Tf
-<293b> Tj
+<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
+312.24 652.855 Td
+/F3.0 11 Tf
+<3b> Tj
ET
0.000 0.000 0.000 SCN
@@ -23101,7 +24272,29 @@ ET
BT
81.24000000000001 623.375 Td
/F3.0 11 Tf
-<2e2e2e> Tj
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+86.74000000000001 623.375 Td
+/F3.0 11 Tf
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+92.24000000000001 623.375 Td
+/F3.0 11 Tf
+<2e> Tj
ET
0.000 0.000 0.000 SCN
@@ -23612,12 +24805,12 @@ f
h
S
Q
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
59.239999999999995 235.37500000000003 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<7075626c6963> Tj
ET
@@ -23656,12 +24849,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.400 0.733 scn
-0.000 0.400 0.733 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
108.74 235.37500000000003 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<64656661756c744e587878> Tj
ET
@@ -23728,7 +24921,29 @@ ET
BT
196.74 235.37500000000003 Td
/F3.0 11 Tf
-<2e2e2e> Tj
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+202.24 235.37500000000003 Td
+/F3.0 11 Tf
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+207.74 235.37500000000003 Td
+/F3.0 11 Tf
+<2e> Tj
ET
0.000 0.000 0.000 SCN
@@ -23790,28 +25005,27 @@ Q
endstream
endobj
-178 0 obj
+177 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 177 0 R
+/Contents 176 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/Font << /F1.0 8 0 R
-/F7.0 141 0 R
/F3.0 18 0 R
-/F3.1 142 0 R
+/F3.1 141 0 R
/F4.0 19 0 R
/F2.0 16 0 R
-/F1.1 176 0 R
+/F1.1 175 0 R
/F6.0 44 0 R
>>
-/XObject << /Stamp1 1026 0 R
+/XObject << /Stamp1 1025 0 R
>>
>>
-/Annots [179 0 R 180 0 R 181 0 R 183 0 R 184 0 R 185 0 R]
+/Annots [178 0 R 179 0 R 180 0 R 182 0 R 183 0 R 184 0 R]
>>
endobj
-179 0 obj
+178 0 obj
<< /Border [0 0 0]
/Dest (_rgcms_methods_prefixes_modify)
/Subtype /Link
@@ -23819,7 +25033,7 @@ endobj
/Type /Annot
>>
endobj
-180 0 obj
+179 0 obj
<< /Border [0 0 0]
/Dest (_rgcms_methods_prefixes_modify)
/Subtype /Link
@@ -23827,7 +25041,7 @@ endobj
/Type /Annot
>>
endobj
-181 0 obj
+180 0 obj
<< /Border [0 0 0]
/Dest (_rgcms_methods_prefixes_modify)
/Subtype /Link
@@ -23835,10 +25049,10 @@ endobj
/Type /Annot
>>
endobj
-182 0 obj
-[178 0 R /XYZ 0 511.3800000000001 null]
+181 0 obj
+[177 0 R /XYZ 0 511.3800000000001 null]
endobj
-183 0 obj
+182 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -23849,7 +25063,7 @@ endobj
/Type /Annot
>>
endobj
-184 0 obj
+183 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -23860,7 +25074,7 @@ endobj
/Type /Annot
>>
endobj
-185 0 obj
+184 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -23871,11 +25085,11 @@ endobj
/Type /Annot
>>
endobj
-186 0 obj
-[178 0 R /XYZ 0 315.86000000000007 null]
+185 0 obj
+[177 0 R /XYZ 0 315.86000000000007 null]
endobj
-187 0 obj
-<< /Length 29283
+186 0 obj
+<< /Length 32310
>>
stream
q
@@ -23909,13 +25123,13 @@ h
S
Q
/DeviceRGB cs
-0.000 0.533 0.000 scn
+0.000 0.400 0.600 scn
/DeviceRGB CS
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 SCN
BT
59.24 783.0649999999999 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<7075626c6963> Tj
ET
@@ -23932,12 +25146,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
BT
97.74000000000001 783.0649999999999 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<636c617373> Tj
ET
@@ -23954,12 +25168,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
BT
130.74 783.0649999999999 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<53686f7070696e67436172744974656d> Tj
ET
@@ -23998,8 +25212,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
BT
81.24000000000001 768.3249999999999 Td
@@ -24064,8 +25278,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
224.24 768.3249999999999 Td
@@ -24097,12 +25311,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
81.24000000000001 753.585 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<7075626c6963> Tj
ET
@@ -24158,7 +25372,18 @@ ET
BT
218.74 753.585 Td
/F3.0 11 Tf
-<2829> 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
+
+BT
+224.24 753.585 Td
+/F3.0 11 Tf
+<29> Tj
ET
0.000 0.000 0.000 SCN
@@ -24202,7 +25427,29 @@ ET
BT
246.24 753.585 Td
/F3.0 11 Tf
-<2e2e2e> Tj
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+251.74 753.585 Td
+/F3.0 11 Tf
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+257.24 753.585 Td
+/F3.0 11 Tf
+<2e> Tj
ET
0.000 0.000 0.000 SCN
@@ -24240,12 +25487,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
81.24000000000001 738.845 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<7075626c6963> Tj
ET
@@ -24262,12 +25509,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
BT
119.74000000000001 738.845 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<766f6964> Tj
ET
@@ -24389,7 +25636,29 @@ ET
BT
312.24 738.845 Td
/F3.0 11 Tf
-<2e2e2e> Tj
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+317.74 738.845 Td
+/F3.0 11 Tf
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+323.24 738.845 Td
+/F3.0 11 Tf
+<2e> Tj
ET
0.000 0.000 0.000 SCN
@@ -24427,8 +25696,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
BT
81.24000000000001 709.365 Td
@@ -24493,8 +25762,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
224.24 709.365 Td
@@ -24526,12 +25795,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
81.24000000000001 694.625 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<7075626c6963> Tj
ET
@@ -24548,12 +25817,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
BT
119.74000000000001 694.625 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<696e74> Tj
ET
@@ -24587,7 +25856,18 @@ ET
BT
202.24 694.625 Td
/F3.0 11 Tf
-<2829> 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
+
+BT
+207.74 694.625 Td
+/F3.0 11 Tf
+<29> Tj
ET
0.000 0.000 0.000 SCN
@@ -24631,7 +25911,29 @@ ET
BT
229.74 694.625 Td
/F3.0 11 Tf
-<2e2e2e> Tj
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+235.24 694.625 Td
+/F3.0 11 Tf
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+240.74 694.625 Td
+/F3.0 11 Tf
+<2e> Tj
ET
0.000 0.000 0.000 SCN
@@ -24669,12 +25971,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
81.24000000000001 679.885 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<7075626c6963> Tj
ET
@@ -24691,12 +25993,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
BT
119.74000000000001 679.885 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<766f6964> Tj
ET
@@ -24735,12 +26037,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
BT
213.24 679.885 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<696e74> Tj
ET
@@ -24818,7 +26120,29 @@ ET
BT
301.24 679.885 Td
/F3.0 11 Tf
-<2e2e2e> Tj
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+306.74 679.885 Td
+/F3.0 11 Tf
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+312.24 679.885 Td
+/F3.0 11 Tf
+<2e> Tj
ET
0.000 0.000 0.000 SCN
@@ -24856,8 +26180,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
BT
81.24000000000001 650.405 Td
@@ -24922,8 +26246,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
246.24 650.405 Td
@@ -24955,12 +26279,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
81.24000000000001 635.665 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<7075626c6963> Tj
ET
@@ -25087,8 +26411,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
BT
103.24000000000001 606.185 Td
@@ -25131,13 +26455,35 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
BT
229.74 606.185 Td
/F3.0 11 Tf
-<225175616e7469747922> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+235.24 606.185 Td
+/F3.0 11 Tf
+<5175616e74697479> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+279.24 606.185 Td
+/F3.0 11 Tf
+<22> Tj
ET
0.000 0.000 0.000 SCN
@@ -25164,12 +26510,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
103.24000000000001 591.4449999999999 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
<66696e616c> Tj
ET
@@ -25186,8 +26532,8 @@ 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
136.24 591.4449999999999 Td
@@ -25302,7 +26648,18 @@ ET
BT
202.24 576.7049999999999 Td
/F3.0 11 Tf
-<293b> Tj
+<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
+207.74 576.7049999999999 Td
+/F3.0 11 Tf
+<3b> Tj
ET
0.000 0.000 0.000 SCN
@@ -2
<TRUNCATED>
[10/44] isis-site git commit: ISIS-1594: provide an 'edit' button
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/83a3755a/content/guides/ugvw.pdf
----------------------------------------------------------------------
diff --git a/content/guides/ugvw.pdf b/content/guides/ugvw.pdf
index 9363c66..451a0cc 100644
--- a/content/guides/ugvw.pdf
+++ b/content/guides/ugvw.pdf
@@ -4,16 +4,16 @@
<< /Title (Wicket Viewer)
/Creator (Asciidoctor PDF 1.5.0.alpha.11, based on Prawn 1.3.0)
/Producer (Asciidoctor PDF 1.5.0.alpha.11, based on Prawn 1.3.0)
-/CreationDate (D:20170219155414+00'00')
-/ModDate (D:20170219155414+00'00')
+/CreationDate (D:20170307234603+00'00')
+/ModDate (D:20170307234603+00'00')
>>
endobj
2 0 obj
<< /Type /Catalog
/Pages 3 0 R
/Names 16 0 R
-/Outlines 529 0 R
-/PageLabels 574 0 R
+/Outlines 528 0 R
+/PageLabels 573 0 R
/PageMode /UseOutlines
/OpenAction [7 0 R /FitH 842.89]
/ViewerPreferences << /DisplayDocTitle true
@@ -23,7 +23,7 @@ endobj
3 0 obj
<< /Type /Pages
/Count 59
-/Kids [7 0 R 10 0 R 12 0 R 14 0 R 38 0 R 50 0 R 63 0 R 72 0 R 80 0 R 89 0 R 95 0 R 101 0 R 111 0 R 113 0 R 128 0 R 135 0 R 143 0 R 150 0 R 153 0 R 164 0 R 170 0 R 176 0 R 186 0 R 196 0 R 205 0 R 213 0 R 220 0 R 226 0 R 234 0 R 244 0 R 250 0 R 261 0 R 266 0 R 270 0 R 278 0 R 282 0 R 297 0 R 300 0 R 309 0 R 313 0 R 321 0 R 329 0 R 336 0 R 338 0 R 345 0 R 349 0 R 355 0 R 358 0 R 362 0 R 366 0 R 373 0 R 376 0 R 393 0 R 406 0 R 409 0 R 417 0 R 425 0 R 429 0 R 434 0 R]
+/Kids [7 0 R 10 0 R 12 0 R 14 0 R 38 0 R 50 0 R 63 0 R 71 0 R 79 0 R 88 0 R 94 0 R 100 0 R 110 0 R 112 0 R 127 0 R 134 0 R 142 0 R 149 0 R 152 0 R 163 0 R 169 0 R 175 0 R 185 0 R 195 0 R 204 0 R 212 0 R 219 0 R 225 0 R 233 0 R 243 0 R 249 0 R 260 0 R 265 0 R 269 0 R 277 0 R 281 0 R 296 0 R 299 0 R 308 0 R 312 0 R 320 0 R 328 0 R 335 0 R 337 0 R 344 0 R 348 0 R 354 0 R 357 0 R 361 0 R 365 0 R 372 0 R 375 0 R 392 0 R 405 0 R 408 0 R 416 0 R 424 0 R 428 0 R 433 0 R]
>>
endobj
4 0 obj
@@ -78,13 +78,13 @@ endobj
endobj
8 0 obj
<< /Type /Font
-/BaseFont /AAAAEZ+NotoSerif
+/BaseFont /AAAAEK+NotoSerif
/Subtype /TrueType
-/FontDescriptor 576 0 R
+/FontDescriptor 575 0 R
/FirstChar 32
/LastChar 255
-/Widths 578 0 R
-/ToUnicode 577 0 R
+/Widths 577 0 R
+/ToUnicode 576 0 R
>>
endobj
9 0 obj
@@ -1651,7 +1651,7 @@ endobj
/F4.0 53 0 R
>>
>>
-/Annots [443 0 R 444 0 R 445 0 R 446 0 R 447 0 R 448 0 R 449 0 R 450 0 R 451 0 R 452 0 R 453 0 R 454 0 R 455 0 R 456 0 R 457 0 R 458 0 R 459 0 R 460 0 R 461 0 R 462 0 R 463 0 R 464 0 R 465 0 R 466 0 R 467 0 R 468 0 R 469 0 R 470 0 R 471 0 R 472 0 R 473 0 R 474 0 R 475 0 R 476 0 R 477 0 R 478 0 R 479 0 R 480 0 R 481 0 R 482 0 R 483 0 R 484 0 R 485 0 R 486 0 R 487 0 R 488 0 R 489 0 R 490 0 R 491 0 R 492 0 R 493 0 R 494 0 R 495 0 R 496 0 R 497 0 R 498 0 R 499 0 R 500 0 R 501 0 R 502 0 R 503 0 R 504 0 R 505 0 R 506 0 R 507 0 R 508 0 R 509 0 R 510 0 R 511 0 R 512 0 R 513 0 R 514 0 R 515 0 R 516 0 R 517 0 R 518 0 R 519 0 R]
+/Annots [442 0 R 443 0 R 444 0 R 445 0 R 446 0 R 447 0 R 448 0 R 449 0 R 450 0 R 451 0 R 452 0 R 453 0 R 454 0 R 455 0 R 456 0 R 457 0 R 458 0 R 459 0 R 460 0 R 461 0 R 462 0 R 463 0 R 464 0 R 465 0 R 466 0 R 467 0 R 468 0 R 469 0 R 470 0 R 471 0 R 472 0 R 473 0 R 474 0 R 475 0 R 476 0 R 477 0 R 478 0 R 479 0 R 480 0 R 481 0 R 482 0 R 483 0 R 484 0 R 485 0 R 486 0 R 487 0 R 488 0 R 489 0 R 490 0 R 491 0 R 492 0 R 493 0 R 494 0 R 495 0 R 496 0 R 497 0 R 498 0 R 499 0 R 500 0 R 501 0 R 502 0 R 503 0 R 504 0 R 505 0 R 506 0 R 507 0 R 508 0 R 509 0 R 510 0 R 511 0 R 512 0 R 513 0 R 514 0 R 515 0 R 516 0 R 517 0 R 518 0 R]
>>
endobj
11 0 obj
@@ -1834,7 +1834,7 @@ endobj
/Font << /F1.0 8 0 R
>>
>>
-/Annots [520 0 R 521 0 R 522 0 R 523 0 R 524 0 R 525 0 R 526 0 R 527 0 R]
+/Annots [519 0 R 520 0 R 521 0 R 522 0 R 523 0 R 524 0 R 525 0 R 526 0 R]
>>
endobj
13 0 obj
@@ -2477,7 +2477,7 @@ endobj
/Font << /F2.0 18 0 R
/F1.0 8 0 R
>>
-/XObject << /Stamp1 528 0 R
+/XObject << /Stamp1 527 0 R
>>
>>
/Annots [19 0 R 20 0 R 22 0 R 23 0 R 24 0 R 25 0 R 26 0 R 27 0 R 28 0 R 29 0 R 30 0 R 31 0 R 32 0 R 33 0 R 34 0 R 35 0 R 36 0 R]
@@ -2492,18 +2492,18 @@ endobj
>>
endobj
17 0 obj
-<< /Kids [104 0 R 353 0 R 427 0 R 228 0 R 419 0 R 105 0 R 441 0 R 238 0 R]
+<< /Kids [103 0 R 352 0 R 426 0 R 227 0 R 418 0 R 104 0 R 440 0 R 237 0 R]
>>
endobj
18 0 obj
<< /Type /Font
-/BaseFont /AAAAFA+NotoSerif-Bold
+/BaseFont /AAAAEL+NotoSerif-Bold
/Subtype /TrueType
-/FontDescriptor 580 0 R
+/FontDescriptor 579 0 R
/FirstChar 32
/LastChar 255
-/Widths 582 0 R
-/ToUnicode 581 0 R
+/Widths 581 0 R
+/ToUnicode 580 0 R
>>
endobj
19 0 obj
@@ -3033,7 +3033,7 @@ endobj
/F3.1 45 0 R
>>
/XObject << /I1 43 0 R
-/Stamp1 528 0 R
+/Stamp1 527 0 R
>>
>>
/Annots [42 0 R 44 0 R 46 0 R]
@@ -3557,13 +3557,13 @@ endobj
endobj
45 0 obj
<< /Type /Font
-/BaseFont /AAAAFB+FontAwesome
+/BaseFont /AAAAEM+FontAwesome
/Subtype /TrueType
-/FontDescriptor 584 0 R
+/FontDescriptor 583 0 R
/FirstChar 32
/LastChar 255
-/Widths 586 0 R
-/ToUnicode 585 0 R
+/Widths 585 0 R
+/ToUnicode 584 0 R
>>
endobj
46 0 obj
@@ -3985,7 +3985,7 @@ endobj
/F5.0 54 0 R
>>
/XObject << /I2 60 0 R
-/Stamp1 528 0 R
+/Stamp1 527 0 R
>>
>>
/Annots [52 0 R 57 0 R 59 0 R 61 0 R]
@@ -4004,24 +4004,24 @@ endobj
endobj
53 0 obj
<< /Type /Font
-/BaseFont /AAAAFC+mplus1mn-regular
+/BaseFont /AAAAEN+mplus1mn-regular
/Subtype /TrueType
-/FontDescriptor 588 0 R
+/FontDescriptor 587 0 R
/FirstChar 32
/LastChar 255
-/Widths 590 0 R
-/ToUnicode 589 0 R
+/Widths 589 0 R
+/ToUnicode 588 0 R
>>
endobj
54 0 obj
<< /Type /Font
-/BaseFont /AAAAFD+mplus-1p-regular
+/BaseFont /AAAAEO+mplus-1p-regular
/Subtype /TrueType
-/FontDescriptor 592 0 R
+/FontDescriptor 591 0 R
/FirstChar 32
/LastChar 255
-/Widths 594 0 R
-/ToUnicode 593 0 R
+/Widths 593 0 R
+/ToUnicode 592 0 R
>>
endobj
55 0 obj
@@ -4508,7 +4508,7 @@ endobj
>>
endobj
62 0 obj
-<< /Length 11466
+<< /Length 11752
>>
stream
q
@@ -4985,8 +4985,8 @@ f
h
S
Q
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
BT
59.24000000000001 236.73096434359812 Td
@@ -5062,8 +5062,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
229.74 221.99096434359814 Td
@@ -5084,12 +5084,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
59.24000000000001 192.51096434359812 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<7075626c6963> Tj
ET
@@ -5106,12 +5106,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
BT
97.74000000000001 192.51096434359812 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<636c617373> Tj
ET
@@ -5128,12 +5128,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
BT
130.74 192.51096434359812 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<4c65617365> Tj
ET
@@ -5178,7 +5178,29 @@ ET
BT
174.74 192.51096434359812 Td
/F4.0 11 Tf
-<2e2e2e> Tj
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+180.24 192.51096434359812 Td
+/F4.0 11 Tf
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+185.74 192.51096434359812 Td
+/F4.0 11 Tf
+<2e> Tj
ET
0.000 0.000 0.000 SCN
@@ -5265,10 +5287,9 @@ endobj
/F1.0 8 0 R
/F4.0 53 0 R
/F2.0 18 0 R
-/F6.0 70 0 R
>>
/XObject << /I3 66 0 R
-/Stamp1 528 0 R
+/Stamp1 527 0 R
>>
>>
/Annots [64 0 R 65 0 R 67 0 R 69 0 R]
@@ -5707,18 +5728,7 @@ endobj
>>
endobj
70 0 obj
-<< /Type /Font
-/BaseFont /AAAAFE+mplus1mn-bold
-/Subtype /TrueType
-/FontDescriptor 596 0 R
-/FirstChar 32
-/LastChar 255
-/Widths 598 0 R
-/ToUnicode 597 0 R
->>
-endobj
-71 0 obj
-<< /Length 20176
+<< /Length 21122
>>
stream
q
@@ -5752,9 +5762,9 @@ h
S
Q
/DeviceRGB cs
-0.333 0.333 0.333 scn
+0.600 0.600 1.000 scn
/DeviceRGB CS
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 SCN
BT
59.24 783.0649999999999 Td
@@ -5830,8 +5840,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
229.74 768.3249999999999 Td
@@ -5852,12 +5862,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
59.24 738.845 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<7075626c6963> Tj
ET
@@ -5874,12 +5884,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
BT
97.74000000000001 738.845 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<636c617373> Tj
ET
@@ -5896,12 +5906,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
BT
130.74 738.845 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<4c656173654974656d> Tj
ET
@@ -5946,7 +5956,29 @@ ET
BT
196.74 738.845 Td
/F4.0 11 Tf
-<2e2e2e> Tj
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+202.24 738.845 Td
+/F4.0 11 Tf
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+207.74 738.845 Td
+/F4.0 11 Tf
+<2e> Tj
ET
0.000 0.000 0.000 SCN
@@ -6033,12 +6065,12 @@ f
h
S
Q
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
59.24 662.3249999999999 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<7075626c6963> Tj
ET
@@ -6055,12 +6087,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
BT
97.74000000000001 662.3249999999999 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<636c617373> Tj
ET
@@ -6077,12 +6109,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
BT
130.74 662.3249999999999 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<546f446f4974656d> Tj
ET
@@ -6105,7 +6137,29 @@ ET
BT
180.24 662.3249999999999 Td
/F4.0 11 Tf
-<2e2e2e> Tj
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+185.74 662.3249999999999 Td
+/F4.0 11 Tf
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+191.24 662.3249999999999 Td
+/F4.0 11 Tf
+<2e> Tj
ET
0.000 0.000 0.000 SCN
@@ -6143,8 +6197,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
BT
81.24000000000001 647.5849999999999 Td
@@ -6220,8 +6274,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
224.24 632.845 Td
@@ -6264,8 +6318,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
BT
81.24000000000001 603.365 Td
@@ -6341,8 +6395,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
BT
257.24 588.625 Td
@@ -6385,12 +6439,12 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
BT
81.24000000000001 559.145 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
<7075626c6963> Tj
ET
@@ -6407,8 +6461,8 @@ ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
BT
119.74000000000001 559.145 Td
@@ -6479,7 +6533,18 @@ ET
BT
279.24 559.145 Td
/F4.0 11 Tf
-<2829> 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
+
+BT
+284.74 559.145 Td
+/F4.0 11 Tf
+<29> Tj
ET
0.000 0.000 0.000 SCN
@@ -6523,7 +6588,29 @@ ET
BT
306.74 559.145 Td
/F4.0 11 Tf
-<2e2e2e> Tj
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+312.24 559.145 Td
+/F4.0 11 Tf
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+317.74 559.145 Td
+/F4.0 11 Tf
+<2e> Tj
ET
0.000 0.000 0.000 SCN
@@ -6567,7 +6654,29 @@ ET
BT
81.24000000000001 544.405 Td
/F4.0 11 Tf
-<2e2e2e> Tj
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+86.74000000000001 544.405 Td
+/F4.0 11 Tf
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+92.24000000000001 544.405 Td
+/F4.0 11 Tf
+<2e> Tj
ET
0.000 0.000 0.000 SCN
@@ -6864,35 +6973,13 @@ f
h
S
Q
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-59.24000000000001 190.2449999999998 Td
-/F6.0 11 Tf
-<697369732e7669657765722e7769636b65742e626f6f6b6d61726b656450616765732e6d617853697a65> 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
-290.24 190.2449999999998 Td
-/F4.0 11 Tf
-<3d> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
-
-BT
-295.74 190.2449999999998 Td
+59.24000000000001 190.2449999999998 Td
/F4.0 11 Tf
-<3230> Tj
+<697369732e7669657765722e7769636b65742e626f6f6b6d61726b656450616765732e6d617853697a653d3230> Tj
ET
0.000 0.000 0.000 SCN
@@ -6988,25 +7075,24 @@ Q
endstream
endobj
-72 0 obj
+71 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 71 0 R
+/Contents 70 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/Font << /F4.0 53 0 R
-/F6.0 70 0 R
/F1.0 8 0 R
/F3.1 45 0 R
/F2.0 18 0 R
>>
-/XObject << /Stamp1 528 0 R
+/XObject << /Stamp1 527 0 R
>>
>>
-/Annots [73 0 R 76 0 R]
+/Annots [72 0 R 75 0 R]
>>
endobj
-73 0 obj
+72 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -7017,13 +7103,13 @@ endobj
/Type /Annot
>>
endobj
+73 0 obj
+[71 0 R /XYZ 0 452.19 null]
+endobj
74 0 obj
-[72 0 R /XYZ 0 452.19 null]
+[71 0 R /XYZ 0 347.56999999999994 null]
endobj
75 0 obj
-[72 0 R /XYZ 0 347.56999999999994 null]
-endobj
-76 0 obj
<< /Border [0 0 0]
/Dest (_ugvw_features_recent-pages)
/Subtype /Link
@@ -7031,13 +7117,13 @@ endobj
/Type /Annot
>>
endobj
+76 0 obj
+[71 0 R /XYZ 0 289.90999999999985 null]
+endobj
77 0 obj
-[72 0 R /XYZ 0 289.90999999999985 null]
+[71 0 R /XYZ 0 164.3299999999998 null]
endobj
78 0 obj
-[72 0 R /XYZ 0 164.3299999999998 null]
-endobj
-79 0 obj
<< /Length 3755
>>
stream
@@ -7273,27 +7359,27 @@ Q
endstream
endobj
-80 0 obj
+79 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 79 0 R
+/Contents 78 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/Font << /F1.0 8 0 R
/F2.0 18 0 R
/F3.1 45 0 R
>>
-/XObject << /I4 84 0 R
-/Stamp1 528 0 R
+/XObject << /I4 83 0 R
+/Stamp1 527 0 R
>>
>>
-/Annots [82 0 R 85 0 R 86 0 R]
+/Annots [81 0 R 84 0 R 85 0 R]
>>
endobj
-81 0 obj
-[80 0 R /XYZ 0 751.08 null]
+80 0 obj
+[79 0 R /XYZ 0 751.08 null]
endobj
-82 0 obj
+81 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -7304,10 +7390,10 @@ endobj
/Type /Annot
>>
endobj
-83 0 obj
-[80 0 R /XYZ 0 674.2400000000002 null]
+82 0 obj
+[79 0 R /XYZ 0 674.2400000000002 null]
endobj
-84 0 obj
+83 0 obj
<< /Type /XObject
/Subtype /Image
/Height 1080
@@ -7796,7 +7882,7 @@ k
\ufffd- @=U\ufffd
\ufffdycv
endstream
endobj
-85 0 obj
+84 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -7807,7 +7893,7 @@ endobj
/Type /Annot
>>
endobj
-86 0 obj
+85 0 obj
<< /Border [0 0 0]
/Dest ()
/Subtype /Link
@@ -7815,7 +7901,7 @@ endobj
/Type /Annot
>>
endobj
-87 0 obj
+86 0 obj
<< /Type /XObject
/Subtype /Image
/Height 1080
@@ -8197,7 +8283,7 @@ m
\u04df\ufffdd\ufffdX|\ufffd\ufffd\ufffd21\ufffd7_x\ufffd\ufffd\ufffdj\ufffd\ufffd\ufffd\ufffd~T\ufffd\ufffd&\ufffd\ufffd_\ufffd\ufffd^J\ufffd*[\ufffd\ufffd\ufffdo*\ufffd3;V\ufffdu\ufffdil[\ufffd\ufffd\ufffd\ufffdL\ufffd\ufffd\ufffd\ufffd\ufffdki\ufffdo[}\ufffd\ufffdmu\ufffd\ufffd\ufffd\u06fak\ufffd\ufffd\ufffdm~]5\ufffd\ufffdRcc;\ufffd\ufffd\ufffd\ufffd\ufffd* \ufffd\ufffd7^\ufffd|y\ufffd\ufffdwW3\ufffd C\ufffdMc\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd?\ufffd\ufffd\ufffdk29\ufffd\ufffd\u0326\u06fa\ufffd\ufffdUk\u0674\ufffd\ufffdJc^\u0323\ufffd~\ufffdg\ufffddJl\ufffd\u01b6\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdM?cx\ufffd\ufffd<]6\ufffd\ufffdC\ufffd4\ufffduUx\ufffd:6\ufffd{f\ufffd'\ufffd\ufffd|)Z a)T\ufffdX,\ufffd_C_\ufffd\ufffd\ufffd\ufffd\ufffd4$\ufffd\ufffd\ufffd\ufffd?\ufffd\uff33\ufffd\ufffd\ufffd)m \ufffd~k\ufffd\u0626\ufffd\u01df\ufffd,\ufffd\ufffd\ufffdo\ufffd1iZ\ufffd:\u01e4XL\ufffd\ufffdd\ufffdj\ufffd\u05b2\ufffd\ufffd\ufffdbc\ufffd\ufffdP\ufffd\ufffd\ufffd8+\ufffd\ufffd\ufffdm\ufffd\ufffd\ufffd\ufffd\ufffdA\ufffd\ufffd.\ufffd\ufffd\ufffd\u06e6w\ufffd\ufffdm5\ufffdw\ufffd\ufffdT\ufffd\ufffd\ufffd\ufffd\ufffdW_\ufffdG\ufffd\ufffd\ufffdo\ufffd=Fc+""\ufffd2\ufffd?\ufffd\uff33z\ufffd\ufffdJ\ufffd7 `\ufffd\ufffdil\ufffdU\ufffd\u014b\ufffdV1y\ufffd\ufffdQ\ufffdL/\ufffd\u0434\ufffd<}\ufffd\ufffd\ufffdl\ufffd\ufffdZ\ufffdVk\ufffd\ufffd\ufffd&\ufffd_\ufffd\ufffdn\ufffdtc\ufffd~\ufffd\ufffdK\ufffdjl\ufffd\ufffd\ufffd \ufffd[\u01f6\ufffd/sK\ufffd\ufffd\ufffd\u0265\ufffd\ufffdR\ufffd/\ufffd\ufffd\ufffd\ufffd7\ufffd\ufffd\ufffd\ufffdg\ufffd9}&|\ufffd\ufffd_}\ufffd\ufffdi\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdk\ufffd\ufffd\ufffd \ufffd\ufffd\u05a6\ufffd\ufffd\ufffd\ufffdwQ\ufffd\ufffdL\ufffd\[[\ufffdX\ufffd3n\ufffd
M\ufffd\ufffd\u07ae\ufffd\ufffdi\ufffd M\ufffdn\ufffd\u0636\u07ff\u06ba\ufffdZ\ufffdcc\ufffdq\ufffdm\ufffd\ufffd\ufffd)\u0471\ufffd\ufffd\ufffdn{7\ufffd\ufffd~\ufffdxnr1X|\ufffd\ufffd\ufffd\ufffd\u06ff\ufffd\ufffdO?\ufffd\(N.V?\ufffd\ufffd\ufffd~\ufffd;\ufffd\ufffd\ufffd\ufffdH\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd
n\ufffd\u06e4\ufffd\ufffd\ufffd\ufffd\ufffdZ\ufffd\ufffd\ufffd}4jw\ufffdy(Y\ufffd\ufffd"$]d\ufffd\ufffdd[ll\ufffd?\ufffd\ufffd\ufffd\ufffdm\ufffd\ufffd\ufffd\ufffd\ufffd o\ufffd\ufffd\ufffd~U\ufffd\ufffd\ufffdntU\ufffd\ufffdb[ll\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdo\ufffd^>7\ufffd\u0165\ufffd\ufffdWc+""\ufffd![ \ufffd\ufffd\ufffd7\ufffdIy\ufffd\ufffd\ufffd\u01d2G\ufffd\u077cY\ufffd\ufffd\ufffd\ufffd\u0413\u01fe\ufffd<\ufffd,\ufffdv+\ufffdm\ufffdB\ufffdZ\ufffd\ufffd\ufffdz\ufffd\ufffd\ufffdA[\ud7dc<]\ufffd^\ufffd\u063c}\ufffd\u0253\ufffd\ufffd\ufffd\ufffdt|\ufffd\ufffd\ufffd\ufffd=\ufffdF\ufffd\ufffd\ufffd\ufffd\ufffdhI\ufffd\ufffdg\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd[\ufffd\ufffd\ufffd \ufffd\u05be\ufffd\ufffd.ePW)\ufffd
\ufffd+\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd=}\ufffd}\ufffd\ufffdMc\ufffd\ufffd]\ufffd$\ufffd\ufffd\ufffd+I\ufffdu\ufffd\ufffd\u04f3\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdV\ufffdk\ufffd\ufffdol\ufffd\ufffdk\ufffd\ufffd;CR\ufffd\ufffd\ufffd\u073dil\ufffd[\ufffd\ufffd>{\ufffd\ufffd\ufffds\ufffd\ufffd\ufffd[\ufffdn\ufffd\ufffd \ufffd\ufffd}c[\ufffd\ufffd\ufffd\ufffd\ufffd\u01a9\ufffdI\u03d8\ufffd+@\ufffd\ufffdN\ufffdm:\ufffd:\ufffd\ufffdMc[\ufffd\ufffdBc\ufffd\ufffd\j\ufffdqn\ufffd\ufffdsz\ufffd\ufffdz\ufffd\ufffd\u016e\ufffdko?H\ufffd!u\ufffdw\ufffd\ufffd\ufffd\ufffd\u0133\ufffdc\ufffd?\ufffd\ufffdcc;z<7\ufffd\ufffd\ufffdO\ufffd<nl_\ufffd^\ufffd7\ufffd\ufffd\ufffd:w\ufffd\u072d\u03f2
\ufffd!\ufffd\ufffd.CDD$\ufffd\ufffd \u8dce\ufffd-w\ufffd.\ufffd\ufffd\ufffd\ufffd\u049f\ufffd\ufffd\ufffd\ufffdo\ufffd\ufffd\ufffdB\ufffd\ufffd\ufffd\ufffd\ufffdul?\ufffdun\ufffd\u04ff\ufffd\ufffd*DDd\u88f1 \ufffdMc;d\ufffdil\ufffd\ufffdJ\ufffdW.\ufffd\ufffdo\ufffd\uf54f~8\ufffdP\ufffd^(^\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd[\ufffd\ufffd\ufffd \ufffd\ufffd\ufffd2\u06e7\ufffd\ufffd\ufffd,-O/\ufffd~\ufffd\ufffd\ufffd-\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd_a\ufffd\ufffd\ufffdOW\ufffdUR\ufffd\ufffdW\ufffdZ\ufffd \ufffd%\ufffdQ\ufffd\ufffd+\ufffdoM\ufffd\ufffd,\ufffdp\ufffdd\ufffdhC\ufffd2\ufffd\ufffd\ub1e4\ufffd$}\ufffd\ua96c_\ufffd\ufffd\ufffdHo\ufffd\ufffd \ufffdMc;d\ufffdol\ufffd\ufffd\ufffd?\ufffd\ufffd\ufffdW_L.[6\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdM67\ufffd9]\ufffd~\ufffdi\ufffd"\ufffd\ufffd\ufffdO+\ufffd\ufffd\ufffdj\ufffd\ufffd\ufffdm\ufffd\ufffd\ufffd9\ufffd\ufffdr5\ufffd""\u04a7hl \ufffd~\ufffd\ufffd\ufffd
5\ufffd\u04cb\ufffd\ufffd\ufffdsl\ufffd\ufffd \ufffd\ufffdza\ufffdb\ufffd&;\ufffdM\ufffd\ufffdu\ufffdDusk\ufffd\ufffd5-\ufffdUDDd\ufffd\ufffd \ufffd\ufffd\ufffd2\ufffdjl\ufffd\ufffd4\u05a4u}l\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdjZ\ufffd64\ufffd\ufffd\ufffd"4\ufffdF\ufffd\ufffd\ufffd\ufffd$[ \ufffd\ufffd4\ufffdC\ufffdsc{b~:_il\ufffdJS\ufffd\ufffdS\ufffd-\ufffdx5\ufffd\ufffd\ufffdi\ufffdu\ufffdfm\ufffd\ufffdkk[\ufffd\ufffd\ufffd\ufffd\u0705\ufffd\ufffd \ufffd\ufffd\ufffd;2\ufffd\ufffd\u234d\ufffd\ufffdb\ufffdh\ufffd\ufffd\u0596\ufffd\ufffd\ufffd\ufffd{}\ufffd\u06a1\ufffd\u03b5\u06da/2\u06e1\ufffd\ufffd\ufffdY\ufffd(\ufffd\u060a\ufffdH\ufffd\ufffd\ufffd \ufffd\ufffd\ufffd\u0245\ufffd\ufffdB0\ufffdrU\ufffdt\ufffd\ufffdL\ufffdMu
\ufffdnaj\ufffd@\ufffdl\ufffd\ufffdn5v\ufffd\ufffdt\ufffd&Ok\ufffd\ufffd\ufffdt\ufffd\ufffd\ufffdqMk\yW=\ufffd\ufffd\ufffd\ufffd4[ z\ufffdEc[l\ufffd\u0626\u05e5
7\u0575\ufffd\ufffd\ufffdi\u02ddSK\ufffd\ufffd]\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdfM\ufffd\ufffd\ufffd\ufffd\ufffdm\ufffd\u7849\ufffd\ufffdl6[ zk\ufffd\ufffd|\ufffd\ufffdB)\ufffdWy\ufffd\ufffdh\ufffd\ufffd;!\ufffd\ufffd\ufffd \ufffd\ufffd\ufffd\ufffd\ufffd4[ z\ufffd\ufffd\u01b6\ufffd"\ufffdg\ufffd\ufffdm\ufffd!\ufffd""\ufffd\ufffdhl \ufffd\ufffd\ufffd\U000d32e5\ufffdB0QVL\ufffd7\ufffd\ufffdK\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\u023d\ufffd- \ufffdUnl\ufffd\u0675Ic;\ufffd\1\ufffd\ufffd\ufffd\ufffd"""\ufffdv4\ufffd \ufffd\ufffd\u8253SK5l5\ufffd"""\ufffdFc @o\ufffd6\ufffdE\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd \ufffd\ufffd4\ufffd"""\ufffd\ufffd\ufffd \ufffd\u07aakl\ufffdum\ufffd\ufffd\ufffd\ufffd\ufffd
endstream
endobj
-88 0 obj
+87 0 obj
<< /Length 3278
>>
stream
@@ -8386,25 +8472,25 @@ Q
endstream
endobj
-89 0 obj
+88 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 88 0 R
+/Contents 87 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/XObject << /I5 87 0 R
-/I6 92 0 R
-/Stamp1 528 0 R
+/XObject << /I5 86 0 R
+/I6 91 0 R
+/Stamp1 527 0 R
>>
/Font << /F1.0 8 0 R
/F4.0 53 0 R
/F2.0 18 0 R
>>
>>
-/Annots [90 0 R 93 0 R]
+/Annots [89 0 R 92 0 R]
>>
endobj
-90 0 obj
+89 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -8415,10 +8501,10 @@ endobj
/Type /Annot
>>
endobj
-91 0 obj
-[89 0 R /XYZ 0 398.55596434359813 null]
+90 0 obj
+[88 0 R /XYZ 0 398.55596434359813 null]
endobj
-92 0 obj
+91 0 obj
<< /Type /XObject
/Subtype /Image
/Height 1080
@@ -8899,7 +8985,7 @@ l35
o\u0652\ufffdPX\u019a5\u0170\ufffd\ufffd\ufffd\u05efO\ufffd/9I\ufffd'LHf\ufffd\ufffdG\ufffd\ufffdr\ufffdvz#l\ufffd\ufffd7\ufffdxb\ufffdv_\ufffd\ufffd\ufffd\ufffd&\ufffd'\ufffd\ufffdl2\ufffd\ufffd\ufffdf\ufffdr\ufffd\ufffd\ufffd6hw\ufffdQ\ufffd\ufffd\ufffdvC\ufffd]\ufffd\ufffdQ\ufffd\ufffd8\u4483D\ufffd\ufffd47 \ufffd#\ufffd<\ufffd\ufffdhiY\ufffd5\ufffd\ufffd\ufffd\uf2a9b{g\ufffd\ufffd\ufffdu\ufffd\ufffdv5\ufffdm~\ufffd\ufffd\ufffd\ufffd\ufffd3_tQ\ufffdE&/\ufffdtc\ufffd�\ufffd\ufffd\ubdff\ufffdW\ufffd\ufffd \ufffd>3Y\ufffdnay\ufffdCR`\ufffd~}\ufffd\ufffdd|\ufffd\ufffdp\ufffd\ufffd9\ufffdp\ufffd\ufffd\ufffd5 s\ufffd\ufffdU^\ufffdE\ufffdTmT\ufffd\ufffd\ufffdS\ufffdUWu\ufffdV\ufffdA\ufffd\ufffd\u078e\u01f3\ufffd\ufffdcK\ufffd\ufffdu\ufffd\ufffd\ufffd\ufffdc\ufffd\ufffd\ufffdLI\u0281\u02ee\ufffdv\ufffd\ufffd\ufffd6\ufffd(\ufffdg\ufffd(*\ufffdJ\ufffd\ufffd[\ufffd=\ufffd\ufffd\ufffd\ufffd \ufffde\ufffd^z\ufffd=\ufffd\ufffdS\ufffdU\ufffd\u06dc}\ufffd\u0673g\ufffd\ufffd>2\ufffd_\ufffd?\ufffd\ufffd\ufffd\ufffd\ufffdI>}\ufffd\ufffd7n!n0\ufffdk3\ufffdEW \ufffdj\ufffd\ufffd\ufffd\u0232\ufffdo\u067au\ufffdAYG\ufffd\ufffd\ufffdm\u067aEb PUQ\u06be\ufffd\ufffd\ufffd7\ufffd\ufffd\ufffd\ufffd?t\ufffdA\ufffd:\u880f]p\ufffd\ufffd]\ufffd\ufffd \ufffd6\ufffd\ufffd\ufffd\u036f\ufffd\ufffd\ufffd\ufffdo\ufffd^x\ufffd\ufffd\ufffdk_\ufffd\u059dv \ufffd\ufffd\ufffdf\ufffd\>\ufffdB\ufffd\ufffd \ufffd\ufffd\ufffd\ufffd TW\ufffd\ufffd\ufffdYW \ufffd\ufffd\ufffd\ufffd>\ufffd\ufffdK\ufffd\ufffd\ufffd8\ufffd$\ufffd Pc\ufffdg\ufffd\ufffdK\ufffd\ufffd\ufffd\ufffd6)\ufffd\ufffd \ufffd7H\ufffdl\ufffd\ufffd TU\ufffd8_\ufffd\ufffd\ufffd*\ufffd\ufffd\ufffd \ufffd-
\ufffd\ufffd T[RS\ufffd\ufffd"\u06e88.\ufffd \ufffd\ufffd8n\ufffd+ @uE\ufffd\ufffd6]l\ufffd\ufffd \ufffd\ufffd\ufffd\ufffd[ \ufffd\ufffdBb PK\ufffdl\ufffd\ufffdA\ufffd\ufffd
endstream
endobj
-93 0 obj
+92 0 obj
<< /Border [0 0 0]
/A << /Type /Action
/S /URI
@@ -8910,7 +8996,7 @@ endobj
/Type /Annot
>>
endobj
-94 0 obj
+93 0 obj
<< /Length 6104
>>
stream
@@ -9175,24 +9261,24 @@ Q
endstream
endobj
-95 0 obj
+94 0 obj
<< /Type /Page
/Parent 3 0 R
/MediaBox [0 0 595.28 841.89]
-/Contents 94 0 R
+/Contents 93 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/Font << /F1.0 8 0 R
/F4.0 53 0 R
/F2.0 18 0 R
>>
-/XObject << /I7 96 0 R
-/Stamp1 528 0 R
+/XObject << /I7 95 0 R
+/Stamp1 527 0 R
>>
>>
-/Annots [97 0 R]
+/Annots [96 0 R]
>>
endobj
-96 0 obj
+95 0 obj
<< /Type /XObject
/Subtype /Image
/Height 1080
@@ -9609,7 +9695,7 @@ p%
\ufffd{\ufffd,S\ufffd6mZ\ufffd\u0407\ufffd\ufffd\ufffdw\ufffdG\ufffd-\ufffd\ubbcfq\ufffd\ufffd\ufffd\ufffde\ufffd]]1\ufffd\ufffd\ufffd\ufffd\ufffdW_\ufffd\ufffdr\ufffd\ufffd'\ufffd\ufffd\u22e5\ufffdx\ufffd\ufffdm\ufffd \ufffdw\u0184\ufffd=\ufffd3\ufffdzk\\ufffd\ufffd\ufffd1z#\ufffd\ufffdJ\ufffd\ufffd\ufffd\ufffdxGy'.y\ufffd.\ufffd\ufffd\ufffdzW\ufffdd,\ufffd\ufffd\ufffd\ufffd|\ufffd\ufffdm\ufffd\ufffd\ufffd\ufffdKW}\ufffd\ufffd\ufffd \ufffd.\ufffdr\ufffd$$I\ufffdA4\ufffd\ufffd
L\ufffd<O\ufffd\u06fflY\ufffd7\ufffd}\ufffd\ufffdR\ufffd8\u04bf\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\u0550\ufffdA\ufffd\ufffd?\ufffdg=:|\ufffd}(f\ufffd\ufffd\u024b!\u06d8\ufffd\ufffd\ufffd\ufffd\ufffdg\ufffd\ufffd\ufffdW\ufffd\ufffd \ufffd>sy\ufffdnqy\ufffd\ufffd\ufffd\ufffdv\u06f6\ufffd_\ufffdK\ufffd\ufffd\ufffd\ufffd{\ufffdw\ufffd\ufffdw\ufffd\ufffdan\ufffd\ufffd*+|\ufffd8\ufffd0\u056b}\ufffd\ufffd�U\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd}<y?\ufffd\ufffd\ufffd\ufffd\ufffds\ufffdlo~s\ufffd\ufffd\ufffd \ufffd\ufffd;\ufffd\ufffd\ufffd;\ufffd/&Ib>\ufffd$I\ufffdU<HKo\ufffd^\ufffd\ufffd\ufffd 8i\ufffdg\ufffd=\ufffd\ufffd\ufffd^\ufffd\ufffd{\ufffd\ufffd\ufffd\ufffdC\u3730n\ufffd\ufffd3g\ufffd\ufffd\ufffd7\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd}\ufffdg\u05ee\u04b6\ufffds\ufffd\ufffd\ufffdGW \ufffdZK\ufffd\ufffd\ufffd7>r\ufffd
\ufffd_\ufffdwDx\ufffd\ufffd>rXb PSI\u05be\ufffdg\ufffd\ufffd]\ufffd?\ufffd\ufffd\ufffdkn\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdg7Il \ufffdc\ufffd\ufffd\ufffd\ufffd\ufffd_\ufffd\ufffd+\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdv \ufffd\ufffdU_\ufffd\ufffd\ufffdq5\ufffd S\ufffd\ufffd \ufffd\ufffd\ufffd\ufffd&U\ufffdU\u03fa"